proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Move register_probe_time to pim_router

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-12-21 08:59:38 -05:00
parent 75373ccac4
commit a6c5db596e
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pimd/pim_instance.h
View File

@ -54,6 +54,7 @@ struct pim_router {
long rpf_cache_refresh_delay_msec; long rpf_cache_refresh_delay_msec;
int32_t register_suppress_time; int32_t register_suppress_time;
int packet_process; int packet_process;
int32_t register_probe_time;
}; };
/* Per VRF PIM DB */ /* Per VRF PIM DB */

2
pimd/pim_upstream.h
View File

@ -127,7 +127,7 @@ struct pim_upstream {
struct thread *t_ka_timer; struct thread *t_ka_timer;
#define PIM_KEEPALIVE_PERIOD (210) #define PIM_KEEPALIVE_PERIOD (210)
#define PIM_RP_KEEPALIVE_PERIOD \ #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 /* on the RP we restart a timer to indicate if registers are being rxed
* for * for

3
pimd/pimd.c
View File

@ -53,8 +53,6 @@ struct pim_router *router = NULL;
struct pim_instance *pimg = 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) void pim_prefix_list_update(struct prefix_list *plist)
{ {
struct pim_instance *pim; struct pim_instance *pim;
@ -103,6 +101,7 @@ void pim_router_init(void)
router->rpf_cache_refresh_delay_msec = 50; router->rpf_cache_refresh_delay_msec = 50;
router->register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT; router->register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
router->packet_process = PIM_DEFAULT_PACKET_PROCESS; router->packet_process = PIM_DEFAULT_PACKET_PROCESS;
router->register_probe_time = PIM_REGISTER_PROBE_TIME_DEFAULT;
} }
void pim_router_terminate(void) void pim_router_terminate(void)

1
pimd/pimd.h
View File

@ -146,7 +146,6 @@ extern uint8_t qpim_ecmp_rebalance_enable;
* Register-Stop Timer (RST(S,G)) * Register-Stop Timer (RST(S,G))
* Default values * Default values
*/ */
extern int32_t qpim_register_probe_time;
#define PIM_REGISTER_SUPPRESSION_TIME_DEFAULT (60) #define PIM_REGISTER_SUPPRESSION_TIME_DEFAULT (60)
#define PIM_REGISTER_PROBE_TIME_DEFAULT (5) #define PIM_REGISTER_PROBE_TIME_DEFAULT (5)