From: Donald Sharp <donaldsharp72@gmail.com>
Date: Tue, 25 Feb 2025 15:20:46 +0000 (-0500)
Subject: Merge pull request #18252 from nabahr/pr-18226-10.2-backport-fixed
X-Git-Tag: docker/10.2.2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=483b89751f7e1367289660ff4663e24926c5bf99;p=matthieu%2Ffrr.git

Merge pull request #18252 from nabahr/pr-18226-10.2-backport-fixed

pim: Fix vrf binding of autorp and mroute socket (backport #18226)
---

483b89751f7e1367289660ff4663e24926c5bf99
diff --cc pimd/pim_instance.c
index 30726b1b71,37b179a827..535bcf8b8c
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@@ -186,11 -186,12 +186,15 @@@ static int pim_vrf_enable(struct vrf *v
  
  	zlog_debug("%s: for %s %u", __func__, vrf->name, vrf->vrf_id);
  
 +	if (vrf_bind(vrf->vrf_id, pim->reg_sock, NULL) < 0)
 +		zlog_warn("Failed to bind register socket to VRF %s", vrf->name);
 +
  	pim_mroute_socket_enable(pim);
  
+ #if PIM_IPV == 4
+ 	pim_autorp_enable(pim);
+ #endif
+ 
  	FOR_ALL_INTERFACES (vrf, ifp) {
  		if (!ifp->info)
  			continue;