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 <mrasool@vmware.com>
(cherry picked from commit 2c1f2d2ad963259dd9534da87c178bdac873e765)

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index f5a76f55a4741d7c195ec0becaa8be3ac9d46435..f7f7a8e1744fbe5c221730b45bebbab52325bbe3 100644 (file)
--- 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 ? */