From: Mobashshera Rasool Date: Tue, 31 Aug 2021 06:02:39 +0000 (-0700) Subject: ospfd: add dead-interval 40 if configured in show running X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9909b4ee2db791c40cc24af570687ce8dba615d3;p=mirror%2Ffrr.git ospfd: add dead-interval 40 if configured in show running Problem Statement: ================== When hello-interval is configured as 5, automatically dead interval becomes 4 times of hello i.e 20 seconds. But user wants the dead interval as 40 seconds and hello as 5 seconds. Therefore user configures it. Now "ip ospf dead-interval 40" is not shown in "show running-config" Therefore when user restarts the daemon, the dead interval goes back to 20 seconds and the neighbors are down. Fix: ================== If user configures dead-interval as 40, show it in show running config. Fixes: #9401 Signed-off-by: Mobashshera Rasool (cherry picked from commit 2c1f2d2ad963259dd9534da87c178bdac873e765) --- diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index f5a76f55a4..f7f7a8e174 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -11834,9 +11834,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf) /* Router Dead Interval print. */ if (OSPF_IF_PARAM_CONFIGURED(params, v_wait) - && params->is_v_wait_set - && params->v_wait - != OSPF_ROUTER_DEAD_INTERVAL_DEFAULT) { + && params->is_v_wait_set) { vty_out(vty, " ip ospf dead-interval "); /* fast hello ? */