proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 10:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: replace direct accesses to t_ka_timer with a kat_running macro

Browse Source 
No functional change, simple cleanup to improve readability

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
This commit is contained in:
Anuradha Karuppiah 2019-11-15 11:28:40 -08:00
parent 103ab2db35
commit ec83653333
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pimd/pim_msdp.c
View File

@ -445,10 +445,9 @@ static bool pim_msdp_sa_local_add_ok(struct pim_upstream *up)
return false; return false;
} }
if (!up->t_ka_timer) { if (!pim_upstream_is_kat_running(up))
/* stream is not active */ /* stream is not active */
return false; return false;
}
if (!I_am_RP(pim, up->sg.grp)) { if (!I_am_RP(pim, up->sg.grp)) {
/* we are not RP for the group */ /* we are not RP for the group */

8
pimd/pim_upstream.c
View File

@ -536,7 +536,8 @@ void pim_upstream_register_reevaluate(struct pim_instance *pim)
* is actually active; if it is not kat setup will trigger * is actually active; if it is not kat setup will trigger
* source * source
* registration whenever the flow becomes active. */ * registration whenever the flow becomes active. */
if (!PIM_UPSTREAM_FLAG_TEST_FHR(up->flags) || !up->t_ka_timer) if (!PIM_UPSTREAM_FLAG_TEST_FHR(up->flags) ||
!pim_upstream_is_kat_running(up))
continue; continue;
if (pim_is_grp_ssm(pim, up->sg.grp)) { if (pim_is_grp_ssm(pim, up->sg.grp)) {
@ -1046,11 +1047,6 @@ static bool pim_upstream_empty_immediate_olist(struct pim_instance *pim,
return true; return true;
} }
static bool pim_upstream_is_kat_running(struct pim_upstream *up)
{
return (up->t_ka_timer != NULL);
}
/* /*
* bool JoinDesired(*,G) { * bool JoinDesired(*,G) {
* if (immediate_olist(*,G) != NULL) * if (immediate_olist(*,G) != NULL)

5
pimd/pim_upstream.h
View File

@ -242,6 +242,11 @@ struct pim_upstream {
int64_t state_transition; /* Record current state uptime */ int64_t state_transition; /* Record current state uptime */
}; };
static inline bool pim_upstream_is_kat_running(struct pim_upstream *up)
{
return (up->t_ka_timer != NULL);
}
struct pim_upstream *pim_upstream_find(struct pim_instance *pim, struct pim_upstream *pim_upstream_find(struct pim_instance *pim,
struct prefix_sg *sg); struct prefix_sg *sg);
struct pim_upstream *pim_upstream_find_or_add(struct prefix_sg *sg, struct pim_upstream *pim_upstream_find_or_add(struct prefix_sg *sg,