From: Martin Winter <mwinter@opensourcerouting.org>
Date: Wed, 26 Oct 2022 15:17:01 +0000 (-0700)
Subject: ospfd: Log Adjacency Changes with Neighbor IP in addition to Neighbor ID
X-Git-Tag: docker/8.5.1~45^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=07751d58e1581e0fa5b6d7b6a9d11b1fc68ce157;p=mirror%2Ffrr.git

ospfd: Log Adjacency Changes with Neighbor IP in addition to Neighbor ID

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 386d232a1a706310f4425d1a0ad6f08c32646e10)
---

diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index a27550853b..bbfeecd4a1 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -644,12 +644,13 @@ static void nsm_notice_state_change(struct ospf_neighbor *nbr, int next_state,
 	if (CHECK_FLAG(nbr->oi->ospf->config, OSPF_LOG_ADJACENCY_CHANGES)
 	    && (CHECK_FLAG(nbr->oi->ospf->config, OSPF_LOG_ADJACENCY_DETAIL)
 		|| (next_state == NSM_Full) || (next_state < nbr->state)))
-		zlog_notice("AdjChg: Nbr %pI4(%s) on %s: %s -> %s (%s)",
-			    &nbr->router_id,
-			    ospf_get_name(nbr->oi->ospf), IF_NAME(nbr->oi),
-			    lookup_msg(ospf_nsm_state_msg, nbr->state, NULL),
-			    lookup_msg(ospf_nsm_state_msg, next_state, NULL),
-			    ospf_nsm_event_str[event]);
+		zlog_notice(
+			"AdjChg: Nbr %pI4, NbrIP %pI4 (%s) on %s: %s -> %s (%s)",
+			&nbr->router_id, &nbr->src,
+			ospf_get_name(nbr->oi->ospf), IF_NAME(nbr->oi),
+			lookup_msg(ospf_nsm_state_msg, nbr->state, NULL),
+			lookup_msg(ospf_nsm_state_msg, next_state, NULL),
+			ospf_nsm_event_str[event]);
 
 	/* Advance in NSM */
 	if (next_state > nbr->state)