bgpd: add the pbr identifier in the log messages

for clarity sake, the identifier is inserted in the debug line.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 7123875f77d81083d375dc7e0dc75ae827d6ae22..9591fe673f74d89f8a6a82781b4abf1de455ac83 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1998,7 +1998,7 @@ static int ipset_notify_owner(int command, struct zclient *zclient,
        bgp_pbim = bgp_pbr_match_ipset_lookup(vrf_id, unique);
        if (!bgp_pbim) {
                if (BGP_DEBUG(zebra, ZEBRA))
-                       zlog_debug("%s: Fail to look BGP match ( %u %u)",
+                       zlog_debug("%s: Fail to look BGP match ( %u, ID %u)",
                                   __PRETTY_FUNCTION__, note, unique);
                return 0;
        }
@@ -2048,7 +2048,7 @@ static int ipset_entry_notify_owner(int command, struct zclient *zclient,
                                                     unique);
        if (!bgp_pbime) {
                if (BGP_DEBUG(zebra, ZEBRA))
-                       zlog_debug("%s: Fail to look BGP match entry (%u %u)",
+                       zlog_debug("%s: Fail to look BGP match entry (%u, ID %u)",
                                   __PRETTY_FUNCTION__, note, unique);
                return 0;
        }
@@ -2589,9 +2589,10 @@ void bgp_send_pbr_ipset_match(struct bgp_pbr_match *pbrim, bool install)
        if (pbrim->install_in_progress)
                return;
        if (BGP_DEBUG(zebra, ZEBRA))
-               zlog_debug("%s: name %s type %d %d",
+               zlog_debug("%s: name %s type %d %d, ID %u",
                           __PRETTY_FUNCTION__,
-                          pbrim->ipset_name, pbrim->type, install);
+                          pbrim->ipset_name, pbrim->type,
+                          install, pbrim->unique);
        s = zclient->obuf;
        stream_reset(s);
 
@@ -2617,9 +2618,9 @@ void bgp_send_pbr_ipset_entry_match(struct bgp_pbr_match_entry *pbrime,
        if (pbrime->install_in_progress)
                return;
        if (BGP_DEBUG(zebra, ZEBRA))
-               zlog_debug("%s: name %s %d %d", __PRETTY_FUNCTION__,
+               zlog_debug("%s: name %s %d %d, ID %u", __PRETTY_FUNCTION__,
                           pbrime->backpointer->ipset_name,
-                          pbrime->unique, install);
+                          pbrime->unique, install, pbrime->unique);
        s = zclient->obuf;
        stream_reset(s);
 
@@ -2684,9 +2685,10 @@ void bgp_send_pbr_iptable(struct bgp_pbr_action *pba,
        if (pbm->install_iptable_in_progress)
                return;
        if (BGP_DEBUG(zebra, ZEBRA))
-               zlog_debug("%s: name %s type %d mark %d %d",
+               zlog_debug("%s: name %s type %d mark %d %d, ID %u",
                           __PRETTY_FUNCTION__, pbm->ipset_name,
-                          pbm->type, pba->fwmark, install);
+                          pbm->type, pba->fwmark, install,
+                          pbm->unique2);
        s = zclient->obuf;
        stream_reset(s);