diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2024-12-04 14:40:25 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 14:40:25 -0600 |
| commit | 7c8cef48913a86eabf8f631c0856358582c4c7b1 (patch) | |
| tree | 11351efceadbd17fd85ca1c6d2e931190942084d /pimd | |
| parent | 6bf42834218d2f89959c998c0d6ce6ab9b722557 (diff) | |
| parent | 37b88191fb4736ff0a1e565fc22003d0ab853ea2 (diff) | |
Merge pull request #17578 from donaldsharp/pim_autorp_prevent_crash
pimd: Prevent crash of pim when auto-rp's socket is not initialized
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_autorp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c index 3b46e7fb2b..caed914a87 100644 --- a/pimd/pim_autorp.c +++ b/pimd/pim_autorp.c @@ -1508,12 +1508,14 @@ void pim_autorp_init(struct pim_instance *pim) autorp->discovery_holdtime = DEFAULT_AUTORP_DISCOVERY_HOLDTIME; cand_addrsel_clear(&(autorp->mapping_agent_addrsel)); + pim->autorp = autorp; + if (!pim_autorp_socket_enable(autorp)) { - zlog_warn("%s: AutoRP failed to initialize", __func__); + zlog_warn("%s: AutoRP failed to initialize, feature will not work correctly", + __func__); return; } - pim->autorp = autorp; if (PIM_DEBUG_AUTORP) zlog_debug("%s: AutoRP Initialized", __func__); |