pimd: Move register_probe_time to pim_router

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_instance.h b/pimd/pim_instance.h
index 59078c750250f41113f47e238623b0c2cd7b17b3..d3a3f1ec704bfc1740c7d6b34cfab563919c7309 100644 (file)
--- a/pimd/pim_instance.h
+++ b/pimd/pim_instance.h
@@ -54,6 +54,7 @@ struct pim_router {
        long rpf_cache_refresh_delay_msec;
        int32_t register_suppress_time;
        int packet_process;
+       int32_t register_probe_time;
 };
 
 /* Per VRF PIM DB */

diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h
index c69e7388d3e5274d996251d7d039a9e112244e7c..f44b95c81105095774f6c080330e846ca6dc70a7 100644 (file)
--- a/pimd/pim_upstream.h
+++ b/pimd/pim_upstream.h
@@ -127,7 +127,7 @@ struct pim_upstream {
        struct thread *t_ka_timer;
 #define PIM_KEEPALIVE_PERIOD  (210)
 #define PIM_RP_KEEPALIVE_PERIOD                                                \
-       (3 * router->register_suppress_time + qpim_register_probe_time)
+       (3 * router->register_suppress_time + router->register_probe_time)
 
        /* on the RP we restart a timer to indicate if registers are being rxed
         * for

diff --git a/pimd/pimd.c b/pimd/pimd.c
index 8b21923b1143e33f855e1be912f10be53a663711..1791c1376e5cf88216418ecc61974037c88008de 100644 (file)
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -53,8 +53,6 @@ struct pim_router *router = NULL;
 
 struct pim_instance *pimg = NULL;
 
-int32_t qpim_register_probe_time = PIM_REGISTER_PROBE_TIME_DEFAULT;
-
 void pim_prefix_list_update(struct prefix_list *plist)
 {
        struct pim_instance *pim;
@@ -103,6 +101,7 @@ void pim_router_init(void)
        router->rpf_cache_refresh_delay_msec = 50;
        router->register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
        router->packet_process = PIM_DEFAULT_PACKET_PROCESS;
+       router->register_probe_time = PIM_REGISTER_PROBE_TIME_DEFAULT;
 }
 
 void pim_router_terminate(void)

diff --git a/pimd/pimd.h b/pimd/pimd.h
index b68725157d74b4b06f3868b927780f30ed53e83f..73ea9f82c4ec569a9d8c08c90a5c350231f72bda 100644 (file)
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -146,7 +146,6 @@ extern uint8_t qpim_ecmp_rebalance_enable;
  * Register-Stop Timer (RST(S,G))
  * Default values
  */
-extern int32_t qpim_register_probe_time;
 #define PIM_REGISTER_SUPPRESSION_TIME_DEFAULT      (60)
 #define PIM_REGISTER_PROBE_TIME_DEFAULT            (5)