From: Donald Sharp <donaldsharp72@gmail.com>
Date: Tue, 25 Feb 2025 15:37:12 +0000 (-0500)
Subject: Merge pull request #18246 from FRRouting/mergify/bp/dev/10.3/pr-18226
X-Git-Tag: docker/10.3.0~19
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f8276261bfdd8fce216f25091d99f1a8e8e97481;p=matthieu%2Ffrr.git

Merge pull request #18246 from FRRouting/mergify/bp/dev/10.3/pr-18226

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

f8276261bfdd8fce216f25091d99f1a8e8e97481
diff --cc pimd/pim_instance.c
index f1471a5a93,358821142e..f64b02e44d
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@@ -181,11 -181,12 +181,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;