Merge pull request #9257 from FRRouting/mergify/bp/stable/8.0/pr-9255

bgpd: Set extended msg size only if we advertised and received capability (backport #9255)
FRRouting · Aug 3, 2021 · 819ce98 · 819ce98
2 parents 9f46450 + 71d826b
commit 819ce98
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
@@ -1216,7 +1216,8 @@ int bgp_open_option_parse(struct peer *peer, uint8_t length, int *mp_capability)
 
 	/* Extended Message Support */
 	peer->max_packet_size =
-		CHECK_FLAG(peer->cap, PEER_CAP_EXTENDED_MESSAGE_RCV)
+		(CHECK_FLAG(peer->cap, PEER_CAP_EXTENDED_MESSAGE_RCV)
+		 && CHECK_FLAG(peer->cap, PEER_CAP_EXTENDED_MESSAGE_ADV))
 			? BGP_EXTENDED_MESSAGE_MAX_PACKET_SIZE
 			: BGP_STANDARD_MESSAGE_MAX_PACKET_SIZE;