Skip to content

Commit

Permalink
Merge pull request #16223 from donaldsharp/bgp_vrf_name
Browse files Browse the repository at this point in the history 
bgpd: Convert over to using vrf name instead of id
  • Loading branch information
@ton31337
ton31337 authored Jun 19, 2024
2 parents a1b21f5 + d10bd26 commit 86d2466
Showing 1 changed file with 37 additions and 36 deletions.
73 changes: 37 additions & 36 deletions bgpd/bgp_zebra.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ static int bgp_ifp_destroy(struct interface *ifp)
bgp = ifp->vrf->info;

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Rx Intf del VRF %u IF %s", ifp->vrf->vrf_id,
zlog_debug("Rx Intf del VRF %s IF %s", ifp->vrf->name,
ifp->name);

if (bgp) {
Expand All @@ -220,8 +220,7 @@ static int bgp_ifp_up(struct interface *ifp)
bgp_mac_add_mac_entry(ifp);

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Rx Intf up VRF %u IF %s", ifp->vrf->vrf_id,
ifp->name);
zlog_debug("Rx Intf up VRF %s IF %s", ifp->vrf->name, ifp->name);

if (!bgp)
return 0;
Expand Down Expand Up @@ -259,7 +258,7 @@ static int bgp_ifp_down(struct interface *ifp)
bgp_mac_del_mac_entry(ifp);

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Rx Intf down VRF %u IF %s", ifp->vrf->vrf_id,
zlog_debug("Rx Intf down VRF %s IF %s", ifp->vrf->name,
ifp->name);

if (!bgp)
Expand Down Expand Up @@ -320,8 +319,8 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS)
return 0;

if (bgp_debug_zebra(ifc->address))
zlog_debug("Rx Intf address add VRF %u IF %s addr %pFX", vrf_id,
ifc->ifp->name, ifc->address);
zlog_debug("Rx Intf address add VRF %s IF %s addr %pFX",
ifc->ifp->vrf->name, ifc->ifp->name, ifc->address);

if (!bgp)
return 0;
Expand Down Expand Up @@ -417,8 +416,8 @@ static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS)
return 0;

if (bgp_debug_zebra(ifc->address))
zlog_debug("Rx Intf address del VRF %u IF %s addr %pFX", vrf_id,
ifc->ifp->name, ifc->address);
zlog_debug("Rx Intf address del VRF %s IF %s addr %pFX",
ifc->ifp->vrf->name, ifc->ifp->name, ifc->address);

if (bgp && if_is_operative(ifc->ifp)) {
bgp_connected_delete(bgp, ifc);
Expand Down Expand Up @@ -480,8 +479,8 @@ static int bgp_interface_nbr_address_add(ZAPI_CALLBACK_ARGS)
return 0;

if (bgp_debug_zebra(ifc->address))
zlog_debug("Rx Intf neighbor add VRF %u IF %s addr %pFX",
vrf_id, ifc->ifp->name, ifc->address);
zlog_debug("Rx Intf neighbor add VRF %s IF %s addr %pFX",
ifc->ifp->vrf->name, ifc->ifp->name, ifc->address);

if (if_is_operative(ifc->ifp)) {
bgp = bgp_lookup_by_vrf_id(vrf_id);
Expand All @@ -503,8 +502,8 @@ static int bgp_interface_nbr_address_delete(ZAPI_CALLBACK_ARGS)
return 0;

if (bgp_debug_zebra(ifc->address))
zlog_debug("Rx Intf neighbor del VRF %u IF %s addr %pFX",
vrf_id, ifc->ifp->name, ifc->address);
zlog_debug("Rx Intf neighbor del VRF %s IF %s addr %pFX",
ifc->ifp->vrf->name, ifc->ifp->name, ifc->address);

if (if_is_operative(ifc->ifp)) {
bgp = bgp_lookup_by_vrf_id(vrf_id);
Expand Down Expand Up @@ -586,13 +585,14 @@ static int zebra_read_route(ZAPI_CALLBACK_ARGS)
if (add) {
inet_ntop(api.prefix.family, &nexthop, buf,
sizeof(buf));
zlog_debug(
"Rx route ADD VRF %u %s[%d] %pFX nexthop %s (type %d if %u) metric %u distance %u tag %" ROUTE_TAG_PRI,
vrf_id, zebra_route_string(api.type),
api.instance, &api.prefix, buf, nhtype, ifindex,
api.metric, api.distance, api.tag);
zlog_debug("Rx route ADD %s %s[%d] %pFX nexthop %s (type %d if %u) metric %u distance %u tag %" ROUTE_TAG_PRI,
bgp->name_pretty,
zebra_route_string(api.type), api.instance,
&api.prefix, buf, nhtype, ifindex,
api.metric, api.distance, api.tag);
} else {
zlog_debug("Rx route DEL VRF %u %s[%d] %pFX", vrf_id,
zlog_debug("Rx route DEL %s %s[%d] %pFX",
bgp->name_pretty,
zebra_route_string(api.type), api.instance,
&api.prefix);
}
Expand Down Expand Up @@ -1671,11 +1671,11 @@ bgp_zebra_announce_actual(struct bgp_dest *dest, struct bgp_path_info *info,
}

if (bgp_debug_zebra(p)) {
zlog_debug(
"Tx route %s VRF %u %pFX metric %u tag %" ROUTE_TAG_PRI
" count %d nhg %d",
is_add ? "add" : "delete", bgp->vrf_id, &api.prefix,
api.metric, api.tag, api.nexthop_num, nhg_id);
zlog_debug("Tx route %s %s %pFX metric %u tag %" ROUTE_TAG_PRI
" count %d nhg %d",
is_add ? "add" : "delete", bgp->name_pretty,
&api.prefix, api.metric, api.tag, api.nexthop_num,
nhg_id);
bgp_debug_zebra_nh(&api);

zlog_debug("%s: %pFX: announcing to zebra (recursion %sset)",
Expand Down Expand Up @@ -1764,7 +1764,7 @@ enum zclient_send_status bgp_zebra_withdraw_actual(struct bgp_dest *dest,
}

if (bgp_debug_zebra(p))
zlog_debug("Tx route delete VRF %u %pFX", bgp->vrf_id,
zlog_debug("Tx route delete %s %pFX", bgp->name_pretty,
&api.prefix);

return zclient_route_send(ZEBRA_ROUTE_DELETE, zclient, &api);
Expand Down Expand Up @@ -1805,8 +1805,9 @@ static void bgp_handle_route_announcements_to_zebra(struct event *e)
is_evpn = true;

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("BGP %s route %pBD(%s) with dest %p and flags 0x%x to zebra",
install ? "announcing" : "withdrawing", dest,
zlog_debug("BGP %s%s route %pBD(%s) with dest %p and flags 0x%x to zebra",
install ? "announcing" : "withdrawing",
is_evpn ? " evpn" : " ", dest,
table->bgp->name_pretty, dest, dest->flags);

if (install) {
Expand Down Expand Up @@ -2085,8 +2086,8 @@ int bgp_redistribute_set(struct bgp *bgp, afi_t afi, int type,
return CMD_SUCCESS;

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Tx redistribute add VRF %u afi %d %s %d",
bgp->vrf_id, afi, zebra_route_string(type),
zlog_debug("Tx redistribute add %s afi %d %s %d",
bgp->name_pretty, afi, zebra_route_string(type),
instance);

/* Send distribute add message to zebra. */
Expand All @@ -2106,8 +2107,8 @@ int bgp_redistribute_resend(struct bgp *bgp, afi_t afi, int type,
return -1;

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Tx redistribute del/add VRF %u afi %d %s %d",
bgp->vrf_id, afi, zebra_route_string(type),
zlog_debug("Tx redistribute del/add %s afi %d %s %d",
bgp->name_pretty, afi, zebra_route_string(type),
instance);

/* Send distribute add message to zebra. */
Expand Down Expand Up @@ -2201,9 +2202,9 @@ int bgp_redistribute_unreg(struct bgp *bgp, afi_t afi, int type,
if (bgp_install_info_to_zebra(bgp)) {
/* Send distribute delete message to zebra. */
if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Tx redistribute del VRF %u afi %d %s %d",
bgp->vrf_id, afi, zebra_route_string(type),
instance);
zlog_debug("Tx redistribute del %s afi %d %s %d",
bgp->name_pretty, afi,
zebra_route_string(type), instance);
zebra_redistribute_send(ZEBRA_REDISTRIBUTE_DELETE, zclient, afi,
type, instance, bgp->vrf_id);
}
Expand Down Expand Up @@ -2306,7 +2307,7 @@ void bgp_zebra_instance_register(struct bgp *bgp)
return;

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Registering VRF %u", bgp->vrf_id);
zlog_debug("Registering %s", bgp->name_pretty);

/* Register for router-id, interfaces, redistributed routes. */
zclient_send_reg_requests(zclient, bgp->vrf_id);
Expand All @@ -2328,7 +2329,7 @@ void bgp_zebra_instance_deregister(struct bgp *bgp)
return;

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Deregistering VRF %u", bgp->vrf_id);
zlog_debug("Deregistering %s", bgp->name_pretty);

/* For EVPN instance, unregister learning about VNIs, if appropriate. */
if (bgp->advertise_all_vni)
Expand Down Expand Up @@ -3341,7 +3342,7 @@ static int bgp_ifp_create(struct interface *ifp)
struct bgp *bgp;

if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("Rx Intf add VRF %u IF %s", ifp->vrf->vrf_id,
zlog_debug("Rx Intf add VRF %s IF %s", ifp->vrf->name,
ifp->name);

bgp = ifp->vrf->info;
Expand Down

0 comments on commit 86d2466

Please sign in to comment.