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

Merge pull request #13347 from donaldsharp/bgp_before_light

Browse Source
This commit is contained in:
David Lamparter 2023-04-21 18:23:17 +02:00 committed by GitHub
commit c53ab57b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_evpn_vty.c
View File

@ -4305,7 +4305,7 @@ DEFPY (bgp_evpn_advertise_pip_ip_mac,
struct bgp *bgp_vrf = VTY_GET_CONTEXT(bgp); /* bgp vrf instance */ struct bgp *bgp_vrf = VTY_GET_CONTEXT(bgp); /* bgp vrf instance */
struct bgp *bgp_evpn = NULL; struct bgp *bgp_evpn = NULL;
if (EVPN_ENABLED(bgp_vrf)) { if (!bgp_vrf || EVPN_ENABLED(bgp_vrf)) {
vty_out(vty, vty_out(vty,
"This command is supported under L3VNI BGP EVPN VRF\n"); "This command is supported under L3VNI BGP EVPN VRF\n");
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;

1
bgpd/bgp_mplsvpn_snmp.c
View File

@ -1627,6 +1627,7 @@ static uint8_t *mplsL3vpnRteTable(struct variable *v, oid name[],
} }
} else } else
return SNMP_INTEGER(MPLSL3VPNVRFRTECIDRTYPEOTHER); return SNMP_INTEGER(MPLSL3VPNVRFRTECIDRTYPEOTHER);
break;
case MPLSL3VPNVRFRTEINETCIDRPROTO: case MPLSL3VPNVRFRTEINETCIDRPROTO:
switch (pi->type) { switch (pi->type) {
case ZEBRA_ROUTE_CONNECT: case ZEBRA_ROUTE_CONNECT:

2
bgpd/bgp_route.c
View File

@ -7038,8 +7038,8 @@ int bgp_static_set_safi(afi_t afi, safi_t safi, struct vty *vty,
bgp_static->label = label; bgp_static->label = label;
bgp_static->prd = prd; bgp_static->prd = prd;
if (rd_str)
bgp_static->prd_pretty = XSTRDUP(MTYPE_BGP, rd_str); bgp_static->prd_pretty = XSTRDUP(MTYPE_BGP, rd_str);
if (rmap_str) { if (rmap_str) {
XFREE(MTYPE_ROUTE_MAP_NAME, bgp_static->rmap.name); XFREE(MTYPE_ROUTE_MAP_NAME, bgp_static->rmap.name);
route_map_counter_decrement(bgp_static->rmap.map); route_map_counter_decrement(bgp_static->rmap.map);