proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-02 16:25:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3500 from pguibert6WIND/missing_default_vrf_name

Browse Source 
bgpd: nexthop vrf name set to default vrf
This commit is contained in:
Renato Westphal 2018-12-18 10:44:12 -02:00 committed by GitHub
commit 9e7367db49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_route.c
View File

@ -6581,7 +6581,7 @@ void route_vty_out(struct vty *vty, struct prefix *p,
CHECK_FLAG(path->flags, BGP_PATH_ANNC_NH_SELF) ? true : false;
bool nexthop_othervrf = false;
vrf_id_t nexthop_vrfid = VRF_DEFAULT;
const char *nexthop_vrfname = "Default";
const char *nexthop_vrfname = VRF_DEFAULT_NAME;
if (json_paths)
json_path = json_object_new_object();
@ -7863,7 +7863,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct prefix *p,
if (path->extra->bgp_orig->inst_type
== BGP_INSTANCE_TYPE_DEFAULT)
vn = "Default";
vn = VRF_DEFAULT_NAME;
else
vn = path->extra->bgp_orig->name;

2
zebra/zebra_vxlan.c
View File

@ -8395,7 +8395,7 @@ int zebra_vxlan_if_add(struct interface *ifp)
"Add L2-VNI %u VRF %s intf %s(%u) VLAN %u local IP %s master %u",
vni,
vlan_if ? vrf_id_to_name(vlan_if->vrf_id)
: "Default",
: VRF_DEFAULT_NAME,
ifp->name, ifp->ifindex, vxl->access_vlan,
inet_ntoa(vxl->vtep_ip),
zif->brslave_info.bridge_ifindex);