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

Merge pull request #3546 from opensourcerouting/ospf-show-neighbor-fix

Browse Source 
ospfd: fix wrong argv index in the "show ip ospf neighbor" command
This commit is contained in:
Donald Sharp 2018-12-31 09:26:37 -05:00 committed by GitHub
commit e9e9a7f2b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ospfd/ospf_vty.c
View File

@ -5096,15 +5096,12 @@ static void show_ip_ospf_neighbor_detail_sub(struct vty *vty,
} }
static int show_ip_ospf_neighbor_id_common(struct vty *vty, struct ospf *ospf, static int show_ip_ospf_neighbor_id_common(struct vty *vty, struct ospf *ospf,
int arg_base, struct in_addr *router_id,
struct cmd_token **argv,
bool use_json, uint8_t use_vrf) bool use_json, uint8_t use_vrf)
{ {
struct listnode *node; struct listnode *node;
struct ospf_neighbor *nbr; struct ospf_neighbor *nbr;
struct ospf_interface *oi; struct ospf_interface *oi;
struct in_addr router_id;
int ret;
json_object *json = NULL; json_object *json = NULL;
if (use_json) if (use_json)
@ -5120,19 +5117,8 @@ static int show_ip_ospf_neighbor_id_common(struct vty *vty, struct ospf *ospf,
ospf_show_vrf_name(ospf, vty, json, use_vrf); ospf_show_vrf_name(ospf, vty, json, use_vrf);
ret = inet_aton(argv[arg_base]->arg, &router_id);
if (!ret) {
if (!use_json)
vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
else {
vty_out(vty, "{}\n");
json_object_free(json);
}
return CMD_WARNING;
}
for (ALL_LIST_ELEMENTS_RO(ospf->oiflist, node, oi)) { for (ALL_LIST_ELEMENTS_RO(ospf->oiflist, node, oi)) {
if ((nbr = ospf_nbr_lookup_by_routerid(oi->nbrs, &router_id))) { if ((nbr = ospf_nbr_lookup_by_routerid(oi->nbrs, router_id))) {
show_ip_ospf_neighbor_detail_sub(vty, oi, nbr, json, show_ip_ospf_neighbor_detail_sub(vty, oi, nbr, json,
use_json); use_json);
} }
@ -5148,9 +5134,9 @@ static int show_ip_ospf_neighbor_id_common(struct vty *vty, struct ospf *ospf,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (show_ip_ospf_neighbor_id, DEFPY (show_ip_ospf_neighbor_id,
show_ip_ospf_neighbor_id_cmd, show_ip_ospf_neighbor_id_cmd,
"show ip ospf neighbor A.B.C.D [json]", "show ip ospf neighbor A.B.C.D$router_id [json$json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
"OSPF information\n" "OSPF information\n"
@ -5159,23 +5145,22 @@ DEFUN (show_ip_ospf_neighbor_id,
JSON_STR) JSON_STR)
{ {
struct ospf *ospf; struct ospf *ospf;
bool uj = use_json(argc, argv); struct listnode *node;
struct listnode *node = NULL;
int ret = CMD_SUCCESS; int ret = CMD_SUCCESS;
for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) { for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
if (!ospf->oi_running) if (!ospf->oi_running)
continue; continue;
ret = show_ip_ospf_neighbor_id_common(vty, ospf, 0, argv, uj, ret = show_ip_ospf_neighbor_id_common(vty, ospf, &router_id,
0); !!json, 0);
} }
return ret; return ret;
} }
DEFUN (show_ip_ospf_instance_neighbor_id, DEFPY (show_ip_ospf_instance_neighbor_id,
show_ip_ospf_instance_neighbor_id_cmd, show_ip_ospf_instance_neighbor_id_cmd,
"show ip ospf (1-65535) neighbor A.B.C.D [json]", "show ip ospf (1-65535)$instance neighbor A.B.C.D$router_id [json$json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
"OSPF information\n" "OSPF information\n"
@ -5184,13 +5169,8 @@ DEFUN (show_ip_ospf_instance_neighbor_id,
"Neighbor ID\n" "Neighbor ID\n"
JSON_STR) JSON_STR)
{ {
int idx_number = 3;
int idx_router_id = 5;
struct ospf *ospf; struct ospf *ospf;
unsigned short instance = 0;
bool uj = use_json(argc, argv);
instance = strtoul(argv[idx_number]->arg, NULL, 10);
ospf = ospf_lookup_instance(instance); ospf = ospf_lookup_instance(instance);
if (ospf == NULL) if (ospf == NULL)
return CMD_NOT_MY_INSTANCE; return CMD_NOT_MY_INSTANCE;
@ -5198,8 +5178,8 @@ DEFUN (show_ip_ospf_instance_neighbor_id,
if (!ospf->oi_running) if (!ospf->oi_running)
return CMD_SUCCESS; return CMD_SUCCESS;
return show_ip_ospf_neighbor_id_common(vty, ospf, idx_router_id, argv, return show_ip_ospf_neighbor_id_common(vty, ospf, &router_id, !!json,
uj, 0); 0);
} }
static int show_ip_ospf_neighbor_detail_common(struct vty *vty, static int show_ip_ospf_neighbor_detail_common(struct vty *vty,