zebra: fix disable radvd upon interface deletion event

If the radvd service is used on a physical interface, the service
is not stopped and may be reused upon re-creation of that physical
interface.
Fix this by stopping the radvd service.

Signed-off-by: Philippe Guibert <[email protected]>

Author: pguibert6WIND

zebra/interface.c

@@ -764,6 +764,7 @@ void if_delete_update(struct interface **pifp)
 		memset(&zif->brslave_info, 0,
 		       sizeof(struct zebra_l2info_brslave));
 		zebra_evpn_mac_ifp_del(ifp);
+		zebra_rtadv_disable_per_interface(zif);
 	}
 
 	if (!ifp->configured) {

zebra/rtadv.c

@@ -1560,20 +1560,22 @@ static void zebra_interface_radv_set(ZAPI_HANDLER_ARGS, int enable)
 		    && !CHECK_FLAG(zif->rtadv.ra_configured,
 				   VTY_RA_INTERVAL_CONFIGURED))
 			zif->rtadv.MaxRtrAdvInterval = ra_interval * 1000;
-	} else {
-		if (CHECK_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED))
-			interfaces_configured_for_ra_from_bgp--;
+	} else
+		zebra_rtadv_disable_per_interface(zif);
+stream_failure:
+	return;
+}
 
+void zebra_rtadv_disable_per_interface(struct zebra_if *zif)
+{
+	if (CHECK_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED)) {
+		interfaces_configured_for_ra_from_bgp--;
 		UNSET_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED);
-		if (!CHECK_FLAG(zif->rtadv.ra_configured,
-				VTY_RA_INTERVAL_CONFIGURED))
-			zif->rtadv.MaxRtrAdvInterval =
-				RTADV_MAX_RTR_ADV_INTERVAL;
-		if (!CHECK_FLAG(zif->rtadv.ra_configured, VTY_RA_CONFIGURED))
-			ipv6_nd_suppress_ra_set(ifp, RA_SUPPRESS);
 	}
-stream_failure:
-	return;
+	if (!CHECK_FLAG(zif->rtadv.ra_configured, VTY_RA_INTERVAL_CONFIGURED))
+		zif->rtadv.MaxRtrAdvInterval = RTADV_MAX_RTR_ADV_INTERVAL;
+	if (!CHECK_FLAG(zif->rtadv.ra_configured, VTY_RA_CONFIGURED))
+		ipv6_nd_suppress_ra_set(zif->ifp, RA_SUPPRESS);
 }
 
 /*

zebra/rtadv.h

@@ -504,6 +504,7 @@ static inline void rtadv_stop_ra_all(void)
 
 extern void zebra_interface_radv_disable(ZAPI_HANDLER_ARGS);
 extern void zebra_interface_radv_enable(ZAPI_HANDLER_ARGS);
+extern void zebra_rtadv_disable_per_interface(struct zebra_if *zif);
 
 extern uint32_t rtadv_get_interfaces_configured_from_bgp(void);
 extern bool rtadv_compiled_in(void);