From: David Lamparter Date: Fri, 14 Apr 2023 15:17:27 +0000 (+0200) Subject: pimd: fix dr-priority range X-Git-Tag: docker/8.4.5~8^2~2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=06b7d3dcba2ec41dd4504c715fdf1ce1dde868ad;p=matthieu%2Ffrr.git pimd: fix dr-priority range 0 is a valid DR priority. Signed-off-by: David Lamparter (cherry picked from commit b564c1d890aef75067db22df09e608faf72b99f5) --- diff --git a/doc/user/pim.rst b/doc/user/pim.rst index 44ade916a2..29194663e3 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 843734e217..46d22143fa 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 dc84de6bfd..32996e6e2a 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -259,7 +259,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" @@ -270,7 +270,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 c2f7396c18..2a46c5eafe 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -4052,7 +4052,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" @@ -4065,7 +4065,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 9e40d78602..b5c4d3501e 100644 --- a/yang/frr-pim.yang +++ b/yang/frr-pim.yang @@ -421,9 +421,7 @@ module frr-pim { } leaf dr-priority { - type uint32 { - range "1..max"; - } + type uint32; default 1; description "DR (Designated Router) priority";