From 7f52df37bd57916406ecac0f7fe6064129f3a38b Mon Sep 17 00:00:00 2001 From: Bin Qian Date: Thu, 5 Sep 2019 13:33:52 -0400 Subject: [PATCH] Fix IPv6 standby controller boot loop IPv6 multicast should be sent to the interface that the socket binds to. Closes-Bug: 1842949 Change-Id: I14b6c5193c67a0ddd69e31d1044219c4e9fd6b94 Signed-off-by: Bin Qian --- service-mgmt/sm-1.0.0/centos/build_srpm.data | 2 +- service-mgmt/sm-1.0.0/src/sm_msg.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/service-mgmt/sm-1.0.0/centos/build_srpm.data b/service-mgmt/sm-1.0.0/centos/build_srpm.data index fe76b90b..8430194b 100644 --- a/service-mgmt/sm-1.0.0/centos/build_srpm.data +++ b/service-mgmt/sm-1.0.0/centos/build_srpm.data @@ -2,4 +2,4 @@ SRC_DIR=$PKG_BASE COPY_LIST="$PKG_BASE/LICENSE" TAR_NAME=sm VERSION=1.0.0 -TIS_PATCH_VER=30 +TIS_PATCH_VER=33 diff --git a/service-mgmt/sm-1.0.0/src/sm_msg.c b/service-mgmt/sm-1.0.0/src/sm_msg.c index e3093a90..ef0c91a3 100644 --- a/service-mgmt/sm-1.0.0/src/sm_msg.c +++ b/service-mgmt/sm-1.0.0/src/sm_msg.c @@ -2691,18 +2691,6 @@ static SmErrorT sm_msg_open_ipv6_udp_multicast_socket( return( SM_FAILED ); } - // Set multicast interface on socket. - result = setsockopt( sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, - &(interface->id), sizeof(interface->id) ); - if( 0 > result ) - { - DPRINTFE( "Failed to set unicast address on socket for " - "interface (%s), error=%s.", interface->interface_name, - strerror( errno ) ); - close( sock ); - return( SM_FAILED ); - } - // Bind socket to interface. memset( &ifr, 0, sizeof(ifr) ); snprintf( ifr.ifr_name, sizeof(ifr.ifr_name), "%s",