IOT-1378 Fix windows\CAIPNWMonitor.c 77/12577/4
authorDaniel Ferguson <daniel.j.ferguson@intel.com>
Thu, 29 Sep 2016 18:33:04 +0000 (11:33 -0700)
committerDave Thaler <dthaler@microsoft.com>
Mon, 3 Oct 2016 22:39:47 +0000 (22:39 +0000)
* Allow IPv4 and IPv6 to coexist. Previously, these two
  modes were mutually exclusive.

Change-Id: I5c04289590b0edd58dc854722c0288a99b4c70c9
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12577
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
resource/csdk/connectivity/src/ip_adapter/windows/caipnwmonitor.c

index 353beca..53b058c 100644 (file)
@@ -186,7 +186,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))