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

pimd: Only debug in the unusual case

Browse Source 
When receiving a J/P packet, only check to see if we should
log when the J/P packet is not for us.

Very slight performance improvement additionally

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-02-10 15:14:16 -05:00
parent c48a612c21
commit 116b989af2
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pimd/pim_ifchannel.c
View File

@ -678,12 +678,13 @@ static void check_recv_upstream(int is_join,
pim_upstream_join_timer_decrease_to_t_override("Prune(S,G)", up); pim_upstream_join_timer_decrease_to_t_override("Prune(S,G)", up);
} }
static int nonlocal_upstream(int is_join, static int
struct interface *recv_ifp, nonlocal_upstream(int is_join,
struct in_addr upstream, struct interface *recv_ifp,
struct prefix_sg *sg, struct in_addr upstream,
uint8_t source_flags, struct prefix_sg *sg,
uint16_t holdtime) uint8_t source_flags,
uint16_t holdtime)
{ {
struct pim_interface *recv_pim_ifp; struct pim_interface *recv_pim_ifp;
int is_local; /* boolean */ int is_local; /* boolean */
@ -692,27 +693,26 @@ static int nonlocal_upstream(int is_join,
zassert(recv_pim_ifp); zassert(recv_pim_ifp);
is_local = (upstream.s_addr == recv_pim_ifp->primary_address.s_addr); is_local = (upstream.s_addr == recv_pim_ifp->primary_address.s_addr);
if (PIM_DEBUG_PIM_TRACE_DETAIL) {
char up_str[INET_ADDRSTRLEN];
pim_inet4_dump("<upstream?>", upstream, up_str, sizeof(up_str));
zlog_warn("%s: recv %s (S,G)=%s to %s upstream=%s on %s",
__PRETTY_FUNCTION__,
is_join ? "join" : "prune",
pim_str_sg_dump (sg),
is_local ? "local" : "non-local",
up_str, recv_ifp->name);
}
if (is_local) if (is_local)
return 0; return 0;
if (PIM_DEBUG_PIM_TRACE_DETAIL) {
char up_str[INET_ADDRSTRLEN];
pim_inet4_dump("<upstream?>", upstream, up_str, sizeof(up_str));
zlog_warn("%s: recv %s (S,G)=%s to non-local upstream=%s on %s",
__PRETTY_FUNCTION__,
is_join ? "join" : "prune",
pim_str_sg_dump (sg),
up_str, recv_ifp->name);
}
/* /*
Since recv upstream addr was not directed to our primary * Since recv upstream addr was not directed to our primary
address, check if we should react to it in any way. * address, check if we should react to it in any way.
*/ */
check_recv_upstream(is_join, recv_ifp, upstream, sg, check_recv_upstream(is_join, recv_ifp, upstream, sg,
source_flags, holdtime); source_flags, holdtime);
return 1; /* non-local */ return 1; /* non-local */
} }