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

pimd: Modify Debug to be better

Browse Source 
Make debugs of some pim processes easier
to interpret and understand.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-10-31 20:01:16 -04:00
parent d1b64e31aa
commit 5d84a3bc9a
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pimd/pim_cmd.c
View File

@ -1672,6 +1672,7 @@ static void pim_show_upstream(struct vty *vty, u_char uj)
json_object_string_add(json_row, "resetTimer", rs_timer); json_object_string_add(json_row, "resetTimer", rs_timer);
json_object_string_add(json_row, "keepaliveTimer", ka_timer); json_object_string_add(json_row, "keepaliveTimer", ka_timer);
json_object_int_add(json_row, "refCount", up->ref_count); json_object_int_add(json_row, "refCount", up->ref_count);
json_object_int_add(json_row, "sptBit", up->sptbit);
json_object_object_add(json_group, src_str, json_row); json_object_object_add(json_group, src_str, json_row);
} else { } else {
vty_out(vty, "%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d%s", vty_out(vty, "%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d%s",

22
pimd/pim_register.c
View File

@ -268,14 +268,6 @@ pim_register_recv (struct interface *ifp,
return 0; return 0;
} }
if (PIM_DEBUG_PIM_REG)
{
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump ("<src?>", src_addr, src_str, sizeof (src_str));
zlog_debug ("Received Register message from %s on %s", src_str, ifp->name);
}
/* /*
* Please note this is not drawn to get the correct bit/data size * Please note this is not drawn to get the correct bit/data size
* *
@ -307,6 +299,16 @@ pim_register_recv (struct interface *ifp,
sg.grp = ip_hdr->ip_dst; sg.grp = ip_hdr->ip_dst;
i_am_rp = I_am_RP (sg.grp); i_am_rp = I_am_RP (sg.grp);
if (PIM_DEBUG_PIM_REG)
{
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump ("<src?>", src_addr, src_str, sizeof (src_str));
zlog_debug ("Received Register message(%s) from %s on %s, rp: %d",
pim_str_sg_dump (&sg), src_str, ifp->name, i_am_rp);
}
if (i_am_rp && (dest_addr.s_addr == ((RP (sg.grp))->rpf_addr.u.prefix4.s_addr))) { if (i_am_rp && (dest_addr.s_addr == ((RP (sg.grp))->rpf_addr.u.prefix4.s_addr))) {
sentRegisterStop = 0; sentRegisterStop = 0;
@ -360,8 +362,10 @@ pim_register_recv (struct interface *ifp,
//pim_scan_individual_oil (upstream->channel_oil); //pim_scan_individual_oil (upstream->channel_oil);
pim_register_stop_send (ifp, &sg, dest_addr, src_addr); pim_register_stop_send (ifp, &sg, dest_addr, src_addr);
sentRegisterStop = 1; sentRegisterStop = 1;
} else {
if (PIM_DEBUG_PIM_REG)
zlog_debug ("(%s) sptbit: %d", pim_str_sg_dump (&upstream->sg), upstream->sptbit);
} }
if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) || if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||
(SwitchToSptDesired(&sg))) { (SwitchToSptDesired(&sg))) {
if (sentRegisterStop) { if (sentRegisterStop) {