Merge branch 'FRRouting:master' into bfd_rfc_fix

Author: SpadeMomo

.github/PULL_REQUEST_TEMPLATE/pr.md …EQUEST_TEMPLATE/pull_request_template.md.github/PULL_REQUEST_TEMPLATE/pr.md renamed to .github/PULL_REQUEST_TEMPLATE/pull_request_template.md .github/PULL_REQUEST_TEMPLATE/pr.md renamed to .github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,6 @@
+pull_request_rules:
+  - name: Delete merged branch
+    conditions:
+      - merged
+    actions:
+      delete_head_branch:

.github/mergify.yml

@@ -24,6 +24,7 @@ jobs:
         -  { os: 'ubuntu-latest' ,rel: '24.04',  name: 'Ubuntu 24.04 amd64 Build',platform : 'amd64_u24' }
         -  { os: 'ubuntu-22.04-arm' ,rel: '22.04',  name: 'Ubuntu 22.04 arm64 Build',platform : 'arm64_u22' }
         -  { os: 'ubuntu-22.04-arm' ,rel: '24.04',  name: 'Ubuntu 24.04 arm64 Build',platform : 'arm64_u24' }
+        -  { os: 'ubuntu-latest' ,rel: '24.04',  name: 'Ubuntu 24.04 amd64 LTTng Build',platform : 'amd64_u24_lttng', lttng: 'true' }
 
     steps:
       - name: Checkout
@@ -32,7 +33,7 @@ jobs:
           fetch-depth: 1
       - name: Build docker image
         run: |
-          docker build --no-cache -t frr-${{ matrix.cfg.platform }} --build-arg=UBUNTU_VERSION=${{ matrix.cfg.rel }} -f docker/ubuntu-ci/Dockerfile .
+          docker build --no-cache -t frr-${{ matrix.cfg.platform }} --build-arg=UBUNTU_VERSION=${{ matrix.cfg.rel }} --build-arg=ENABLE_LTTNG=${{ matrix.cfg.lttng || 'false' }} -f docker/ubuntu-ci/Dockerfile .
           docker save --output /tmp/frr-${{ matrix.cfg.platform }}.tar frr-${{ matrix.cfg.platform }}
       - name: Upload docker image artifact
         uses: actions/upload-artifact@v4

.github/workflows/github-ci.yml

@@ -209,6 +209,8 @@ static void _display_peer(struct vty *vty, struct bfd_session *bs)
 		_display_rtt(&min, &avg, &max, bs);
 		vty_out(vty, "\t\tRTT min/avg/max: %u/%u/%u usec\n", min, avg, max);
 	}
+	if (bs->profile_name)
+		vty_out(vty, "\t\tProfile: %s\n", bs->profile_name);
 
 	vty_out(vty, "\t\tLocal timers:\n");
 	vty_out(vty, "\t\t\tDetect-multiplier: %u\n",
@@ -341,6 +343,9 @@ static struct json_object *__display_peer_json(struct bfd_session *bs)
 	else
 		json_object_string_add(jo, "type", "dynamic");
 
+	if (bs->profile_name)
+		json_object_string_add(jo, "profile", bs->profile_name);
+
 	json_object_int_add(jo, "receive-interval",
 			    bs->timers.required_min_rx / 1000);
 	json_object_int_add(jo, "transmit-interval",
@@ -788,14 +793,16 @@ static void _display_peer_brief(struct vty *vty, struct bfd_session *bs)
 		vty_out(vty, " %-40s", addr_buf);
 		inet_ntop(bs->key.family, &bs->key.peer, addr_buf, sizeof(addr_buf));
 		vty_out(vty, " %-40s", addr_buf);
-		vty_out(vty, "%-15s\n", state_list[bs->ses_state].str);
+		vty_out(vty, "%-15s", state_list[bs->ses_state].str);
+		vty_out(vty, " %-20s\n", bs->profile_name ? bs->profile_name : "-");
 	} else {
 		vty_out(vty, "%-10u", bs->discrs.my_discr);
 		vty_out(vty, " %-40s", satostr(&bs->local_address));
 		inet_ntop(bs->key.family, &bs->key.peer, addr_buf, sizeof(addr_buf));
 		vty_out(vty, " %-40s", addr_buf);
 
-		vty_out(vty, "%-15s\n", state_list[bs->ses_state].str);
+		vty_out(vty, "%-15s", state_list[bs->ses_state].str);
+		vty_out(vty, " %-20s\n", bs->profile_name ? bs->profile_name : "-");
 	}
 }
 
@@ -832,12 +839,14 @@ static void _display_peers_brief(struct vty *vty, const char *vrfname, bool use_
 		vty_out(vty, "%-10s", "SessionId");
 		vty_out(vty, " %-40s", "LocalAddress");
 		vty_out(vty, " %-40s", "PeerAddress");
-		vty_out(vty, "%-15s\n", "Status");
+		vty_out(vty, "%-15s", "Status");
+		vty_out(vty, " %-20s\n", "Profile");
 
 		vty_out(vty, "%-10s", "=========");
 		vty_out(vty, " %-40s", "============");
 		vty_out(vty, " %-40s", "===========");
-		vty_out(vty, "%-15s\n", "======");
+		vty_out(vty, "%-15s", "======");
+		vty_out(vty, " %-20s\n", "=======");
 
 		bfd_id_iterate(_display_peer_brief_iter, &bvt);
 		return;

bfdd/bfdd_vty.c

@@ -103,7 +103,8 @@ struct bgp_advertise_attr *bgp_advertise_attr_intern(struct hash *hash,
 	struct bgp_advertise_attr ref;
 	struct bgp_advertise_attr *baa;
 
-	ref.attr = bgp_attr_intern(attr);
+	/* The attr is already intern'ed */
+	ref.attr = attr;
 	baa = (struct bgp_advertise_attr *)hash_get(
 		hash, &ref, bgp_advertise_attr_hash_alloc);
 	baa->refcnt++;

bgpd/bgp_advertise.c

@@ -69,9 +69,6 @@ struct bgp_adj_out {
 
 	uint32_t addpath_tx_id;
 
-	/* Attribute hash */
-	uint32_t attr_hash;
-
 	/* Advertised attribute.  */
 	struct attr *attr;
 

bgpd/bgp_advertise.h

@@ -1533,7 +1533,7 @@ void bgp_attr_unintern_sub(struct attr *attr)
 	struct bgp_route_evpn *bre;
 	struct bgp_nhc *nhc;
 
-	/* aspath refcount shoud be decrement. */
+	/* aspath refcount should be decrement. */
 	aspath_unintern(&attr->aspath);
 	bgp_attr_unset(attr, BGP_ATTR_AS_PATH);
 
@@ -1712,7 +1712,7 @@ bgp_attr_malformed(struct bgp_attr_parser_args *args, uint8_t subcode,
 	const uint8_t flags = args->flags;
 	/* startp and length must be special-cased, as whether or not to
 	 * send the attribute data with the NOTIFY depends on the error,
-	 * the caller therefore signals this with the seperate length argument
+	 * the caller therefore signals this with the separate length argument
 	 */
 	uint8_t *notify_datap = (length > 0 ? args->startp : NULL);
 
@@ -2198,7 +2198,7 @@ bgp_attr_nexthop(struct bgp_attr_parser_args *args)
 	return BGP_ATTR_PARSE_PROCEED;
 }
 
-/* MED atrribute. */
+/* MED attribute. */
 static enum bgp_attr_parse_ret bgp_attr_med(struct bgp_attr_parser_args *args)
 {
 	struct peer_connection *const connection = args->connection;
@@ -3020,7 +3020,7 @@ bgp_attr_ext_communities(struct bgp_attr_parser_args *args)
 
 	/* Handle scenario where router flag ecommunity is not
 	 * set but default gw ext community is present.
-	 * Use default gateway, set and propogate R-bit.
+	 * Use default gateway, set and propagate R-bit.
 	 */
 	if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW))
 		SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_ROUTER);
@@ -3253,7 +3253,7 @@ bgp_attr_srv6_service_data(struct bgp_attr_parser_args *args)
 
 	if (STREAM_READABLE(connection->curr) < headersz) {
 		flog_err(EC_BGP_ATTR_LEN,
-			 "Malformed SRv6 Service Data Sub-Sub-TLV attribute - insufficent data (need %zu for attribute header, have %zu remaining in UPDATE)",
+			 "Malformed SRv6 Service Data Sub-Sub-TLV attribute - insufficient data (need %zu for attribute header, have %zu remaining in UPDATE)",
 			 headersz, STREAM_READABLE(connection->curr));
 		return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
 					  args->total);
@@ -3264,7 +3264,7 @@ bgp_attr_srv6_service_data(struct bgp_attr_parser_args *args)
 
 	if (STREAM_READABLE(connection->curr) < length) {
 		flog_err(EC_BGP_ATTR_LEN,
-			 "Malformed SRv6 Service Data Sub-Sub-TLV attribute - insufficent data (need %hu for attribute data, have %zu remaining in UPDATE)",
+			 "Malformed SRv6 Service Data Sub-Sub-TLV attribute - insufficient data (need %hu for attribute data, have %zu remaining in UPDATE)",
 			 length, STREAM_READABLE(connection->curr));
 		return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
 					  args->total);
@@ -3347,7 +3347,7 @@ bgp_attr_srv6_service(struct bgp_attr_parser_args *args)
 
 	if (STREAM_READABLE(connection->curr) < headersz) {
 		flog_err(EC_BGP_ATTR_LEN,
-			 "Malformed SRv6 Service Sub-TLV attribute - insufficent data (need %zu for attribute header, have %zu remaining in UPDATE)",
+			 "Malformed SRv6 Service Sub-TLV attribute - insufficient data (need %zu for attribute header, have %zu remaining in UPDATE)",
 			 headersz, STREAM_READABLE(connection->curr));
 		return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
 					  args->total);
@@ -3358,7 +3358,7 @@ bgp_attr_srv6_service(struct bgp_attr_parser_args *args)
 
 	if (STREAM_READABLE(connection->curr) < length) {
 		flog_err(EC_BGP_ATTR_LEN,
-			 "Malformed SRv6 Service Sub-TLV attribute - insufficent data (need %hu for attribute data, have %zu remaining in UPDATE)",
+			 "Malformed SRv6 Service Sub-TLV attribute - insufficient data (need %hu for attribute data, have %zu remaining in UPDATE)",
 			 length, STREAM_READABLE(connection->curr));
 		return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
 					  args->total);
@@ -3368,7 +3368,7 @@ bgp_attr_srv6_service(struct bgp_attr_parser_args *args)
 		if (STREAM_READABLE(connection->curr) <
 		    BGP_PREFIX_SID_SRV6_L3_SERVICE_SID_INFO_LENGTH) {
 			flog_err(EC_BGP_ATTR_LEN,
-				 "Malformed SRv6 Service Sub-TLV attribute - insufficent data (need %d for attribute data, have %zu remaining in UPDATE)",
+				 "Malformed SRv6 Service Sub-TLV attribute - insufficient data (need %d for attribute data, have %zu remaining in UPDATE)",
 				 BGP_PREFIX_SID_SRV6_L3_SERVICE_SID_INFO_LENGTH,
 				 STREAM_READABLE(connection->curr));
 			return bgp_attr_malformed(
@@ -3633,7 +3633,7 @@ enum bgp_attr_parse_ret bgp_attr_prefix_sid(struct bgp_attr_parser_args *args)
 	while (STREAM_READABLE(connection->curr) > 0 && psid_parsed_length < args->length) {
 		if (STREAM_READABLE(connection->curr) < headersz) {
 			flog_err(EC_BGP_ATTR_LEN,
-				 "Malformed Prefix SID attribute - insufficent data (need %zu for attribute header, have %zu remaining in UPDATE)",
+				 "Malformed Prefix SID attribute - insufficient data (need %zu for attribute header, have %zu remaining in UPDATE)",
 				 headersz, STREAM_READABLE(connection->curr));
 			return bgp_attr_malformed(
 				args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
@@ -4185,7 +4185,7 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr,
 			goto done;
 		}
 
-		/* Check extended attribue length bit. */
+		/* Check extended attribute length bit. */
 		if (CHECK_FLAG(flag, BGP_ATTR_FLAG_EXTLEN))
 			length = stream_getw(BGP_INPUT(connection));
 		else
@@ -4217,8 +4217,8 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr,
 		/* If attribute appears more than once in the UPDATE message,
 		 * for MP_REACH_NLRI & MP_UNREACH_NLRI attributes
 		 * the Error Subcode is set to Malformed Attribute List.
-		 * For all other attributes, all the occurances of the attribute
-		 * other than the first occurence is discarded. (RFC7606 3g)
+		 * For all other attributes, all the occurrences of the attribute
+		 * other than the first occurrence is discarded. (RFC7606 3g)
 		 */
 
 		if (CHECK_BITMAP(seen, type)) {
@@ -4484,7 +4484,7 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr,
 	/*
 	 * At this stage, we have done all fiddling with as4, and the
 	 * resulting info is in attr->aggregator resp. attr->aspath so
-	 * we can chuck as4_aggregator and as4_path alltogether in order
+	 * we can chuck as4_aggregator and as4_path altogether in order
 	 * to save memory
 	 */
 	/*

bgpd/bgp_attr.c

@@ -56,7 +56,7 @@ extern void bgp_peer_remove_bfd_config(struct peer *p);
 
 /**
  * Special function to handle the case of changing source address. This
- * happens when the peer/group is configured with `neigbor X update-source Y`.
+ * happens when the peer/group is configured with `neighbor X update-source Y`.
  */
 extern void bgp_peer_bfd_update_source(struct peer *p);
 

bgpd/bgp_bfd.h

@@ -1408,7 +1408,7 @@ static bool bmp_wrsync(struct bmp *bmp, struct pullwr *pullwr)
 					memset(&bmp->syncpos, 0,
 					       sizeof(bmp->syncpos));
 					bmp->syncpos.family = afi2family(afi);
-					/* check whethere there is a valid
+					/* check whether there is a valid
 					 * next mid-layer table, otherwise
 					 * declare table completed (eor)
 					 */

bgpd/bgp_bmp.c

@@ -1420,7 +1420,7 @@ void extcommunity_list_unset(struct community_list_handler *ch,
 	route_map_notify_dependencies(name, RMAP_EVENT_ECLIST_DELETED);
 }
 
-/* Initializa community-list.  Return community-list handler.  */
+/* Initialize community-list.  Return community-list handler.  */
 struct community_list_handler *community_list_init(void)
 {
 	struct community_list_handler *ch;