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

pimd: Move register_suppress_time into struct pim router

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-12-21 08:54:07 -05:00
parent da03883e1e
commit 2925dff513
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pimd/pim_cmd.c
View File

@ -5256,7 +5256,7 @@ DEFUN (ip_pim_register_suppress,
"Seconds\n") "Seconds\n")
{ {
PIM_DECLVAR_CONTEXT(vrf, pim); PIM_DECLVAR_CONTEXT(vrf, pim);
qpim_register_suppress_time = atoi(argv[3]->arg); router->register_suppress_time = atoi(argv[3]->arg);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -5270,7 +5270,7 @@ DEFUN (no_ip_pim_register_suppress,
"Seconds\n") "Seconds\n")
{ {
PIM_DECLVAR_CONTEXT(vrf, pim); PIM_DECLVAR_CONTEXT(vrf, pim);
qpim_register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT; router->register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
return CMD_SUCCESS; return CMD_SUCCESS;
} }

1
pimd/pim_instance.h
View File

@ -52,6 +52,7 @@ struct pim_router {
int t_periodic; int t_periodic;
struct pim_assert_metric infinite_assert_metric; struct pim_assert_metric infinite_assert_metric;
long rpf_cache_refresh_delay_msec; long rpf_cache_refresh_delay_msec;
int32_t register_suppress_time;
}; };
/* Per VRF PIM DB */ /* Per VRF PIM DB */

5
pimd/pim_upstream.h
View File

@ -126,13 +126,14 @@ 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 ( 3 * qpim_register_suppress_time + qpim_register_probe_time ) #define PIM_RP_KEEPALIVE_PERIOD \
(3 * router->register_suppress_time + qpim_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
* SG. This is needed by MSDP to determine its local SA cache */ * SG. This is needed by MSDP to determine its local SA cache */
struct thread *t_msdp_reg_timer; struct thread *t_msdp_reg_timer;
#define PIM_MSDP_REG_RXED_PERIOD (3 * (1.5 * qpim_register_suppress_time)) #define PIM_MSDP_REG_RXED_PERIOD (3 * (1.5 * router->register_suppress_time))
int64_t state_transition; /* Record current state uptime */ int64_t state_transition; /* Record current state uptime */
}; };

4
pimd/pim_vty.c
View File

@ -172,10 +172,10 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
writes += pim_rp_config_write(pim, vty, spaces); writes += pim_rp_config_write(pim, vty, spaces);
if (qpim_register_suppress_time if (router->register_suppress_time
!= PIM_REGISTER_SUPPRESSION_TIME_DEFAULT) { != PIM_REGISTER_SUPPRESSION_TIME_DEFAULT) {
vty_out(vty, "%sip pim register-suppress-time %d\n", spaces, vty_out(vty, "%sip pim register-suppress-time %d\n", spaces,
qpim_register_suppress_time); router->register_suppress_time);
++writes; ++writes;
} }
if (router->t_periodic != PIM_DEFAULT_T_PERIODIC) { if (router->t_periodic != PIM_DEFAULT_T_PERIODIC) {

2
pimd/pimd.c
View File

@ -54,7 +54,6 @@ struct pim_router *router = NULL;
int qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS; int qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS;
struct pim_instance *pimg = NULL; struct pim_instance *pimg = NULL;
int32_t qpim_register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
int32_t qpim_register_probe_time = PIM_REGISTER_PROBE_TIME_DEFAULT; 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)
@ -103,6 +102,7 @@ void pim_router_init(void)
PIM_ASSERT_ROUTE_METRIC_MAX; PIM_ASSERT_ROUTE_METRIC_MAX;
router->infinite_assert_metric.ip_address.s_addr = INADDR_ANY; router->infinite_assert_metric.ip_address.s_addr = INADDR_ANY;
router->rpf_cache_refresh_delay_msec = 50; router->rpf_cache_refresh_delay_msec = 50;
router->register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
} }
void pim_router_terminate(void) void pim_router_terminate(void)

1
pimd/pimd.h
View File

@ -147,7 +147,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_suppress_time;
extern int32_t qpim_register_probe_time; 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)