From 502c76524f7b238fe88f3986bde51c6f7b0ae128 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Fri, 15 Mar 2019 09:46:40 -0400 Subject: [PATCH] ospfd: fix some json timer output Fix a few json output values: a few are in seconds, not msecs, and one is a number-per-second, not a duration. [6.0 version] Signed-off-by: Mark Stapp --- ospfd/ospf_vty.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 93a8507435..0ac9d4ac82 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -3024,13 +3024,13 @@ static int show_ip_ospf_common(struct vty *vty, struct ospf *ospf, if (ospf->stub_router_startup_time != OSPF_STUB_ROUTER_UNCONFIGURED) json_object_int_add( - json_vrf, "postStartEnabledMsecs", - ospf->stub_router_startup_time / 1000); + json_vrf, "postStartEnabledSecs", + ospf->stub_router_startup_time); if (ospf->stub_router_shutdown_time != OSPF_STUB_ROUTER_UNCONFIGURED) json_object_int_add( - json_vrf, "preShutdownEnabledMsecs", - ospf->stub_router_shutdown_time / 1000); + json_vrf, "preShutdownEnabledSecs", + ospf->stub_router_shutdown_time); } else { vty_out(vty, " Stub router advertisement is configured\n"); @@ -3489,8 +3489,8 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf, json_object_int_add(json_interface_sub, "cost", oi->output_cost); json_object_int_add( - json_interface_sub, "transmitDelayMsecs", - OSPF_IF_PARAM(oi, transmit_delay) / 1000); + json_interface_sub, "transmitDelaySecs", + OSPF_IF_PARAM(oi, transmit_delay)); json_object_string_add(json_interface_sub, "state", lookup_msg(ospf_ism_state_msg, oi->state, NULL)); @@ -3594,20 +3594,20 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf, if (OSPF_IF_PARAM(oi, fast_hello) == 0) json_object_int_add( json_interface_sub, "timerMsecs", - OSPF_IF_PARAM(oi, v_hello) / 1000); + OSPF_IF_PARAM(oi, v_hello) * 1000); else json_object_int_add( json_interface_sub, "timerMsecs", - OSPF_IF_PARAM(oi, fast_hello) / 1000); + 1000 / OSPF_IF_PARAM(oi, fast_hello)); json_object_int_add(json_interface_sub, - "timerDeadMsecs", - OSPF_IF_PARAM(oi, v_wait) / 1000); + "timerDeadSecs", + OSPF_IF_PARAM(oi, v_wait)); json_object_int_add(json_interface_sub, - "timerWaitMsecs", - OSPF_IF_PARAM(oi, v_wait) / 1000); + "timerWaitSecs", + OSPF_IF_PARAM(oi, v_wait)); json_object_int_add( - json_interface_sub, "timerRetransmit", - OSPF_IF_PARAM(oi, retransmit_interval) / 1000); + json_interface_sub, "timerRetransmitSecs", + OSPF_IF_PARAM(oi, retransmit_interval)); } else { vty_out(vty, " Timer intervals configured,"); vty_out(vty, " Hello "); -- 2.39.5