bgpd: Enable combined logging for UPDATEs

Before this patch if we enable two commands: * `debug bgp updates in 10.0.0.1` * `debug bgp updates prefix 192.168.0.0/24` We never check both conditions if a prefix and neighbor match. If we see that we enabled logging for a specific neighbor, then we log all the messages related to that neighbor and ignore what prefix we expect. With this patch, we have a combined check and look at prefix + neighbor. Signed-off-by: Donatas Abraitis <[email protected]>
FRRouting · Nov 14, 2023 · 715f4ea · jyuan-panw · Nov 17, 2023 · 715f4ea
1 parent aa521c6
commit 715f4ea
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
@@ -2573,25 +2573,33 @@ bool bgp_debug_update(const struct peer *peer, const struct prefix *p,
 	if (inbound) {
 		if (bgp_debug_per_peer(host, term_bgp_debug_update,
 				       BGP_DEBUG_UPDATE_IN,
-				       bgp_debug_update_in_peers))
+				       bgp_debug_update_in_peers)) {
+			if (BGP_DEBUG(update, UPDATE_PREFIX))
+				return bgp_debug_per_prefix(p,
+							    term_bgp_debug_update,
+							    BGP_DEBUG_UPDATE_PREFIX,
+							    bgp_debug_update_prefixes);
 			return true;
-	}
-
-	/* outbound */
-	else {
+		}
+	} else {
 		if (bgp_debug_per_peer(host, term_bgp_debug_update,
 				       BGP_DEBUG_UPDATE_OUT,
-				       bgp_debug_update_out_peers))
+				       bgp_debug_update_out_peers)) {
+			if (BGP_DEBUG(update, UPDATE_PREFIX))
+				return bgp_debug_per_prefix(p,
+							    term_bgp_debug_update,
+							    BGP_DEBUG_UPDATE_PREFIX,
+							    bgp_debug_update_prefixes);
 			return true;
+		}
 
 		/* Check if update debugging implicitly enabled for the group.
 		 */
 		if (updgrp && UPDGRP_DBG_ON(updgrp))
 			return true;
 	}
 
-
-	if (BGP_DEBUG(update, UPDATE_PREFIX)) {
+	if (!peer && BGP_DEBUG(update, UPDATE_PREFIX)) {
 		if (bgp_debug_per_prefix(p, term_bgp_debug_update,
 					 BGP_DEBUG_UPDATE_PREFIX,
 					 bgp_debug_update_prefixes))