Merge branch 'FRRouting:master' into master

Author: ravikumark815

bgpd/bgp_attr.c

@@ -470,9 +470,8 @@ static bool bgp_attr_aigp_get_tlv_metric(uint8_t *pnt, int length,
 			 * and SHOULD be discarded as specified in this section.
 			 */
 			if (*aigp == BGP_AIGP_TLV_METRIC_MAX) {
-				zlog_err("Bad AIGP TLV (%s) length: %llu",
-					 BGP_AIGP_TLV_METRIC_DESC,
-					 BGP_AIGP_TLV_METRIC_MAX);
+				flog_err(EC_BGP_ATTR_AIGP, "Bad AIGP TLV (%s) length: %llu",
+					 BGP_AIGP_TLV_METRIC_DESC, BGP_AIGP_TLV_METRIC_MAX);
 				return false;
 			}
 
@@ -558,7 +557,7 @@ static bool bgp_attr_aigp_valid(uint8_t *pnt, int length)
 	uint8_t *end = data + length;
 
 	if (length < 3) {
-		zlog_err("Bad AIGP attribute length (MUST be minimum 3): %u",
+		flog_err(EC_BGP_ATTR_AIGP, "Bad AIGP attribute length (MUST be minimum 3): %u",
 			 length);
 		return false;
 	}
@@ -575,22 +574,22 @@ static bool bgp_attr_aigp_valid(uint8_t *pnt, int length)
 		(void)data;
 
 		if (length < tlv_length) {
-			zlog_err(
-				"Bad AIGP attribute length: %u, but TLV length: %u",
-				length, tlv_length);
+			flog_err(EC_BGP_ATTR_AIGP,
+				 "Bad AIGP attribute length: %u, but TLV length: %u", length,
+				 tlv_length);
 			return false;
 		}
 
 		if (tlv_length < 3) {
-			zlog_err("Bad AIGP TLV length (MUST be minimum 3): %u",
+			flog_err(EC_BGP_ATTR_AIGP, "Bad AIGP TLV length (MUST be minimum 3): %u",
 				 tlv_length);
 			return false;
 		}
 
 		/* AIGP TLV, Length: 11 */
 		if (tlv_type == BGP_AIGP_TLV_METRIC &&
 		    tlv_length != BGP_AIGP_TLV_METRIC_LEN) {
-			zlog_err("Bad AIGP TLV (%s) length: %u",
+			flog_err(EC_BGP_ATTR_AIGP, "Bad AIGP TLV (%s) length: %u",
 				 BGP_AIGP_TLV_METRIC_DESC, tlv_length);
 			return false;
 		}
@@ -3089,8 +3088,8 @@ static int bgp_attr_encap(struct bgp_attr_parser_args *args)
 
 	if (!CHECK_FLAG(flag, BGP_ATTR_FLAG_TRANS)
 	    || !CHECK_FLAG(flag, BGP_ATTR_FLAG_OPTIONAL)) {
-		zlog_err("Tunnel Encap attribute flag isn't optional and transitive %d",
-			 flag);
+		flog_err(EC_BGP_ATTR_FLAG,
+			 "Tunnel Encap attribute flag isn't optional and transitive %d", flag);
 		return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_OPT_ATTR_ERR,
 					  args->total);
 	}
@@ -3100,8 +3099,8 @@ static int bgp_attr_encap(struct bgp_attr_parser_args *args)
 		uint16_t tlv_length;
 
 		if (length < 4) {
-			zlog_err(
-				"Tunnel Encap attribute not long enough to contain outer T,L");
+			flog_err(EC_BGP_ATTR_LEN,
+				 "Tunnel Encap attribute not long enough to contain outer T,L");
 			return bgp_attr_malformed(args,
 						  BGP_NOTIFY_UPDATE_OPT_ATTR_ERR,
 						  args->total);
@@ -3139,15 +3138,17 @@ static int bgp_attr_encap(struct bgp_attr_parser_args *args)
 		}
 
 		if (sublength > length) {
-			zlog_err("Tunnel Encap attribute sub-tlv length %d exceeds remaining length %d",
+			flog_err(EC_BGP_ATTR_LEN,
+				 "Tunnel Encap attribute sub-tlv length %d exceeds remaining length %d",
 				 sublength, length);
 			return bgp_attr_malformed(args,
 						  BGP_NOTIFY_UPDATE_OPT_ATTR_ERR,
 						  args->total);
 		}
 
 		if (STREAM_READABLE(BGP_INPUT(connection)) < sublength) {
-			zlog_err("Tunnel Encap attribute sub-tlv length %d exceeds remaining stream length %zu",
+			flog_err(EC_BGP_ATTR_LEN,
+				 "Tunnel Encap attribute sub-tlv length %d exceeds remaining stream length %zu",
 				 sublength, STREAM_READABLE(BGP_INPUT(connection)));
 			return bgp_attr_malformed(args,
 						  BGP_NOTIFY_UPDATE_OPT_ATTR_ERR,
@@ -3199,8 +3200,8 @@ static int bgp_attr_encap(struct bgp_attr_parser_args *args)
 
 	if (length) {
 		/* spurious leftover data */
-		zlog_err("Tunnel Encap attribute length is bad: %d leftover octets",
-			 length);
+		flog_err(EC_BGP_ATTR_LEN,
+			 "Tunnel Encap attribute length is bad: %d leftover octets", length);
 		return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_OPT_ATTR_ERR,
 					  args->total);
 	}
@@ -4701,12 +4702,12 @@ static void bgp_packet_nhc(struct stream *s, struct peer *peer, afi_t afi, safi_
 	if (!bpi)
 		return;
 
-	if (bgp_path_info_mpath_count(bpi) < 2 && !nhc)
+	if (bgp_path_info_mpath_count(bpi->net) < 2 && !nhc)
 		return;
 
 	prefix = bgp_dest_get_prefix(bpi->net);
 
-	total = bgp_path_info_mpath_count(bpi) * IPV4_MAX_BYTELEN;
+	total = bgp_path_info_mpath_count(bpi->net) * IPV4_MAX_BYTELEN;
 	total += IPV4_MAX_BYTELEN; /* Next-hop BGP ID */
 
 	stream_putc(s, BGP_ATTR_FLAG_OPTIONAL | BGP_ATTR_FLAG_TRANS);
@@ -4748,7 +4749,7 @@ static void bgp_packet_nhc(struct stream *s, struct peer *peer, afi_t afi, safi_
 	 * |               Next-next-hop BGP IDs (variable)                |
 	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 	 */
-	if (bgp_path_info_mpath_count(bpi) > 1) {
+	if (bgp_path_info_mpath_count(bpi->net) > 1) {
 		if (bgp_debug_update(peer, NULL, NULL, 1))
 			zlog_debug("%pBP: Sending NHC TLV (%d) for %pFX", peer,
 				   BGP_ATTR_NHC_TLV_NNHN, prefix);

bgpd/bgp_bfd.c

@@ -43,7 +43,7 @@ static void bgp_bfd_strict_holdtime_expire(struct event *event)
 
 	if (bgp_debug_neighbor_events(peer))
 		zlog_debug("%pBP BFD Strict mode Hold timer expire for %s", peer,
-			   bgp_peer_get_connection_direction(connection));
+			   bgp_peer_get_connection_direction_string(connection));
 
 	peer_set_last_reset(peer, PEER_DOWN_BFD_DOWN);
 	SET_FLAG(peer->sflags, PEER_STATUS_BFD_STRICT_HOLD_TIME_EXPIRED);

bgpd/bgp_conditional_adv.c

@@ -194,7 +194,7 @@ static void bgp_conditional_adv_timer(struct event *t)
 	 * based on condition(exist-map or non-exist map)
 	 */
 	for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
-		if (!CHECK_FLAG(peer->flags, PEER_FLAG_CONFIG_NODE))
+		if (!peer_is_config_node(peer))
 			continue;
 
 		if (!peer_established(peer->connection))

bgpd/bgp_errors.c

@@ -491,6 +491,84 @@ static struct log_ref ferr_bgp_err[] = {
 		.description = "BGP could not find the label for the specified path_info",
 		.suggestion = "Most likely a bug. This should never happen. Please try to build a reproducer and report.",
 	},
+	{
+		.code = EC_BGP_ROUTE_REFRESH_INVALID,
+		.title = "BGP route refresh message format error",
+		.description = "BGP received an invalid or malformed route refresh message from peer (enhanced route refresh length error, invalid subtype, or EoRR without BoRR)",
+		.suggestion = "Check BGP capability compatibility with peer. Verify enhanced route refresh configuration and ensure proper BoRR/EoRR sequence.",
+	},
+	{
+		.code = EC_BGP_PER_SRC_NHG,
+		.title = "BGP per-source nexthop group resolution failed",
+		.description = "BGP unable to resolve IPv6 nexthop for per-source nexthop group",
+		.suggestion = "Ensure the nexthop group and advertised paths include IPv6 information. Verify per-source nexthop group configuration.",
+	},
+	{
+		.code = EC_BGP_ROUTE_ATTRIBUTE_MALFORMED,
+		.title = "BGP route attribute is malformed or invalid",
+		.description = "BGP received or processed a route with malformed attributes (prefix, RD, ESI, MAC, gateway IP, L2VPN prefix data, address family mismatches, route-map/label-index mismatches) or referenced route not found",
+		.suggestion = "Check route definitions and EVPN/L2VPN configuration. Verify peer configuration for attribute consistency, address family matching, and static route configuration alignment. Ensure all referenced routes exist and route data format is correct.",
+	},
+	{
+		.code = EC_BGP_CONFIG_CONSTRAINT_VIOLATION,
+		.title = "BGP configuration constraint violated",
+		.description = "BGP configuration attempted to change an immutable parameter (e.g., label-index)",
+		.suggestion = "Review configuration changes to ensure immutable parameters are not modified after initial setup.",
+	},
+	{
+		.code = EC_BGP_ROUTE_MAP_SCRIPT,
+		.title = "BGP route-map script execution failed",
+		.description = "BGP route-map script or function failed to load or execute properly",
+		.suggestion = "Debug the route-map script and ensure it returns successful status. Verify script accessibility and correct any errors in the script file.",
+	},
+	{
+		.code = EC_BGP_VRF_NOT_FOUND,
+		.title = "BGP VRF not found",
+		.description = "BGP requested VRF does not exist or cannot be found",
+		.suggestion = "Create the required VRF or correct the configured VRF name.",
+	},
+	{
+		.code = EC_BGP_ZEBRA_MSG_DECODE,
+		.title = "BGP failed to decode message from Zebra",
+		.description = "BGP received a malformed or incompatible message from Zebra daemon",
+		.suggestion = "Ensure BGP and Zebra daemons are version-synchronized and IPC communication is healthy. Check for version mismatches between daemons.",
+	},
+	{
+		.code = EC_BGP_SRV6_LOCATOR_MISMATCH,
+		.title = "BGP SRv6 locator name mismatch",
+		.description = "BGP SRv6 locator advertised by BGP doesn't match the locator name in the SRv6 chunk from Zebra",
+		.suggestion = "Fix the inconsistent SRv6 locator configuration between BGP and Zebra.",
+	},
+	{
+		.code = EC_BGP_INVALID_BGP_INSTANCE_ID,
+		.title = "BGP instance ID out of range",
+		.description = "BGP instance ID specified is outside the valid range",
+		.suggestion = "Set a valid instance ID in the configuration within the allowed range.",
+	},
+	{
+		.code = EC_BGP_SRV6_SID_MODE_CONFLICT,
+		.title = "BGP SRv6 SID mode configuration conflict",
+		.description = "BGP SRv6 configuration has both index-mode and auto-mode enabled simultaneously",
+		.suggestion = "Choose one SRv6 SID mode (typically auto), remove the other from the config, and reapply the import/export settings.",
+	},
+	{
+		.code = EC_BGP_CONFIG_TIMEOUT,
+		.title = "BGP configuration timeout",
+		.description = "BGP configuration end timer expired during config application",
+		.suggestion = "Review provisioning speed or increase the configuration timeout value.",
+	},
+	{
+		.code = EC_BGP_LABEL_POOL_INSERT_FAIL,
+		.title = "BGP label pool insertion failed",
+		.description = "BGP failed to insert a label into the label pool tracking structure",
+		.suggestion = "Restart BGP service. If issues persist, gather log files and open an issue.",
+	},
+	{
+		.code = EC_BGP_TTL_SECURITY_FAIL,
+		.title = "BGP TTL security configuration failed",
+		.description = "BGP failed to configure TTL security parameters (min/max TTL) on peer connection",
+		.suggestion = "Ensure both peers support TTL security feature and verify kernel supports TTL security socket options. Check peer TTL security configuration for compatibility.",
+	},
 	{
 		.code = END_FERR,
 	}

bgpd/bgp_errors.h

@@ -93,6 +93,19 @@ enum bgp_log_refs {
 	EC_BGP_SENDQ_STUCK_WARN,
 	EC_BGP_SENDQ_STUCK_PROPER,
 	EC_BGP_PATH_WITHOUT_LABEL,
+	EC_BGP_ROUTE_REFRESH_INVALID,
+	EC_BGP_PER_SRC_NHG,
+	EC_BGP_ROUTE_ATTRIBUTE_MALFORMED,
+	EC_BGP_CONFIG_CONSTRAINT_VIOLATION,
+	EC_BGP_ROUTE_MAP_SCRIPT,
+	EC_BGP_VRF_NOT_FOUND,
+	EC_BGP_ZEBRA_MSG_DECODE,
+	EC_BGP_SRV6_LOCATOR_MISMATCH,
+	EC_BGP_INVALID_BGP_INSTANCE_ID,
+	EC_BGP_SRV6_SID_MODE_CONFLICT,
+	EC_BGP_CONFIG_TIMEOUT,
+	EC_BGP_LABEL_POOL_INSERT_FAIL,
+	EC_BGP_TTL_SECURITY_FAIL,
 };
 
 extern void bgp_error_init(void);