From 33b010a97693cef8bbe120d8205099b581e573fe Mon Sep 17 00:00:00 2001
From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Wed, 24 Apr 2019 17:02:14 +0000
Subject: [PATCH] vrrpd: convert defaults command to milliseconds

Missed this in the conversion from centiseconds to milliseconds.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---
 vrrpd/vrrp.c     |  2 +-
 vrrpd/vrrp_vty.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 7b66492c11..1e01307ed1 100644
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -2300,7 +2300,7 @@ int vrrp_config_write_global(struct vty *vty)
 	if (vd.advertisement_interval != VRRP_DEFAULT_ADVINT && ++writes)
 		vty_out(vty,
 			"vrrp default advertisement-interval %" PRIu16 "\n",
-			vd.advertisement_interval);
+			vd.advertisement_interval * CS2MS);
 
 	if (vd.preempt_mode != VRRP_DEFAULT_PREEMPT && ++writes)
 		vty_out(vty, "%svrrp default preempt\n",
diff --git a/vrrpd/vrrp_vty.c b/vrrpd/vrrp_vty.c
index 0cb33bffed..296a8a67dd 100644
--- a/vrrpd/vrrp_vty.c
+++ b/vrrpd/vrrp_vty.c
@@ -315,19 +315,26 @@ DEFPY(vrrp_autoconfigure,
 
 DEFPY(vrrp_default,
       vrrp_default_cmd,
-      "[no] vrrp default <advertisement-interval$adv (1-4096)$advint|preempt$p|priority$prio (1-254)$prioval|shutdown$s>",
+      "[no] vrrp default <advertisement-interval$adv (10-40950)$advint|preempt$p|priority$prio (1-254)$prioval|shutdown$s>",
       NO_STR
       VRRP_STR
       "Configure defaults for new VRRP instances\n"
       VRRP_ADVINT_STR
-      "Advertisement interval in centiseconds\n"
+      "Advertisement interval in milliseconds\n"
       "Preempt mode\n"
       VRRP_PRIORITY_STR
       "Priority value\n"
       "Force VRRP router into administrative shutdown\n")
 {
-	if (adv)
+	if (adv) {
+		if (advint % 10 != 0) {
+			vty_out(vty, "%% Value must be a multiple of 10\n");
+			return CMD_WARNING_CONFIG_FAILED;
+		}
+		/* all internal computations are in centiseconds */
+		advint /= CS2MS;
 		vd.advertisement_interval = no ? VRRP_DEFAULT_ADVINT : advint;
+	}
 	if (p)
 		vd.preempt_mode = !no;
 	if (prio)
-- 
2.39.5