From 905c9230fda1b22393a21ee499d75134148c1677 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 14 Apr 2023 17:17:27 +0200 Subject: [PATCH] pimd: fix dr-priority range 0 is a valid DR priority. Signed-off-by: David Lamparter (cherry picked from commit b564c1d890aef75067db22df09e608faf72b99f5) --- doc/user/pim.rst | 2 +- doc/user/pimv6.rst | 2 +- pimd/pim6_cmd.c | 4 ++-- pimd/pim_cmd.c | 4 ++-- yang/frr-pim.yang | 4 +--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/doc/user/pim.rst b/doc/user/pim.rst index d70c3c0e64..c2279a4e5d 100644 --- a/doc/user/pim.rst +++ b/doc/user/pim.rst @@ -212,7 +212,7 @@ is in a vrf, enter the interface command with the vrf keyword at the end. messages. This is enabled by default. 'no' form of this command is used to restrict processing of unicast bsm messages on this interface. -.. clicmd:: ip pim drpriority (1-4294967295) +.. clicmd:: ip pim drpriority (0-4294967295) Set the DR Priority for the interface. This command is useful to allow the user to influence what node becomes the DR for a lan segment. diff --git a/doc/user/pimv6.rst b/doc/user/pimv6.rst index 856939038f..5e13409f8a 100644 --- a/doc/user/pimv6.rst +++ b/doc/user/pimv6.rst @@ -136,7 +136,7 @@ is in a vrf, enter the interface command with the vrf keyword at the end. command will not do anything if you do not have the underlying ability of a mlag implementation. -.. clicmd:: ipv6 pim drpriority (1-4294967295) +.. clicmd:: ipv6 pim drpriority (0-4294967295) Set the DR Priority for the interface. This command is useful to allow the user to influence what node becomes the DR for a lan segment. diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index 262ce86c29..9f14ea84a1 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -244,7 +244,7 @@ DEFPY (interface_no_ipv6_pim, DEFPY (interface_ipv6_pim_drprio, interface_ipv6_pim_drprio_cmd, - "ipv6 pim drpriority (1-4294967295)", + "ipv6 pim drpriority (0-4294967295)", IPV6_STR PIM_STR "Set the Designated Router Election Priority\n" @@ -255,7 +255,7 @@ DEFPY (interface_ipv6_pim_drprio, DEFPY (interface_no_ipv6_pim_drprio, interface_no_ipv6_pim_drprio_cmd, - "no ipv6 pim drpriority [(1-4294967295)]", + "no ipv6 pim drpriority [(0-4294967295)]", NO_STR IPV6_STR PIM_STR diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 2e90cf9053..1c7bfdf79b 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3953,7 +3953,7 @@ DEFUN (interface_no_ip_igmp_last_member_query_interval, DEFUN (interface_ip_pim_drprio, interface_ip_pim_drprio_cmd, - "ip pim drpriority (1-4294967295)", + "ip pim drpriority (0-4294967295)", IP_STR PIM_STR "Set the Designated Router Election Priority\n" @@ -3966,7 +3966,7 @@ DEFUN (interface_ip_pim_drprio, DEFUN (interface_no_ip_pim_drprio, interface_no_ip_pim_drprio_cmd, - "no ip pim drpriority [(1-4294967295)]", + "no ip pim drpriority [(0-4294967295)]", NO_STR IP_STR PIM_STR diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang index e9b3f67507..732a38a9e3 100644 --- a/yang/frr-pim.yang +++ b/yang/frr-pim.yang @@ -422,9 +422,7 @@ module frr-pim { } leaf dr-priority { - type uint32 { - range "1..max"; - } + type uint32; default 1; description "DR (Designated Router) priority"; -- 2.39.5