Merge pull request #19623 from cscarpitta/fix/fix_bgp_srv6_l3vpn_flags

donaldsharp · web-flow · commit 52af40d21222 · 2025-09-25T15:00:34.000-04:00
bgpd: Fix incorrect flag checks for SRv6 SID allocation
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
@@ -10401,12 +10401,12 @@ DEFPY (af_sid_vpn_export,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 	if ((sid_auto || sid_idx != 0) &&
-	    CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VRF_TOVPN_SID_EXPLICIT)) {
+	    CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_SID_EXPLICIT)) {
 		vty_out(vty, "it's already configured as explicit-mode.\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 	if ((sid_idx != 0 || sid_explicit) &&
-	    CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VRF_TOVPN_SID_AUTO)) {
+	    CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_SID_AUTO)) {
 		vty_out(vty, "it's already configured as auto-mode.\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}

Original file line number	Diff line number	Diff line change
`@@ -10401,12 +10401,12 @@ DEFPY (af_sid_vpn_export,`
`10401`	`10401`	`return CMD_WARNING_CONFIG_FAILED;`
`10402`	`10402`	`}`
`10403`	`10403`	`if ((sid_auto \|\| sid_idx != 0) &&`
`10404`		`- CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VRF_TOVPN_SID_EXPLICIT)) {`
	`10404`	`+ CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_SID_EXPLICIT)) {`
`10405`	`10405`	`vty_out(vty, "it's already configured as explicit-mode.\n");`
`10406`	`10406`	`return CMD_WARNING_CONFIG_FAILED;`
`10407`	`10407`	`}`
`10408`	`10408`	`if ((sid_idx != 0 \|\| sid_explicit) &&`
`10409`		`- CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VRF_TOVPN_SID_AUTO)) {`
	`10409`	`+ CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_SID_AUTO)) {`
`10410`	`10410`	`vty_out(vty, "it's already configured as auto-mode.\n");`
`10411`	`10411`	`return CMD_WARNING_CONFIG_FAILED;`
`10412`	`10412`	`}`