proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-30 18:25:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Cleanup some join debug messages

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-06-05 13:44:15 -04:00
parent 5f40dadaf0
commit a57103e963
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pimd/pim_join.c
View File

@ -64,9 +64,9 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
zlog_warn( zlog_warn(
"%s: join (S,G)=%s rpt=%d wc=%d upstream=%s holdtime=%d from %s on %s", "%s: join (S,G)=%s rpt=%d wc=%d upstream=%s holdtime=%d from %s on %s",
__PRETTY_FUNCTION__, pim_str_sg_dump(sg), __PRETTY_FUNCTION__, pim_str_sg_dump(sg),
source_flags & PIM_RPT_BIT_MASK, !!(source_flags & PIM_RPT_BIT_MASK),
source_flags & PIM_WILDCARD_BIT_MASK, up_str, holdtime, !!(source_flags & PIM_WILDCARD_BIT_MASK), up_str,
neigh_str, ifp->name); holdtime, neigh_str, ifp->name);
} }
pim_ifp = ifp->info; pim_ifp = ifp->info;
@ -86,8 +86,20 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
* If the RP sent in the message is not * If the RP sent in the message is not
* our RP for the group, drop the message * our RP for the group, drop the message
*/ */
if (sg->src.s_addr != rp->rpf_addr.u.prefix4.s_addr) if (sg->src.s_addr != rp->rpf_addr.u.prefix4.s_addr) {
char received_rp[INET_ADDRSTRLEN];
char local_rp[INET_ADDRSTRLEN];
pim_inet4_dump("<received?>", sg->src, received_rp,
sizeof(received_rp));
pim_inet4_dump("<local?>", rp->rpf_addr.u.prefix4,
local_rp, sizeof(local_rp));
if (PIM_DEBUG_PIM_TRACE)
zlog_warn(
"%s: Specified RP(%s) in join is different than our configured RP(%s)",
__PRETTY_FUNCTION__, received_rp,
local_rp);
return; return;
}
sg->src.s_addr = INADDR_ANY; sg->src.s_addr = INADDR_ANY;
} }