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

bgpd: clean up evpn prefix debugging commands

Browse Source 
* Fix memory leaks in debug commands
* Use CLI tokens to properly sanitize input
* Remove unnecessary error handling code from debug commands
* Remove unnecessary parameters from conf print functions

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-07-31 21:35:54 +00:00
parent 29a643cac1
commit 377e35655a
2 changed files with 62 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
bgpd/bgp_debug.c
View File

@ -43,6 +43,7 @@
#include "bgpd/bgp_label.h" #include "bgpd/bgp_label.h"
#include "bgpd/bgp_evpn.h" #include "bgpd/bgp_evpn.h"
#include "bgpd/bgp_evpn_private.h" #include "bgpd/bgp_evpn_private.h"
#include "bgpd/bgp_evpn_vty.h"
#include "bgpd/bgp_vty.h" #include "bgpd/bgp_vty.h"
#include "bgpd/bgp_flowspec.h" #include "bgpd/bgp_flowspec.h"
@ -607,44 +608,32 @@ static int bgp_debug_parse_evpn_prefix(struct vty *vty, struct cmd_token **argv,
argv_p = *argv_pp; argv_p = *argv_pp;
if (argv_find(argv, argc, "type", &type_idx) == 0) if (argv_find(argv, argc, "macip", &type_idx))
return CMD_WARNING;
if (strncmp(argv[type_idx + 1]->arg, "ma", 2) == 0)
evpn_type = BGP_EVPN_MAC_IP_ROUTE; evpn_type = BGP_EVPN_MAC_IP_ROUTE;
else if (strncmp(argv[type_idx + 1]->arg, "mu", 2) == 0) else if (argv_find(argv, argc, "multicast", &type_idx))
evpn_type = BGP_EVPN_IMET_ROUTE; evpn_type = BGP_EVPN_IMET_ROUTE;
else if (strncmp(argv[type_idx + 1]->arg, "pr", 2) == 0) else if (argv_find(argv, argc, "prefix", &type_idx))
evpn_type = BGP_EVPN_IP_PREFIX_ROUTE; evpn_type = BGP_EVPN_IP_PREFIX_ROUTE;
else else
evpn_type = 0; evpn_type = 0;
if (evpn_type == BGP_EVPN_MAC_IP_ROUTE) { if (evpn_type == BGP_EVPN_MAC_IP_ROUTE) {
memset(&ip, 0, sizeof(struct ipaddr)); memset(&ip, 0, sizeof(struct ipaddr));
/* get the ip if specified */
if (argv_find(argv, argc, "ip", &ip_idx)) {
if (str2ipaddr(argv[ip_idx + 1]->arg, &ip) != 0) {
vty_out(vty, "%% Malformed IP address\n");
return CMD_WARNING;
}
}
argv_find(argv, argc, "mac", &mac_idx); argv_find(argv, argc, "mac", &mac_idx);
if (!prefix_str2mac(argv[mac_idx + 1]->arg, &mac)) { prefix_str2mac(argv[mac_idx + 1]->arg, &mac);
vty_out(vty, "%% Malformed MAC address\n");
return CMD_WARNING; argv_find(argv, argc, "ip", &ip_idx);
} str2ipaddr(argv[ip_idx + 1]->arg, &ip);
build_evpn_type2_prefix((struct prefix_evpn *)argv_p, build_evpn_type2_prefix((struct prefix_evpn *)argv_p,
&mac, &ip); &mac, &ip);
} else if (evpn_type == BGP_EVPN_IMET_ROUTE) { } else if (evpn_type == BGP_EVPN_IMET_ROUTE) {
memset(&ip, 0, sizeof(struct ipaddr)); memset(&ip, 0, sizeof(struct ipaddr));
/* get the ip if specified */
if (argv_find(argv, argc, "ip", &ip_idx)) { argv_find(argv, argc, "ip", &ip_idx);
if (str2ipaddr(argv[ip_idx + 1]->arg, &ip) != 0) { str2ipaddr(argv[ip_idx + 1]->arg, &ip);
vty_out(vty, "%% Malformed IP address\n");
return CMD_WARNING;
}
}
build_evpn_type3_prefix((struct prefix_evpn *)argv_p, build_evpn_type3_prefix((struct prefix_evpn *)argv_p,
ip.ipaddr_v4); ip.ipaddr_v4);
} else if (evpn_type == BGP_EVPN_IP_PREFIX_ROUTE) { } else if (evpn_type == BGP_EVPN_IP_PREFIX_ROUTE) {
@ -1391,55 +1380,51 @@ DEFUN (no_debug_bgp_update_direct_peer,
DEFPY (debug_bgp_update_prefix_afi_safi, DEFPY (debug_bgp_update_prefix_afi_safi,
debug_bgp_update_prefix_afi_safi_cmd, debug_bgp_update_prefix_afi_safi_cmd,
"debug bgp updates prefix <l2vpn>$afi <evpn>$safi type <macip mac WORD [ip WORD]|multicast ip WORD |prefix ip WORD>", "debug bgp updates prefix l2vpn$afi evpn$safi type <macip mac <M:A:C|M:A:C/M> [ip <A.B.C.D|X:X::X:X>]|multicast ip <A.B.C.D|X:X::X:X>|prefix ip <A.B.C.D/M|X:X::X:X/M>>",
DEBUG_STR DEBUG_STR
BGP_STR BGP_STR
"BGP updates\n" "BGP updates\n"
"Specify a prefix to debug\n" "Specify a prefix to debug\n"
"l2vpn\n" L2VPN_HELP_STR
"evpn\n" EVPN_HELP_STR
"Specify EVPN Route type\n" "Specify EVPN Route type\n"
"MAC-IP (Type-2) route\n" "MAC-IP (Type-2) route\n"
"MAC\n" MAC_STR MAC_STR MAC_STR
"MAC address (e.g., 00:e0:ec:20:12:62)\n" IP_STR
"IP\n" "IPv4 address\n"
"IP address (IPv4 or IPv6)\n" "IPv6 address\n"
"Multicast (Type-3) route\n" "Multicast (Type-3) route\n"
"IP\n" IP_STR
"IP address (IPv4 or IPv6)\n" "IPv4 address\n"
"IPv6 address\n"
"Prefix (Type-5) route\n" "Prefix (Type-5) route\n"
"IP\n" IP_STR
"Prefix route\n") "IPv4 prefix\n"
"IPv6 prefix\n")
{ {
int idx_ipv4_ipv6_prefixlen = 4;
struct prefix *argv_p; struct prefix *argv_p;
int ret = CMD_SUCCESS; int ret = CMD_SUCCESS;
afi_t afiz; char buf[PREFIX2STR_BUFFER];
safi_t safiz;
argv_p = prefix_new(); argv_p = prefix_new();
afiz = bgp_vty_afi_from_str(afi);
safiz = safi ? bgp_vty_safi_from_str(safi) : SAFI_UNICAST;
/* check for evpn route type */
if (afiz == AFI_L2VPN && safiz == SAFI_EVPN) {
ret = bgp_debug_parse_evpn_prefix(vty, argv, argc, &argv_p); ret = bgp_debug_parse_evpn_prefix(vty, argv, argc, &argv_p);
if (ret != CMD_SUCCESS) if (ret != CMD_SUCCESS) {
goto cleanup; prefix_free(argv_p);
} else { return ret;
(void)str2prefix(argv[idx_ipv4_ipv6_prefixlen]->arg, argv_p);
apply_mask(argv_p);
} }
if (!bgp_debug_update_prefixes) if (!bgp_debug_update_prefixes)
bgp_debug_update_prefixes = list_new(); bgp_debug_update_prefixes = list_new();
prefix2str(argv_p, buf, sizeof(buf));
if (bgp_debug_list_has_entry(bgp_debug_update_prefixes, NULL, argv_p)) { if (bgp_debug_list_has_entry(bgp_debug_update_prefixes, NULL, argv_p)) {
vty_out(vty, vty_out(vty,
"BGP updates debugging is already enabled for %s\n", "BGP updates debugging is already enabled for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg); buf);
goto cleanup; prefix_free(argv_p);
return CMD_SUCCESS;
} }
bgp_debug_list_add_entry(bgp_debug_update_prefixes, NULL, argv_p); bgp_debug_list_add_entry(bgp_debug_update_prefixes, NULL, argv_p);
@ -1448,59 +1433,50 @@ DEFPY (debug_bgp_update_prefix_afi_safi,
DEBUG_ON(update, UPDATE_PREFIX); DEBUG_ON(update, UPDATE_PREFIX);
} else { } else {
TERM_DEBUG_ON(update, UPDATE_PREFIX); TERM_DEBUG_ON(update, UPDATE_PREFIX);
vty_out(vty, "BGP updates debugging is on for %s\n", vty_out(vty, "BGP updates debugging is on for %s\n", buf);
argv[idx_ipv4_ipv6_prefixlen]->arg);
} }
cleanup:
prefix_free(argv_p); prefix_free(argv_p);
return ret; return CMD_SUCCESS;
} }
DEFPY (no_debug_bgp_update_prefix_afi_safi, DEFPY (no_debug_bgp_update_prefix_afi_safi,
no_debug_bgp_update_prefix_afi_safi_cmd, no_debug_bgp_update_prefix_afi_safi_cmd,
"no debug bgp updates prefix <l2vpn>$afi <evpn>$safi type <macip mac WORD [ip WORD]|multicast ip WORD |prefix ip WORD>", "no debug bgp updates prefix l2vpn$afi evpn$safi type <macip mac <M:A:C|M:A:C/M> [ip <A.B.C.D|X:X::X:X>]|multicast ip <A.B.C.D|X:X::X:X>|prefix ip <A.B.C.D/M|X:X::X:X/M>>",
NO_STR NO_STR
DEBUG_STR DEBUG_STR
BGP_STR BGP_STR
"BGP updates\n" "BGP updates\n"
"Specify a prefix to debug\n" "Specify a prefix to debug\n"
"l2vpn\n" L2VPN_HELP_STR
"evpn\n" EVPN_HELP_STR
"Specify EVPN Route type\n" "Specify EVPN Route type\n"
"MAC-IP (Type-2) route\n" "MAC-IP (Type-2) route\n"
"MAC\n" MAC_STR MAC_STR MAC_STR
"MAC address (e.g., 00:e0:ec:20:12:62)\n" IP_STR
"IP\n" "IPv4 address\n"
"IP address (IPv4 or IPv6)\n" "IPv6 address\n"
"Multicast (Type-3) route\n" "Multicast (Type-3) route\n"
"IP\n" IP_STR
"IP address (IPv4 or IPv6)\n" "IPv4 address\n"
"IPv6 address\n"
"Prefix (Type-5) route\n" "Prefix (Type-5) route\n"
"IP\n" IP_STR
"Prefix route\n") "IPv4 prefix\n"
"IPv6 prefix\n")
{ {
int idx_ipv4_ipv6_prefixlen = 5;
struct prefix *argv_p; struct prefix *argv_p;
int found_prefix = 0; bool found_prefix = false;
int ret = CMD_SUCCESS; int ret = CMD_SUCCESS;
afi_t afiz; char buf[PREFIX2STR_BUFFER];
safi_t safiz;
argv_p = prefix_new(); argv_p = prefix_new();
afiz = bgp_vty_afi_from_str(afi);
safiz = safi ? bgp_vty_safi_from_str(safi) : SAFI_UNICAST;
/* check for evpn route type */
if (afiz == AFI_L2VPN && safiz == SAFI_EVPN) {
ret = bgp_debug_parse_evpn_prefix(vty, argv, argc, &argv_p); ret = bgp_debug_parse_evpn_prefix(vty, argv, argc, &argv_p);
if (ret != CMD_SUCCESS) if (ret != CMD_SUCCESS) {
goto cleanup; prefix_free(argv_p);
} else { return ret;
(void)str2prefix(argv[idx_ipv4_ipv6_prefixlen]->arg, argv_p);
apply_mask(argv_p);
} }
if (bgp_debug_update_prefixes if (bgp_debug_update_prefixes
@ -1519,14 +1495,14 @@ DEFPY (no_debug_bgp_update_prefix_afi_safi,
} }
} }
prefix2str(argv_p, buf, sizeof(buf));
if (found_prefix) if (found_prefix)
vty_out(vty, "BGP updates debugging is off for %s\n", vty_out(vty, "BGP updates debugging is off for %s\n", buf);
argv[idx_ipv4_ipv6_prefixlen]->arg);
else else
vty_out(vty, "BGP updates debugging was not enabled for %s\n", vty_out(vty, "BGP updates debugging was not enabled for %s\n",
argv[idx_ipv4_ipv6_prefixlen]->arg); buf);
cleanup:
prefix_free(argv_p); prefix_free(argv_p);
return ret; return ret;

1
lib/command.h
View File

@ -338,6 +338,7 @@ struct cmd_node {
#define UNDEBUG_STR "Disable debugging functions (see also 'debug')\n" #define UNDEBUG_STR "Disable debugging functions (see also 'debug')\n"
#define ROUTER_STR "Enable a routing process\n" #define ROUTER_STR "Enable a routing process\n"
#define AS_STR "AS number\n" #define AS_STR "AS number\n"
#define MAC_STR "MAC address\n"
#define MBGP_STR "MBGP information\n" #define MBGP_STR "MBGP information\n"
#define MATCH_STR "Match values from routing table\n" #define MATCH_STR "Match values from routing table\n"
#define SET_STR "Set values in destination routing protocol\n" #define SET_STR "Set values in destination routing protocol\n"