summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2024-12-05 09:12:59 +0200
committerGitHub <noreply@github.com>2024-12-05 09:12:59 +0200
commitdcccad49c3d647f8636eb0b01a0b7f1382f57146 (patch)
treefb28e51541e381c825625199c90d6f4348a66519
parent6d7214ee2b7b6e8cabde81160e7c52ef6b6cb4eb (diff)
parent2faba14459636862be63a9d06d1f6ee2dd61f686 (diff)
Merge pull request #17584 from Jafaral/fix-autorp-crash
pimd: Prevent crash of pim when auto-rp's socket is not initialized (backport #17578)
-rw-r--r--pimd/pim_autorp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c
index df4f809b3d..a07bd4ab3a 100644
--- a/pimd/pim_autorp.c
+++ b/pimd/pim_autorp.c
@@ -1014,12 +1014,13 @@ void pim_autorp_init(struct pim_instance *pim)
autorp->announce_interval = DEFAULT_ANNOUNCE_INTERVAL;
autorp->announce_holdtime = DEFAULT_ANNOUNCE_HOLDTIME;
+ pim->autorp = autorp;
+
if (!pim_autorp_socket_enable(autorp)) {
- zlog_err("%s: AutoRP failed to initialize", __func__);
+ zlog_err("%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__);