diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2023-04-21 18:23:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 18:23:17 +0200 |
| commit | c53ab57b79f1ddd8424e671bb00a8cf05fa7bcee (patch) | |
| tree | dbccc3cffecd461745a75bafea9c8ba7341dc5aa | |
| parent | 3c034cb34206e1d137c27b412bd9f7e079529eb0 (diff) | |
| parent | 332133d19becb6d4e48d730cf47de017f0a4b4f5 (diff) | |
Merge pull request #13347 from donaldsharp/bgp_before_light
| -rw-r--r-- | bgpd/bgp_evpn_vty.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_mplsvpn_snmp.c | 1 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index c1bcbf77ce..811856bfed 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -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_evpn = NULL; - if (EVPN_ENABLED(bgp_vrf)) { + if (!bgp_vrf || EVPN_ENABLED(bgp_vrf)) { vty_out(vty, "This command is supported under L3VNI BGP EVPN VRF\n"); return CMD_WARNING_CONFIG_FAILED; diff --git a/bgpd/bgp_mplsvpn_snmp.c b/bgpd/bgp_mplsvpn_snmp.c index 20fec6d77b..0208a6f5a5 100644 --- a/bgpd/bgp_mplsvpn_snmp.c +++ b/bgpd/bgp_mplsvpn_snmp.c @@ -1627,6 +1627,7 @@ static uint8_t *mplsL3vpnRteTable(struct variable *v, oid name[], } } else return SNMP_INTEGER(MPLSL3VPNVRFRTECIDRTYPEOTHER); + break; case MPLSL3VPNVRFRTEINETCIDRPROTO: switch (pi->type) { case ZEBRA_ROUTE_CONNECT: diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 7809d9b0a9..40ecdbb670 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -7038,8 +7038,8 @@ int bgp_static_set_safi(afi_t afi, safi_t safi, struct vty *vty, bgp_static->label = label; 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) { XFREE(MTYPE_ROUTE_MAP_NAME, bgp_static->rmap.name); route_map_counter_decrement(bgp_static->rmap.map); |