Skip to content
Permalink
Browse files

Merge pull request #3936 from donaldsharp/ospf_1000_club

ospfd: When converting to ms divide by 1000
  • Loading branch information...
eqvinox committed Mar 13, 2019
2 parents 29d894a + 1af6204 commit 50b9931b0aca6d5198761065306bfca625c50b12
Showing with 6 additions and 6 deletions.
  1. +6 −6 ospfd/ospf_vty.c
@@ -3512,7 +3512,7 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf,
oi->output_cost);
json_object_int_add(
json_interface_sub, "transmitDelayMsecs",
1000 / OSPF_IF_PARAM(oi, transmit_delay));
OSPF_IF_PARAM(oi, transmit_delay) / 1000);
json_object_string_add(json_interface_sub, "state",
lookup_msg(ospf_ism_state_msg,
oi->state, NULL));
@@ -3616,20 +3616,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",
1000 / OSPF_IF_PARAM(oi, v_hello));
OSPF_IF_PARAM(oi, v_hello) / 1000);
else
json_object_int_add(
json_interface_sub, "timerMsecs",
1000 / OSPF_IF_PARAM(oi, fast_hello));
OSPF_IF_PARAM(oi, fast_hello) / 1000);
json_object_int_add(json_interface_sub,
"timerDeadMsecs",
1000 / OSPF_IF_PARAM(oi, v_wait));
OSPF_IF_PARAM(oi, v_wait) / 1000);
json_object_int_add(json_interface_sub,
"timerWaitMsecs",
1000 / OSPF_IF_PARAM(oi, v_wait));
OSPF_IF_PARAM(oi, v_wait) / 1000);
json_object_int_add(
json_interface_sub, "timerRetransmit",
1000 / OSPF_IF_PARAM(oi, retransmit_interval));
OSPF_IF_PARAM(oi, retransmit_interval) / 1000);
} else {
vty_out(vty, " Timer intervals configured,");
vty_out(vty, " Hello ");

0 comments on commit 50b9931

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.