From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Tue, 15 Oct 2024 09:51:51 +0000 (+0300)
Subject: bgpd: Check if su_local/su_remote exist before encoding BMP peer state
X-Git-Tag: base_10.3~352^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F17103%2Fhead;p=mirror%2Ffrr.git

bgpd: Check if su_local/su_remote exist before encoding BMP peer state

Fixes: 035304c25a3890a040acbe23ca385750b062cdce ("bgpd: bmp loc-rib peer up/down for vrfs")

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 08f8b8b734..bb24d5d69e 100644
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -501,14 +501,14 @@ static struct stream *bmp_peerstate(struct peer *peer, bool down)
 		}
 
 		/* Local Port, Remote Port */
-		if (is_locrib)
+		if (!peer->su_local || is_locrib)
 			stream_putw(s, 0);
 		else if (peer->su_local->sa.sa_family == AF_INET6)
 			stream_putw(s, htons(peer->su_local->sin6.sin6_port));
 		else if (peer->su_local->sa.sa_family == AF_INET)
 			stream_putw(s, htons(peer->su_local->sin.sin_port));
 
-		if (is_locrib)
+		if (!peer->su_remote || is_locrib)
 			stream_putw(s, 0);
 		else if (peer->su_remote->sa.sa_family == AF_INET6)
 			stream_putw(s, htons(peer->su_remote->sin6.sin6_port));