diff options
| -rw-r--r-- | bgpd/bgp_labelpool.c | 6 | ||||
| -rw-r--r-- | bgpd/bgp_labelpool.h | 5 | ||||
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 20 | ||||
| -rw-r--r-- | bgpd/bgp_zebra.c | 12 | ||||
| -rw-r--r-- | bgpd/bgp_zebra.h | 1 |
5 files changed, 38 insertions, 6 deletions
diff --git a/bgpd/bgp_labelpool.c b/bgpd/bgp_labelpool.c index 4d70199938..1b9a7e1aec 100644 --- a/bgpd/bgp_labelpool.c +++ b/bgpd/bgp_labelpool.c @@ -1606,10 +1606,14 @@ void bgp_label_per_nexthop_free(struct bgp_label_per_nexthop_cache *blnc) { if (blnc->label != MPLS_INVALID_LABEL) { bgp_zebra_send_nexthop_label(ZEBRA_MPLS_LABELS_DELETE, - blnc->label, ZEBRA_LSP_BGP, + blnc->label, blnc->nh->ifindex, + blnc->nh->vrf_id, ZEBRA_LSP_BGP, &blnc->nexthop); bgp_lp_release(LP_TYPE_NEXTHOP, blnc, blnc->label); } bgp_label_per_nexthop_cache_del(blnc->tree, blnc); + if (blnc->nh) + nexthop_free(blnc->nh); + blnc->nh = NULL; XFREE(MTYPE_LABEL_PER_NEXTHOP_CACHE, blnc); } diff --git a/bgpd/bgp_labelpool.h b/bgpd/bgp_labelpool.h index fd3656068a..c26d9cd8cf 100644 --- a/bgpd/bgp_labelpool.h +++ b/bgpd/bgp_labelpool.h @@ -66,6 +66,11 @@ struct bgp_label_per_nexthop_cache { /* back pointer to bgp instance */ struct bgp *to_bgp; + /* copy a nexthop resolution from bgp nexthop tracking + * used to extract the interface nexthop + */ + struct nexthop *nh; + /* list of path_vrfs using it */ LIST_HEAD(path_lists, bgp_path_info) paths; diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 01081ff117..dfa275036e 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -1388,8 +1388,9 @@ static int bgp_mplsvpn_get_label_per_nexthop_cb(mpls_label_t label, /* update paths */ if (blnc->label != MPLS_INVALID_LABEL) - bgp_zebra_send_nexthop_label(ZEBRA_MPLS_LABELS_ADD, blnc->label, - ZEBRA_LSP_BGP, &blnc->nexthop); + bgp_zebra_send_nexthop_label( + ZEBRA_MPLS_LABELS_ADD, blnc->label, blnc->nh->ifindex, + blnc->nh->vrf_id, ZEBRA_LSP_BGP, &blnc->nexthop); LIST_FOREACH (pi, &(blnc->paths), label_nh_thread) { if (!pi->net) @@ -1470,6 +1471,21 @@ static mpls_label_t _vpn_leak_from_vrf_get_per_nexthop_label( pi->label_nexthop_cache = blnc; pi->label_nexthop_cache->path_count++; } + + /* then add or update the selected nexthop */ + if (!blnc->nh) + blnc->nh = nexthop_dup(bnc->nexthop, NULL); + else if (!nexthop_same(bnc->nexthop, blnc->nh)) { + nexthop_free(blnc->nh); + blnc->nh = nexthop_dup(bnc->nexthop, NULL); + if (blnc->label != MPLS_INVALID_LABEL) { + bgp_zebra_send_nexthop_label( + ZEBRA_MPLS_LABELS_REPLACE, blnc->label, + bnc->nexthop->ifindex, bnc->nexthop->vrf_id, + ZEBRA_LSP_BGP, &blnc->nexthop); + } + } + return blnc->label; } diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index e8455741e3..6259ad7ea1 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -3892,6 +3892,7 @@ int bgp_zebra_srv6_manager_release_locator_chunk(const char *name) } void bgp_zebra_send_nexthop_label(int cmd, mpls_label_t label, + ifindex_t ifindex, vrf_id_t vrf_id, enum lsp_types_t ltype, struct prefix *p) { struct zapi_labels zl = {}; @@ -3905,9 +3906,14 @@ void bgp_zebra_send_nexthop_label(int cmd, mpls_label_t label, IPV4_ADDR_COPY(&znh->gate.ipv4, &p->u.prefix4); else IPV6_ADDR_COPY(&znh->gate.ipv6, &p->u.prefix6); - znh->type = - (p->family == AF_INET) ? NEXTHOP_TYPE_IPV4 : NEXTHOP_TYPE_IPV6; - znh->ifindex = 0; + if (ifindex == IFINDEX_INTERNAL) + znh->type = (p->family == AF_INET) ? NEXTHOP_TYPE_IPV4 + : NEXTHOP_TYPE_IPV6; + else + znh->type = (p->family == AF_INET) ? NEXTHOP_TYPE_IPV4_IFINDEX + : NEXTHOP_TYPE_IPV6_IFINDEX; + znh->ifindex = ifindex; + znh->vrf_id = vrf_id; znh->label_num = 0; /* vrf_id is DEFAULT_VRF */ diff --git a/bgpd/bgp_zebra.h b/bgpd/bgp_zebra.h index d065f7e724..ff5e6ddbfe 100644 --- a/bgpd/bgp_zebra.h +++ b/bgpd/bgp_zebra.h @@ -120,6 +120,7 @@ extern int bgp_zebra_stale_timer_update(struct bgp *bgp); extern int bgp_zebra_srv6_manager_get_locator_chunk(const char *name); extern int bgp_zebra_srv6_manager_release_locator_chunk(const char *name); extern void bgp_zebra_send_nexthop_label(int cmd, mpls_label_t label, + ifindex_t index, vrf_id_t vrfid, enum lsp_types_t ltype, struct prefix *p); #endif /* _QUAGGA_BGP_ZEBRA_H */ |