diff options
| author | Igor Ryzhov <idryzhov@gmail.com> | 2022-03-31 11:16:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 11:16:43 +0300 |
| commit | ab313a9e35d84e7b46587b1d698305f9f7bea60a (patch) | |
| tree | 2ee73f686d1d808c8cc2218156cae3781bb03470 | |
| parent | 66da8b5ac8c143eef12b6d921b6b31eba25712ec (diff) | |
| parent | 41710ed15e5ee6e247a476686d53003987b28aa0 (diff) | |
Merge pull request #10934 from opensourcerouting/fix/ospf_state_neighbor_detail
| -rw-r--r-- | ospfd/ospf_vty.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index a753340476..3bd4a9bb68 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -4394,7 +4394,8 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty, json_neighbor = json_object_new_object(); - ospf_nbr_ism_state_message(nbr, msgbuf, 16); + ospf_nbr_ism_state_message(nbr, msgbuf, + sizeof(msgbuf)); #if CONFDATE > 20230321 CPP_NOTICE("Remove show_ip_ospf_neighbor_sub() JSON keys: priority, state, deadTimeMsecs, address, retransmitCounter, requestCounter, dbSummaryCounter") #endif @@ -4490,7 +4491,8 @@ CPP_NOTICE("Remove show_ip_ospf_neighbor_sub() JSON keys: priority, state, deadT json_object_array_add(json_neigh_array, json_neighbor); } else { - ospf_nbr_ism_state_message(nbr, msgbuf, 16); + ospf_nbr_ism_state_message(nbr, msgbuf, + sizeof(msgbuf)); if (nbr->state == NSM_Attempt && nbr->router_id.s_addr == INADDR_ANY) @@ -5116,6 +5118,7 @@ static void show_ip_ospf_neighbor_detail_sub(struct vty *vty, char timebuf[OSPF_TIME_DUMP_SIZE]; json_object *json_neigh = NULL, *json_neigh_array = NULL; char neigh_str[INET_ADDRSTRLEN] = {0}; + char neigh_state[16] = {0}; if (use_json) { if (prev_nbr && @@ -5168,15 +5171,13 @@ static void show_ip_ospf_neighbor_detail_sub(struct vty *vty, ospf_area_desc_string(oi->area), oi->ifp->name); /* Show neighbor priority and state. */ + ospf_nbr_ism_state_message(nbr, neigh_state, sizeof(neigh_state)); if (use_json) { json_object_int_add(json_neigh, "nbrPriority", nbr->priority); - json_object_string_add( - json_neigh, "nbrState", - lookup_msg(ospf_nsm_state_msg, nbr->state, NULL)); + json_object_string_add(json_neigh, "nbrState", neigh_state); } else vty_out(vty, " Neighbor priority is %d, State is %s,", - nbr->priority, - lookup_msg(ospf_nsm_state_msg, nbr->state, NULL)); + nbr->priority, neigh_state); /* Show state changes. */ if (use_json) |