Merge pull request FRRouting#19918 from enkechen-panw/bgp-originator

donaldsharp · web-flow · commit 543f2c78a1dd · 2025-11-01T11:18:26.000-04:00
bgpd: fix BGP_ATTR_ORIGINATOR_ID flag in outbound attribute cache
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -2456,7 +2456,7 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi,
 	   set the originator id */
 	if (ibgp_to_ibgp && (!CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID)))) {
 		IPV4_ADDR_COPY(&(attr->originator_id), &(from->remote_id));
-		SET_FLAG(attr->flag, BGP_ATTR_ORIGINATOR_ID);
+		SET_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID));
 	}
 
 	/* Remove MED if its an EBGP peer - will get overwritten by route-maps

Original file line number	Diff line number	Diff line change
`@@ -2456,7 +2456,7 @@ bool subgroup_announce_check(struct bgp_dest dest, struct bgp_path_info pi,`
`2456`	`2456`	`set the originator id */`
`2457`	`2457`	`if (ibgp_to_ibgp && (!CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID)))) {`
`2458`	`2458`	`IPV4_ADDR_COPY(&(attr->originator_id), &(from->remote_id));`
`2459`		`- SET_FLAG(attr->flag, BGP_ATTR_ORIGINATOR_ID);`
	`2459`	`+ SET_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID));`
`2460`	`2460`	`}`
`2461`	`2461`
`2462`	`2462`	`/* Remove MED if its an EBGP peer - will get overwritten by route-maps`