From: Chirag Shah <chirag@cumulusnetworks.com>
Date: Mon, 12 Feb 2018 04:27:43 +0000 (-0800)
Subject: ospfd: Fix distance command
X-Git-Tag: frr-5.0-dev~231^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F1742%2Fhead;p=mirror%2Ffrr.git

ospfd: Fix distance command

Reset prevoiusly configured distance command options
if user enters new (different) parameters.

Ticket:CM-19635
Testing Done:

R1(config-router)# distance ospf intra-area 45 external 45
R1# show running-config ospfd
router ospf
 distance ospf intra-area 45 external 45

R1(config-router)# distance ospf inter-area 45
R1# show running-config ospfd
router ospf
 distance ospf inter-area 45

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
---

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 1276f5477c..09350b45a8 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -8558,6 +8558,10 @@ DEFUN (ospf_distance_ospf,
 	VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
 	int idx = 0;
 
+	ospf->distance_intra = 0;
+	ospf->distance_inter = 0;
+	ospf->distance_external = 0;
+
 	if (argv_find(argv, argc, "intra-area", &idx))
 		ospf->distance_intra = atoi(argv[idx + 1]->arg);
 	idx = 0;