Update the list of IPv6 multicast groups we join 97/15297/5
authorThiago Macieira <thiago.macieira@intel.com>
Wed, 2 Nov 2016 16:18:47 +0000 (09:18 -0700)
committerDan Mihai <Daniel.Mihai@microsoft.com>
Tue, 10 Jan 2017 03:36:17 +0000 (03:36 +0000)
According to OCF internal discussions, the upcoming OIC 1.1 spec will
have an errata that specifies that devices should always join the OCF
group on scopes 2, 3 and 5, and that devices connected to WiFi and/or
Ethernet should send discoveries on scope 2. IoTivity already sends on
scope 2 only; this patch merely enables joining on the other scopes.

Change-Id: Ic46ff326a6ba46bc877cfffd1483478d310e719b
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13963
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 1bb09598dc3a52d97d0f6709afdfafd3fa2cbfc5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15297
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
resource/csdk/connectivity/src/ip_adapter/caipserver.c

index c7f9727..63da7e5 100644 (file)
@@ -1152,17 +1152,17 @@ static void applyMulticastToInterface6(uint32_t ifindex)
     }
     //applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressInt, ifindex);
     applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressLnk, ifindex);
-    //applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressRlm, ifindex);
+    applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressRlm, ifindex);
     //applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressAdm, ifindex);
-    //applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressSit, ifindex);
+    applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressSit, ifindex);
     //applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressOrg, ifindex);
     //applyMulticast6(caglobals.ip.m6.fd, &IPv6MulticastAddressGlb, ifindex);
 
     //applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressInt, ifindex);
     applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressLnk, ifindex);
-    //applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressRlm, ifindex);
+    applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressRlm, ifindex);
     //applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressAdm, ifindex);
-    //applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressSit, ifindex);
+    applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressSit, ifindex);
     //applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressOrg, ifindex);
     //applyMulticast6(caglobals.ip.m6s.fd, &IPv6MulticastAddressGlb, ifindex);
 }