pimd: make pim interface hold interval range 1-630

Making the interface holdtime range to 3.5 times the hello-time

As per 7761, Section 4.11:
The Holdtime in a Hello message should be set to
   (3.5 * Hello_Period), giving a default value of 105 seconds.

Therefore providing the user also to configure max upto 3.5 times
the hello timer interval.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
(cherry picked from commit 142774530ade49f63997bd52c434457fe8979bdf)

diff --git a/doc/user/pim.rst b/doc/user/pim.rst
index 103760933cf8f0ad6a5a0c137119962bead2b838..d05d3fdb198f19633a9455a1439512a1658589a8 100644 (file)
--- a/doc/user/pim.rst
+++ b/doc/user/pim.rst
@@ -199,7 +199,7 @@ is in a vrf, enter the interface command with the vrf keyword at the end.
    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.
 
-.. clicmd:: ip pim hello (1-180) (1-180)
+.. clicmd:: ip pim hello (1-180) (1-630)
 
    Set the pim hello and hold interval for a interface.
 

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index f189cd7ff0652611af827671150798fdda770b66..e6806bbbdae6780518f711c8fe0f2d16817bbb63 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -8720,7 +8720,7 @@ DEFUN (interface_no_ip_mroute,
 
 DEFUN (interface_ip_pim_hello,
        interface_ip_pim_hello_cmd,
-       "ip pim hello (1-180) [(1-180)]",
+       "ip pim hello (1-180) [(1-630)]",
        IP_STR
        PIM_STR
        IFACE_PIM_HELLO_STR
@@ -8755,7 +8755,7 @@ DEFUN (interface_ip_pim_hello,
 
 DEFUN (interface_no_ip_pim_hello,
        interface_no_ip_pim_hello_cmd,
-       "no ip pim hello [(1-180) [(1-180)]]",
+       "no ip pim hello [(1-180) [(1-630)]]",
        NO_STR
        IP_STR
        PIM_STR

diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c
index 11e8da3b87a4f46f0ed5c830061d96eb7be75b4f..c13165a7069b91be0b6794f3c9b11c1a4f041982 100644 (file)
--- a/pimd/pim_nb_config.c
+++ b/pimd/pim_nb_config.c
@@ -1851,7 +1851,7 @@ int lib_interface_pim_hello_holdtime_modify(struct nb_cb_modify_args *args)
                ifp = nb_running_get_entry(args->dnode, NULL, true);
                pim_ifp = ifp->info;
                pim_ifp->pim_default_holdtime =
-                       yang_dnode_get_uint8(args->dnode, NULL);
+                       yang_dnode_get_uint16(args->dnode, NULL);
                break;
        }
 

diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang
index 70adb37b26531876c6e843994091745bf2593838..7f833a80578d165852686f0ddaac52c3938209c6 100644 (file)
--- a/yang/frr-pim.yang
+++ b/yang/frr-pim.yang
@@ -291,8 +291,8 @@ module frr-pim {
     }
 
     leaf hello-holdtime {
-      type uint8 {
-        range "1..180";
+      type uint16 {
+        range "1..630";
       }
       must ". > ./../hello-interval" {
       error-message "HoldTime must be greater than Hello";