commit 85385f7eeee14d529065db7b863478c3ba455dd4
author Everton Marques <everton.marques@gmail.com> Mon Jan 19 18:25:45 2015 -0200
committer David Lamparter <equinox@opensourcerouting.org> Wed Feb 04 06:08:02 2015 +0100
tree 2bd0f78e9da970f6153fd266d2214fe91c33dac9
parent d632689579bbcbfb5f38c3faf05ad675e002c059

pimd: Log ifindex found for an interface when zebra lib reports a new connected address.

pimd/pim_iface.c

diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 770bd4e..ecf9ef6 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -388,12 +388,12 @@
   if (!if_is_operative(ifp))
     return;
 
-  if (PIM_DEBUG_ZEBRA) {
+  /* if (PIM_DEBUG_ZEBRA) */ {
     char buf[BUFSIZ];
     prefix2str(ifc->address, buf, BUFSIZ);
-    zlog_debug("%s: %s connected IP address %s %s",
+    zlog_debug("%s: %s ifindex=%d connected IP address %s %s",
 	       __PRETTY_FUNCTION__,
-	       ifp->name, buf,
+	       ifp->name, ifp->ifindex, buf,
 	       CHECK_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY) ?
 	       "secondary" : "primary");
   }
@@ -507,12 +507,12 @@
   ifp = ifc->ifp;
   zassert(ifp);
 
-  if (PIM_DEBUG_ZEBRA) {
+  /* if (PIM_DEBUG_ZEBRA) */ {
     char buf[BUFSIZ];
     prefix2str(ifc->address, buf, BUFSIZ);
-    zlog_debug("%s: %s disconnected IP address %s %s",
+    zlog_debug("%s: %s ifindex=%d disconnected IP address %s %s",
 	       __PRETTY_FUNCTION__,
-	       ifp->name, buf,
+	       ifp->name, ifp->ifindex, buf,
 	       CHECK_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY) ?
 	       "secondary" : "primary");
   }

pimd/pim_pim.c

diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index 04823c2..f6f4c95 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -725,8 +725,8 @@
 
   pim_ifp->pim_generation_id = pim_rand() & (int64_t) 0xFFFFFFFF;
 
-  zlog_info("PIM INTERFACE UP: on interface %s",
-	    ifp->name);
+  zlog_info("PIM INTERFACE UP: on interface %s ifindex=%d",
+	    ifp->name, ifp->ifindex);
 
   /*
    * Start receiving PIM messages

pimd/pim_zebra.c

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index fbc7c16..f184024 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -150,7 +150,7 @@
   if (!ifp)
     return 0;
 
-  zlog_info("INTERFACE UP: %s", ifp->name);
+  zlog_info("INTERFACE UP: %s ifindex=%d", ifp->name, ifp->ifindex);
 
   if (PIM_DEBUG_ZEBRA) {
     zlog_debug("%s: %s index %d flags %ld metric %d mtu %d operative %d",
@@ -182,7 +182,7 @@
   if (!ifp)
     return 0;
 
-  zlog_info("INTERFACE DOWN: %s", ifp->name);
+  zlog_info("INTERFACE DOWN: %s ifindex=%d", ifp->name, ifp->ifindex);
 
   if (PIM_DEBUG_ZEBRA) {
     zlog_debug("%s: %s index %d flags %ld metric %d mtu %d operative %d",