From a6c5db596eafa6b587297ca4eb4ef386eeb9185a Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 21 Dec 2018 08:59:38 -0500 Subject: [PATCH] pimd: Move register_probe_time to pim_router Signed-off-by: Donald Sharp --- pimd/pim_instance.h | 1 + pimd/pim_upstream.h | 2 +- pimd/pimd.c | 3 +-- pimd/pimd.h | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pimd/pim_instance.h b/pimd/pim_instance.h index 59078c7502..d3a3f1ec70 100644 --- 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 c69e7388d3..f44b95c811 100644 --- 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 8b21923b11..1791c1376e 100644 --- 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 b68725157d..73ea9f82c4 100644 --- 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) -- 2.39.5