Merge pull request #2572 from pqarmitage/updates

Fix recreating VMACs and adding IPv6 link local addresses

Author: pqarmitage

keepalived/core/keepalived_netlink.c

@@ -1031,6 +1031,7 @@ netlink_if_address_filter(__attribute__((unused)) struct sockaddr_nl *snl, struc
 							 !__test_bit(VRRP_VMAC_XMITBASE_BIT, &vrrp->flags) &&
 							 ifa->ifa_family == AF_INET6 &&
 							 vrrp->ifp->is_ours) {
+							if (vrrp->saddr.ss_family == AF_UNSPEC) {
 								inet_ip6tosockaddr(addr.in6, &vrrp->saddr);
 #if 0
 								if (IN6_IS_ADDR_UNSPECIFIED(&vrrp->ifp->sin6_addr)) {
@@ -1041,12 +1042,13 @@ netlink_if_address_filter(__attribute__((unused)) struct sockaddr_nl *snl, struc
 									 * does not have one, then we will need the following code
 									 */
 									if (add_link_local_address(vrrp->ifp, addr.in6) &&
-								            vrrp->flags_if_fault &&
+									    vrrp->flags_if_fault &&
 									    (!__test_bit(VRRP_FLAG_SADDR_FROM_CONFIG, &vrrp->flags) || is_tracking_saddr))
 										try_up_instance(vrrp, false, VRRP_FAULT_FL_NO_SOURCE_IP);
 								} else
 #endif
-									reset_link_local_address(&vrrp->ifp->sin6_addr, vrrp);
+								reset_link_local_address(&vrrp->ifp->sin6_addr, vrrp);
+							}
 						}
 #endif
 					}

keepalived/include/vrrp_sock.h

@@ -45,8 +45,8 @@ typedef struct _sock {
 #ifdef _HAVE_VRF_
 	const interface_t	*vrf_ifp;
 #endif
-	const sockaddr_t	*unicast_src;
-	const sockaddr_t	*mcast_daddr;
+	sockaddr_t		*unicast_src;
+	sockaddr_t		*mcast_daddr;
 	int			fd_in;
 	int			fd_out;
 	int			rx_buf_size;

keepalived/vrrp/vrrp.c

@@ -2774,26 +2774,22 @@ void
 open_sockpool_socket(sock_t *sock)
 {
 	vrrp_t *vrrp;
-	sockaddr_t unicast_src;
-	const sockaddr_t *unicast_src_p = sock->unicast_src;
 	bool already_fault;
 
 	if (sock->unicast_src &&
 	    sock->unicast_src->ss_family == AF_INET6 &&
 	    IN6_IS_ADDR_LINKLOCAL(&PTR_CAST_CONST(struct sockaddr_in6, sock->unicast_src)->sin6_addr)) {
 		/* For an IPv6 link local address, we need to set the ifindex */
-		unicast_src = *sock->unicast_src;
-		unicast_src_p = &unicast_src;
-
 		/* coverity[deref_param] - since the address is IPv6 link local, sock->ifp != NULL */
-		PTR_CAST(struct sockaddr_in6, &unicast_src)->sin6_scope_id = sock->ifp->ifindex;
-	}
+		PTR_CAST(struct sockaddr_in6, sock->unicast_src)->sin6_scope_id = sock->ifp->ifindex;
+	} else if (sock->mcast_daddr && sock->mcast_daddr->ss_family == AF_INET6)
+		PTR_CAST(struct sockaddr_in6, sock->mcast_daddr)->sin6_scope_id = sock->ifp->ifindex;
 
 	sock->fd_in = open_vrrp_read_socket(sock->family, sock->proto, sock->ifp,
 #ifdef _HAVE_VRF_
 					    sock->vrf_ifp,
 #endif
-					    sock->mcast_daddr, unicast_src_p, sock->rx_buf_size);
+					    sock->mcast_daddr, sock->unicast_src, sock->rx_buf_size);
 
 	if (sock->fd_in == -2) {
 		rb_for_each_entry(vrrp, &sock->rb_vrid, rb_vrid) {
@@ -2814,7 +2810,7 @@ open_sockpool_socket(sock_t *sock)
 #ifdef _HAVE_VRF_
 						     sock->vrf_ifp,
 #endif
-						     unicast_src_p);
+						     sock->unicast_src);
 }
 
 /* Try to find a VRRP instance */

keepalived/vrrp/vrrp_scheduler.c

@@ -455,7 +455,7 @@ alloc_sock(list_head_t *l, sa_family_t family, int proto, interface_t *ifp,
 #ifdef _HAVE_VRF_
 	   const interface_t *vrf_ifp,
 #endif
-	   const sockaddr_t *mcast_daddr, const sockaddr_t *unicast_src)
+	   sockaddr_t *mcast_daddr, sockaddr_t *unicast_src)
 {
 	sock_t *new;