proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-03 04:30:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10977 from bobuhiro11/alloc_sid_based_on_prefix

Browse Source 
bgpd: take SRv6 locator's prefix length into account when generating SIDs
This commit is contained in:
Russ White 2022-04-19 11:17:57 -04:00 committed by GitHub
commit a037a34436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bgpd/bgp_mplsvpn.c
View File

@ -516,28 +516,35 @@ static bool sid_exist(struct bgp *bgp, const struct in6_addr *sid)
} }
/* /*
* This function generates a new SID based on bgp->srv6_locator_chunks and
* index. The locator and generated SID are stored in arguments sid_locator
* and sid, respectively.
*
* if index != 0: try to allocate as index-mode * if index != 0: try to allocate as index-mode
* else: try to allocate as auto-mode * else: try to allocate as auto-mode
*/ */
static uint32_t alloc_new_sid(struct bgp *bgp, uint32_t index, static uint32_t alloc_new_sid(struct bgp *bgp, uint32_t index,
struct in6_addr *sid_locator) struct in6_addr *sid_locator,
struct in6_addr *sid)
{ {
struct listnode *node; struct listnode *node;
struct srv6_locator_chunk *chunk; struct srv6_locator_chunk *chunk;
struct in6_addr sid_buf;
bool alloced = false; bool alloced = false;
int label = 0; int label = 0;
uint8_t offset = 0;
if (!bgp || !sid_locator) if (!bgp || !sid_locator || !sid)
return false; return false;
for (ALL_LIST_ELEMENTS_RO(bgp->srv6_locator_chunks, node, chunk)) { for (ALL_LIST_ELEMENTS_RO(bgp->srv6_locator_chunks, node, chunk)) {
*sid_locator = chunk->prefix.prefix; *sid_locator = chunk->prefix.prefix;
sid_buf = chunk->prefix.prefix; *sid = chunk->prefix.prefix;
offset = chunk->block_bits_length + chunk->node_bits_length;
if (index != 0) { if (index != 0) {
label = index << 12; label = index << 12;
transpose_sid(&sid_buf, label, 64, 16); transpose_sid(sid, label, offset, 16);
if (sid_exist(bgp, &sid_buf)) if (sid_exist(bgp, sid))
return false; return false;
alloced = true; alloced = true;
break; break;
@ -545,8 +552,8 @@ static uint32_t alloc_new_sid(struct bgp *bgp, uint32_t index,
for (size_t i = 1; i < 255; i++) { for (size_t i = 1; i < 255; i++) {
label = i << 12; label = i << 12;
transpose_sid(&sid_buf, label, 64, 16); transpose_sid(sid, label, offset, 16);
if (sid_exist(bgp, &sid_buf)) if (sid_exist(bgp, sid))
continue; continue;
alloced = true; alloced = true;
break; break;
@ -556,7 +563,7 @@ static uint32_t alloc_new_sid(struct bgp *bgp, uint32_t index,
if (!alloced) if (!alloced)
return 0; return 0;
sid_register(bgp, &sid_buf, bgp->srv6_locator_name); sid_register(bgp, sid, bgp->srv6_locator_name);
return label; return label;
} }
@ -600,20 +607,19 @@ void ensure_vrf_tovpn_sid(struct bgp *bgp_vpn, struct bgp *bgp_vrf, afi_t afi)
tovpn_sid_locator = tovpn_sid_locator =
XCALLOC(MTYPE_BGP_SRV6_SID, sizeof(struct in6_addr)); XCALLOC(MTYPE_BGP_SRV6_SID, sizeof(struct in6_addr));
tovpn_sid_transpose_label = tovpn_sid = XCALLOC(MTYPE_BGP_SRV6_SID, sizeof(struct in6_addr));
alloc_new_sid(bgp_vpn, tovpn_sid_index, tovpn_sid_locator);
tovpn_sid_transpose_label = alloc_new_sid(bgp_vpn, tovpn_sid_index,
tovpn_sid_locator, tovpn_sid);
if (tovpn_sid_transpose_label == 0) { if (tovpn_sid_transpose_label == 0) {
zlog_debug("%s: not allocated new sid for vrf %s: afi %s", zlog_debug("%s: not allocated new sid for vrf %s: afi %s",
__func__, bgp_vrf->name_pretty, afi2str(afi)); __func__, bgp_vrf->name_pretty, afi2str(afi));
XFREE(MTYPE_BGP_SRV6_SID, tovpn_sid_locator);
XFREE(MTYPE_BGP_SRV6_SID, tovpn_sid);
return; return;
} }
tovpn_sid = XCALLOC(MTYPE_BGP_SRV6_SID, sizeof(struct in6_addr));
*tovpn_sid = *tovpn_sid_locator;
transpose_sid(tovpn_sid, tovpn_sid_transpose_label,
BGP_PREFIX_SID_SRV6_TRANSPOSITION_OFFSET,
BGP_PREFIX_SID_SRV6_TRANSPOSITION_LENGTH);
if (debug) { if (debug) {
inet_ntop(AF_INET6, tovpn_sid, buf, sizeof(buf)); inet_ntop(AF_INET6, tovpn_sid, buf, sizeof(buf));
zlog_debug("%s: new sid %s allocated for vrf %s: afi %s", zlog_debug("%s: new sid %s allocated for vrf %s: afi %s",