From a895ac30298cbd7d9e129526434c4060fba5513d Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 21 Jun 2017 12:26:23 -0400 Subject: [PATCH] pimd: Ensure that (S,G) output is consistent 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 --- pimd/pim_nht.c | 4 ++-- pimd/pim_zebra.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index 150820fb85..70b831cc43 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -554,7 +554,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim, grp_str, sizeof(grp_str)); 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__, src_str, grp_str, nexthop->interface->name); @@ -651,7 +651,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim, nexthop->mrib_nexthop_addr.u.prefix4, buf, sizeof(buf)); 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, ifp->name, buf, mod_val, nh_iter, qpim_ecmp_enable); diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index 7fc7e42534..9fbca9cb21 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -546,7 +546,7 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index) pim_inet4_dump("", c_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str)); 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); } input_iface_vif_index = pim_ecmp_fib_lookup_if_vif_index( -- 2.39.5