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: Ensure that (S,G) output is consistent

Browse Source 
Ensure that displayed (S,G) output in logs is
consistent for all debugs.  This will make it
easier to grep for interesting data.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-06-21 12:26:23 -04:00
parent 38de2445c5
commit a895ac3029
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pimd/pim_nht.c
View File

@ -554,7 +554,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
grp_str, grp_str,
sizeof(grp_str)); sizeof(grp_str));
zlog_debug( zlog_debug(
"%s: (%s, %s) current nexthop %s is valid, skipping new path selection", "%s: (%s,%s) current nexthop %s is valid, skipping new path selection",
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
src_str, grp_str, src_str, grp_str,
nexthop->interface->name); nexthop->interface->name);
@ -651,7 +651,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
nexthop->mrib_nexthop_addr.u.prefix4, nexthop->mrib_nexthop_addr.u.prefix4,
buf, sizeof(buf)); buf, sizeof(buf));
zlog_debug( zlog_debug(
"%s: (%s, %s) selected nhop interface %s addr %s mod_val %u iter %d ecmp %d", "%s: (%s,%s) selected nhop interface %s addr %s mod_val %u iter %d ecmp %d",
__PRETTY_FUNCTION__, buf2, buf3, __PRETTY_FUNCTION__, buf2, buf3,
ifp->name, buf, mod_val, nh_iter, ifp->name, buf, mod_val, nh_iter,
qpim_ecmp_enable); qpim_ecmp_enable);

2
pimd/pim_zebra.c
View File

@ -546,7 +546,7 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index)
pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp,
group_str, sizeof(group_str)); group_str, sizeof(group_str));
zlog_debug( zlog_debug(
"%s: channel_oil (%s, %s) upstream info is not present.", "%s: channel_oil (%s,%s) upstream info is not present.",
__PRETTY_FUNCTION__, source_str, group_str); __PRETTY_FUNCTION__, source_str, group_str);
} }
input_iface_vif_index = pim_ecmp_fib_lookup_if_vif_index( input_iface_vif_index = pim_ecmp_fib_lookup_if_vif_index(