From 2584391ed7a0acacdad9cdae5fd689bda85c9daf Mon Sep 17 00:00:00 2001 From: Daniel Ferguson Date: Thu, 29 Sep 2016 11:33:04 -0700 Subject: [PATCH] IOT-1378 Fix windows\CAIPNWMonitor.c * Allow IPv4 and IPv6 to coexist. Previously, these two modes were mutually exclusive. Change-Id: I5c04289590b0edd58dc854722c0288a99b4c70c9 Signed-off-by: Daniel Ferguson Reviewed-on: https://gerrit.iotivity.org/gerrit/12699 Tested-by: jenkins-iotivity Reviewed-by: Soemin Tjong Reviewed-by: David Antler Reviewed-by: Dave Thaler --- resource/csdk/connectivity/src/ip_adapter/windows/caipnwmonitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resource/csdk/connectivity/src/ip_adapter/windows/caipnwmonitor.c b/resource/csdk/connectivity/src/ip_adapter/windows/caipnwmonitor.c index 7d3088f..a91b159 100644 --- a/resource/csdk/connectivity/src/ip_adapter/windows/caipnwmonitor.c +++ b/resource/csdk/connectivity/src/ip_adapter/windows/caipnwmonitor.c @@ -182,7 +182,8 @@ bool AddInterfaces(PIP_ADAPTER_ADDRESSES pAdapterAddr, u_arraylist_t *iflist, in OIC_LOG_V(DEBUG, TAG, "\t\tIPv6 interface %i not valid, skipping...", pCurAdapterAddr->IfIndex); } } - else if (pCurAdapterAddr->Flags & IP_ADAPTER_IPV4_ENABLED) + + if (pCurAdapterAddr->Flags & IP_ADAPTER_IPV4_ENABLED) { // Do not add loopback, duplicate, or non-operational adapters if (IsValidAdapter(pCurAdapterAddr, desiredIndex, AF_INET)) -- 2.7.4