From 1afa3cbbe7e3f932a3f2c2c1c609bab08001d6ab Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 15 Sep 2024 17:23:34 +0200 Subject: lib: Include SID structure in seg6local nexthop Include SID structure information in seg6local nexthop data structure. Signed-off-by: Carmine Scarpitta --- lib/srv6.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/srv6.h b/lib/srv6.h index e0db30cd13..e5cd727235 100644 --- a/lib/srv6.h +++ b/lib/srv6.h @@ -71,6 +71,10 @@ struct seg6local_context { struct in_addr nh4; struct in6_addr nh6; uint32_t table; + uint8_t block_len; + uint8_t node_len; + uint8_t function_len; + uint8_t argument_len; }; struct srv6_locator { -- cgit v1.2.3 From 89efcb29b1da7d821b389c5631f831c0df749acd Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 15 Sep 2024 18:53:35 +0200 Subject: bgpd: Include structure when installing End.DT4/6 SID Include SID structure information when installing an SRv6 End.DT6 or End.DT4 SID in the forwarding plane. Signed-off-by: Carmine Scarpitta --- bgpd/bgp_mplsvpn.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 5d7aefa736..33883fbca2 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -395,6 +395,12 @@ void vpn_leak_zebra_vrf_sid_update(struct bgp *bgp, afi_t afi) if (!vrf) return; + if (bgp->vpn_policy[afi].tovpn_sid_locator) { + ctx.block_len = BGP_PREFIX_SID_SRV6_LOCATOR_BLOCK_LENGTH; + ctx.node_len = BGP_PREFIX_SID_SRV6_LOCATOR_NODE_LENGTH; + ctx.function_len = BGP_PREFIX_SID_SRV6_FUNCTION_LENGTH; + ctx.argument_len = BGP_PREFIX_SID_SRV6_ARGUMENT_LENGTH; + } ctx.table = vrf->data.l.table_id; act = afi == AFI_IP ? ZEBRA_SEG6_LOCAL_ACTION_END_DT4 : ZEBRA_SEG6_LOCAL_ACTION_END_DT6; -- cgit v1.2.3 From 38653edbf53ef91e4c0c81bdcd075aa4ed1e0493 Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sun, 15 Sep 2024 18:56:21 +0200 Subject: bgpd: Include structure when removing End.DT4/6 SID Include SID structure information when removing an SRv6 End.DT4 or End.DT6 SID from the forwarding plane. Signed-off-by: Carmine Scarpitta --- bgpd/bgp_mplsvpn.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 33883fbca2..7f3559bf0f 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -418,6 +418,7 @@ void vpn_leak_zebra_vrf_sid_update(struct bgp *bgp, afi_t afi) void vpn_leak_zebra_vrf_sid_withdraw(struct bgp *bgp, afi_t afi) { int debug = BGP_DEBUG(vpn, VPN_LEAK_LABEL); + struct seg6local_context seg6localctx = {}; if (bgp->vrf_id == VRF_UNKNOWN) { if (debug) @@ -430,9 +431,16 @@ void vpn_leak_zebra_vrf_sid_withdraw(struct bgp *bgp, afi_t afi) zlog_debug("%s: deleting sid for vrf %s afi (id=%d)", __func__, bgp->name_pretty, bgp->vrf_id); - zclient_send_localsid(zclient, - bgp->vpn_policy[afi].tovpn_zebra_vrf_sid_last_sent, - bgp->vrf_id, ZEBRA_SEG6_LOCAL_ACTION_UNSPEC, NULL); + if (bgp->vpn_policy[afi].tovpn_sid_locator) { + seg6localctx.block_len = + BGP_PREFIX_SID_SRV6_LOCATOR_BLOCK_LENGTH; + seg6localctx.node_len = BGP_PREFIX_SID_SRV6_LOCATOR_NODE_LENGTH; + seg6localctx.function_len = BGP_PREFIX_SID_SRV6_FUNCTION_LENGTH; + seg6localctx.argument_len = BGP_PREFIX_SID_SRV6_ARGUMENT_LENGTH; + } + zclient_send_localsid( + zclient, bgp->vpn_policy[afi].tovpn_zebra_vrf_sid_last_sent, + bgp->vrf_id, ZEBRA_SEG6_LOCAL_ACTION_UNSPEC, &seg6localctx); XFREE(MTYPE_BGP_SRV6_SID, bgp->vpn_policy[afi].tovpn_zebra_vrf_sid_last_sent); } -- cgit v1.2.3