proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 13:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7322 from Orange-OpenSource/ospf-sr

Browse Source 
ospfd: Store neighbor Adjacency SID in SR database
This commit is contained in:
Donald Sharp 2020-10-17 13:17:50 -04:00 committed by GitHub
commit 2d9b665e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ospfd/ospf_sr.c
View File

@ -1046,6 +1046,7 @@ static void update_ext_link_sid(struct sr_node *srn, struct sr_link *srl,
struct listnode *node; struct listnode *node;
struct sr_link *lk; struct sr_link *lk;
bool found = false; bool found = false;
bool config = true;
/* Sanity check */ /* Sanity check */
if ((srn == NULL) || (srl == NULL)) if ((srn == NULL) || (srl == NULL))
@ -1053,11 +1054,11 @@ static void update_ext_link_sid(struct sr_node *srn, struct sr_link *srl,
osr_debug(" |- Process Extended Link Adj/Lan-SID"); osr_debug(" |- Process Extended Link Adj/Lan-SID");
/* Skip Local Adj/Lan_Adj SID coming from neighbors */ /* Detect if Adj/Lan_Adj SID must be configured */
if (!CHECK_FLAG(lsa_flags, OSPF_LSA_SELF) if (!CHECK_FLAG(lsa_flags, OSPF_LSA_SELF)
&& (CHECK_FLAG(srl->flags[0], EXT_SUBTLV_LINK_ADJ_SID_LFLG) && (CHECK_FLAG(srl->flags[0], EXT_SUBTLV_LINK_ADJ_SID_LFLG)
|| CHECK_FLAG(srl->flags[1], EXT_SUBTLV_LINK_ADJ_SID_LFLG))) || CHECK_FLAG(srl->flags[1], EXT_SUBTLV_LINK_ADJ_SID_LFLG)))
return; config = false;
/* Search for existing Segment Link */ /* Search for existing Segment Link */
for (ALL_LIST_ELEMENTS_RO(srn->ext_link, node, lk)) for (ALL_LIST_ELEMENTS_RO(srn->ext_link, node, lk))
@ -1077,28 +1078,31 @@ static void update_ext_link_sid(struct sr_node *srn, struct sr_link *srl,
IPV4_ADDR_COPY(&srl->adv_router, &srn->adv_router); IPV4_ADDR_COPY(&srl->adv_router, &srn->adv_router);
listnode_add(srn->ext_link, srl); listnode_add(srn->ext_link, srl);
/* Try to set MPLS table */ /* Try to set MPLS table */
if (compute_link_nhlfe(srl)) { if (config && compute_link_nhlfe(srl)) {
add_adj_sid(srl->nhlfe[0]); add_adj_sid(srl->nhlfe[0]);
add_adj_sid(srl->nhlfe[1]); add_adj_sid(srl->nhlfe[1]);
} }
} else { } else {
/* Update SR-Link if they are different */
if (sr_link_cmp(lk, srl)) { if (sr_link_cmp(lk, srl)) {
/* Try to set MPLS table */
if (config) {
if (compute_link_nhlfe(srl)) { if (compute_link_nhlfe(srl)) {
update_adj_sid(lk->nhlfe[0], srl->nhlfe[0]); update_adj_sid(lk->nhlfe[0],
update_adj_sid(lk->nhlfe[1], srl->nhlfe[1]); srl->nhlfe[0]);
/* Replace Segment List */ update_adj_sid(lk->nhlfe[1],
srl->nhlfe[1]);
} else {
del_adj_sid(lk->nhlfe[0]);
del_adj_sid(lk->nhlfe[1]);
}
}
/* Replace SR-Link in SR-Node Adjacency List */
listnode_delete(srn->ext_link, lk); listnode_delete(srn->ext_link, lk);
XFREE(MTYPE_OSPF_SR_PARAMS, lk); XFREE(MTYPE_OSPF_SR_PARAMS, lk);
srl->srn = srn; srl->srn = srn;
IPV4_ADDR_COPY(&srl->adv_router, IPV4_ADDR_COPY(&srl->adv_router, &srn->adv_router);
&srn->adv_router);
listnode_add(srn->ext_link, srl); listnode_add(srn->ext_link, srl);
} else {
/* New NHLFE was not found.
* Just free the SR Link
*/
XFREE(MTYPE_OSPF_SR_PARAMS, srl);
}
} else { } else {
/* /*
* This is just an LSA refresh. * This is just an LSA refresh.

2
ospfd/ospf_sr.h
View File

@ -269,7 +269,7 @@ struct sr_node {
/* List of Prefix & Link advertise by this node */ /* List of Prefix & Link advertise by this node */
struct list *ext_prefix; /* For Node SID */ struct list *ext_prefix; /* For Node SID */
struct list *ext_link; /* For Adj and LAN SID */ struct list *ext_link; /* For Adjacency SID */
/* Pointer to FRR SR-Node or NULL if it is not a neighbor */ /* Pointer to FRR SR-Node or NULL if it is not a neighbor */
struct sr_node *neighbor; struct sr_node *neighbor;