From f0936054e0728aa487011ea13b8b6e1d96a50677 Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Mon, 21 May 2018 12:02:52 +0200 Subject: [PATCH] bgpd: brace zebra pbr traces By default, some debug traces were displayed. Those pbr traces are hidden with 'debug bgp zebra' command. Signed-off-by: Philippe Guibert --- bgpd/bgp_zebra.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index e7558c9274..d41831d46b 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -2509,8 +2509,10 @@ void bgp_send_pbr_rule_action(struct bgp_pbr_action *pbra, bool install) if (pbra->install_in_progress) return; - zlog_debug("%s: table %d fwmark %d %d", __PRETTY_FUNCTION__, - pbra->table_id, pbra->fwmark, install); + if (BGP_DEBUG(zebra, ZEBRA)) + zlog_debug("%s: table %d fwmark %d %d", + __PRETTY_FUNCTION__, + pbra->table_id, pbra->fwmark, install); s = zclient->obuf; stream_reset(s); @@ -2532,8 +2534,10 @@ void bgp_send_pbr_ipset_match(struct bgp_pbr_match *pbrim, bool install) if (pbrim->install_in_progress) return; - zlog_debug("%s: name %s type %d %d", __PRETTY_FUNCTION__, - pbrim->ipset_name, pbrim->type, install); + if (BGP_DEBUG(zebra, ZEBRA)) + zlog_debug("%s: name %s type %d %d", + __PRETTY_FUNCTION__, + pbrim->ipset_name, pbrim->type, install); s = zclient->obuf; stream_reset(s); @@ -2558,9 +2562,10 @@ void bgp_send_pbr_ipset_entry_match(struct bgp_pbr_match_entry *pbrime, if (pbrime->install_in_progress) return; - zlog_debug("%s: name %s %d %d", __PRETTY_FUNCTION__, - pbrime->backpointer->ipset_name, - pbrime->unique, install); + if (BGP_DEBUG(zebra, ZEBRA)) + zlog_debug("%s: name %s %d %d", __PRETTY_FUNCTION__, + pbrime->backpointer->ipset_name, + pbrime->unique, install); s = zclient->obuf; stream_reset(s); @@ -2624,8 +2629,10 @@ void bgp_send_pbr_iptable(struct bgp_pbr_action *pba, if (pbm->install_iptable_in_progress) return; - zlog_debug("%s: name %s type %d mark %d %d", __PRETTY_FUNCTION__, - pbm->ipset_name, pbm->type, pba->fwmark, install); + if (BGP_DEBUG(zebra, ZEBRA)) + zlog_debug("%s: name %s type %d mark %d %d", + __PRETTY_FUNCTION__, pbm->ipset_name, + pbm->type, pba->fwmark, install); s = zclient->obuf; stream_reset(s); -- 2.39.5