2005-05-07 Yar Tikhiy <yar@comp.chem.msu.su>

	* configure.ac: Check for OSes which support passing ifindex in
	  struct ip_mreq.
	* lib/sockopt.c: Add support for BSD style ifindex in ip_mreq.
	* ospfd/ospf_network.c: Log ifindex on multicast membership leave/join
	  events.
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index d8ec676..209027e 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-07 Yar Tikhiy <yar@comp.chem.msu.su>
+
+	* ospf_network.c: Log ifindex on multicast membership leave/join
+	  events.
+
 2005-05-06 Paul Jakma <paul.jakma@sun.com>
 
         * (general) extern and static qualifiers added. 
diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c
index c2c8b13..e8c9837 100644
--- a/ospfd/ospf_network.c
+++ b/ospfd/ospf_network.c
@@ -60,8 +60,8 @@
 	       "on # of multicast group memberships has been exceeded?",
                top->fd, inet_ntoa(p->u.prefix4), ifindex, safe_strerror(errno));
   else
-    zlog_info ("interface %s join AllSPFRouters Multicast group.",
-	       inet_ntoa (p->u.prefix4));
+    zlog_info ("interface %s [%u] join AllSPFRouters Multicast group.",
+	       inet_ntoa (p->u.prefix4), ifindex);
 
   return ret;
 }
@@ -80,8 +80,8 @@
 	       "ifindex %u, AllSPFRouters): %s",
                top->fd, inet_ntoa(p->u.prefix4), ifindex, safe_strerror(errno));
   else
-    zlog_info ("interface %s leave AllSPFRouters Multicast group.",
-	       inet_ntoa (p->u.prefix4));
+    zlog_info ("interface %s [%u] leave AllSPFRouters Multicast group.",
+	       inet_ntoa (p->u.prefix4), ifindex);
 
   return ret;
 }
@@ -102,8 +102,8 @@
 	       "on # of multicast group memberships has been exceeded?",
                top->fd, inet_ntoa(p->u.prefix4), ifindex, safe_strerror(errno));
   else
-    zlog_info ("interface %s join AllDRouters Multicast group.",
-	       inet_ntoa (p->u.prefix4));
+    zlog_info ("interface %s [%u] join AllDRouters Multicast group.",
+	       inet_ntoa (p->u.prefix4), ifindex);
 
   return ret;
 }
@@ -122,8 +122,8 @@
 	       "ifindex %u, AllDRouters): %s",
                top->fd, inet_ntoa(p->u.prefix4), ifindex, safe_strerror(errno));
   else
-    zlog_info ("interface %s leave AllDRouters Multicast group.",
-	       inet_ntoa (p->u.prefix4));
+    zlog_info ("interface %s [%u] leave AllDRouters Multicast group.",
+	       inet_ntoa (p->u.prefix4), ifindex);
 
   return ret;
 }