From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 24 Jan 2019 20:36:48 +0000 (+0000)
Subject: vrrpd: fix priority setting
X-Git-Tag: base_7.2~330^2~122
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=bac08ded236867e7a0fb1806ae2fc77beff91002;p=matthieu%2Ffrr.git

vrrpd: fix priority setting

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 90ea25d776..9793eaf00f 100644
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -126,6 +126,8 @@ void vrrp_set_priority(struct vrrp_vrouter *vr, uint8_t priority)
 		return;
 
 	vr->priority = priority;
+	vr->v4->priority = priority;
+	vr->v6->priority = priority;
 }
 
 void vrrp_set_advertisement_interval(struct vrrp_vrouter *vr,
diff --git a/vrrpd/vrrp_vty.c b/vrrpd/vrrp_vty.c
index 1d01b920b1..3726841ed1 100644
--- a/vrrpd/vrrp_vty.c
+++ b/vrrpd/vrrp_vty.c
@@ -78,12 +78,12 @@ DEFPY(vrrp_vrid,
 
 DEFPY(vrrp_priority,
       vrrp_priority_cmd,
-      "[no] vrrp (1-255)$vrid priority (1-255)",
+      "[no] vrrp (1-255)$vrid priority (1-254)",
       NO_STR
       VRRP_STR
       VRRP_VRID_STR
       VRRP_PRIORITY_STR
-      "Priority value; set 255 to designate this Virtual Router as Master\n")
+      "Priority value")
 {
 	struct vrrp_vrouter *vr;
 	struct vrrp_router *r;