diff options
| -rw-r--r-- | bgpd/bgp_debug.c | 16 | ||||
| -rw-r--r-- | bgpd/bgp_evpn_vty.c | 24 | ||||
| -rw-r--r-- | bgpd/bgp_flowspec_vty.c | 2 | ||||
| -rw-r--r-- | ospfd/ospf_lsa.c | 2 |
4 files changed, 19 insertions, 25 deletions
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c index 1e95a887bc..268356c7c3 100644 --- a/bgpd/bgp_debug.c +++ b/bgpd/bgp_debug.c @@ -1433,7 +1433,7 @@ DEFPY (debug_bgp_update_prefix_afi_safi, if (afiz == AFI_L2VPN && safiz == SAFI_EVPN) { ret = bgp_debug_parse_evpn_prefix(vty, argv, argc, &argv_p); if (ret != CMD_SUCCESS) - return ret; + goto cleanup; } else { (void)str2prefix(argv[idx_ipv4_ipv6_prefixlen]->arg, argv_p); apply_mask(argv_p); @@ -1446,7 +1446,7 @@ DEFPY (debug_bgp_update_prefix_afi_safi, vty_out(vty, "BGP updates debugging is already enabled for %s\n", argv[idx_ipv4_ipv6_prefixlen]->arg); - return CMD_SUCCESS; + goto cleanup; } bgp_debug_list_add_entry(bgp_debug_update_prefixes, NULL, argv_p); @@ -1459,7 +1459,10 @@ DEFPY (debug_bgp_update_prefix_afi_safi, argv[idx_ipv4_ipv6_prefixlen]->arg); } - return CMD_SUCCESS; +cleanup: + prefix_free(argv_p); + + return ret; } DEFPY (no_debug_bgp_update_prefix_afi_safi, @@ -1501,7 +1504,7 @@ DEFPY (no_debug_bgp_update_prefix_afi_safi, if (afiz == AFI_L2VPN && safiz == SAFI_EVPN) { ret = bgp_debug_parse_evpn_prefix(vty, argv, argc, &argv_p); if (ret != CMD_SUCCESS) - return ret; + goto cleanup; } else { (void)str2prefix(argv[idx_ipv4_ipv6_prefixlen]->arg, argv_p); apply_mask(argv_p); @@ -1530,7 +1533,10 @@ DEFPY (no_debug_bgp_update_prefix_afi_safi, vty_out(vty, "BGP updates debugging was not enabled for %s\n", argv[idx_ipv4_ipv6_prefixlen]->arg); - return CMD_SUCCESS; +cleanup: + prefix_free(argv_p); + + return ret; } diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index 5a4ebc9b17..b45c1a99db 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -2807,9 +2807,6 @@ DEFUN (bgp_evpn_advertise_default_gw_vni, if (!bgp) return CMD_WARNING; - if (!vpn) - return CMD_WARNING; - evpn_set_advertise_default_gw(bgp, vpn); return CMD_SUCCESS; @@ -2827,9 +2824,6 @@ DEFUN (no_bgp_evpn_advertise_default_vni_gw, if (!bgp) return CMD_WARNING; - if (!vpn) - return CMD_WARNING; - evpn_unset_advertise_default_gw(bgp, vpn); return CMD_SUCCESS; @@ -2972,9 +2966,6 @@ DEFUN_HIDDEN (bgp_evpn_advertise_vni_subnet, if (!bgp) return CMD_WARNING; - if (!vpn) - return CMD_WARNING; - bgp_vrf = bgp_lookup_by_vrf_id(vpn->tenant_vrf_id); if (!bgp_vrf) return CMD_WARNING; @@ -2995,9 +2986,6 @@ DEFUN_HIDDEN (no_bgp_evpn_advertise_vni_subnet, if (!bgp) return CMD_WARNING; - if (!vpn) - return CMD_WARNING; - evpn_unset_advertise_subnet(bgp, vpn); return CMD_SUCCESS; } @@ -4225,7 +4213,7 @@ DEFUN (bgp_evpn_vni_rd, VTY_DECLVAR_CONTEXT_SUB(bgpevpn, vpn); int ret; - if (!bgp || !vpn) + if (!bgp) return CMD_WARNING; if (bgp->vrf_id != VRF_DEFAULT) { @@ -4261,7 +4249,7 @@ DEFUN (no_bgp_evpn_vni_rd, VTY_DECLVAR_CONTEXT_SUB(bgpevpn, vpn); int ret; - if (!bgp || !vpn) + if (!bgp) return CMD_WARNING; if (bgp->vrf_id != VRF_DEFAULT) { @@ -4301,7 +4289,7 @@ DEFUN (no_bgp_evpn_vni_rd_without_val, struct bgp *bgp = VTY_GET_CONTEXT(bgp); VTY_DECLVAR_CONTEXT_SUB(bgpevpn, vpn); - if (!bgp || !vpn) + if (!bgp) return CMD_WARNING; if (bgp->vrf_id != VRF_DEFAULT) { @@ -4630,7 +4618,7 @@ DEFUN (bgp_evpn_vni_rt, int rt_type; struct ecommunity *ecomadd = NULL; - if (!bgp || !vpn) + if (!bgp) return CMD_WARNING; if (bgp->vrf_id != VRF_DEFAULT) { @@ -4698,7 +4686,7 @@ DEFUN (no_bgp_evpn_vni_rt, int rt_type, found_ecomdel; struct ecommunity *ecomdel = NULL; - if (!bgp || !vpn) + if (!bgp) return CMD_WARNING; if (bgp->vrf_id != VRF_DEFAULT) { @@ -4797,7 +4785,7 @@ DEFUN (no_bgp_evpn_vni_rt_without_val, VTY_DECLVAR_CONTEXT_SUB(bgpevpn, vpn); int rt_type; - if (!bgp || !vpn) + if (!bgp) return CMD_WARNING; if (bgp->vrf_id != VRF_DEFAULT) { diff --git a/bgpd/bgp_flowspec_vty.c b/bgpd/bgp_flowspec_vty.c index ace888c78d..f8c0613208 100644 --- a/bgpd/bgp_flowspec_vty.c +++ b/bgpd/bgp_flowspec_vty.c @@ -357,7 +357,7 @@ void route_vty_out_flowspec(struct vty *vty, struct prefix *p, if (unit) vty_out(vty, ")"); vty_out(vty, "\n"); - list_delete_all_node(list_bpm); + list_delete_and_null(&list_bpm); } else vty_out(vty, "\tnot installed in PBR\n"); } diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 502f233036..4165338834 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -1921,7 +1921,7 @@ struct ospf_lsa *ospf_translated_nssa_refresh(struct ospf *ospf, zlog_debug( "ospf_translated_nssa_refresh(): Could not install " "translated LSA, Id %s", - type7 ? inet_ntoa(type7->data->id) : "(null)"); + inet_ntoa(type7->data->id)); return NULL; } |