diff options
| author | Nathan Bahr <nbahr@atcorp.com> | 2025-02-24 20:02:54 +0000 |
|---|---|---|
| committer | Nathan Bahr <nbahr@atcorp.com> | 2025-02-24 20:02:54 +0000 |
| commit | bc290128630acdf3e5ca55d87c9c38c4a88413d1 (patch) | |
| tree | 24c5ea507036096c5a31e46a703bb713d6cdcc53 /pimd/pim_iface.c | |
| parent | 2539e678848b8f9f629c395c6c21770cc9237d09 (diff) | |
pim: Fix autorp group joins
Group joining got broken when moving the autorp socket to open/close
as needed. This fixes it so autorp group joining is properly handled
as part of opening the socket.
Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
(cherry picked from commit d840560b74e3a6117aa1e4b1203dcdd8fb254ef6)
Fixed merge conflicts for backport
Diffstat (limited to 'pimd/pim_iface.c')
| -rw-r--r-- | pimd/pim_iface.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index 19460aa445..697d8df598 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -1903,9 +1903,7 @@ static int pim_ifp_up(struct interface *ifp) } #if PIM_IPV == 4 - if (pim->autorp && pim->autorp->do_discovery && pim_ifp && - pim_ifp->pim_enable) - pim_autorp_add_ifp(ifp); + pim_autorp_add_ifp(ifp); #endif pim_cand_addrs_changed(); @@ -2022,8 +2020,7 @@ void pim_pim_interface_delete(struct interface *ifp) return; #if PIM_IPV == 4 - if (pim_ifp->pim_enable) - pim_autorp_rm_ifp(ifp); + pim_autorp_rm_ifp(ifp); #endif pim_ifp->pim_enable = false; |