From 1470a2c78715d51a781c6fa3e06b64071d251dcd Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 2 Nov 2016 09:18:47 -0700 Subject: [PATCH] Update the list of IPv6 multicast groups we join 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 Reviewed-on: https://gerrit.iotivity.org/gerrit/13963 Tested-by: jenkins-iotivity Reviewed-by: Dave Thaler Reviewed-by: Uze Choi Reviewed-by: Ashok Babu Channa (cherry picked from commit 1bb09598dc3a52d97d0f6709afdfafd3fa2cbfc5) Reviewed-on: https://gerrit.iotivity.org/gerrit/15297 Reviewed-by: Dan Mihai --- resource/csdk/connectivity/src/ip_adapter/caipserver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resource/csdk/connectivity/src/ip_adapter/caipserver.c b/resource/csdk/connectivity/src/ip_adapter/caipserver.c index c7f9727..63da7e5 100644 --- a/resource/csdk/connectivity/src/ip_adapter/caipserver.c +++ b/resource/csdk/connectivity/src/ip_adapter/caipserver.c @@ -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); } -- 2.7.4