From: Frank Kardel <kardel@ntp.org>
Date: Wed, 24 Aug 2005 21:42:33 +0000 (+0000)
Subject: ntp_io.c:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07f6614d2b8b747d4f7df8981f8b47fa5c3dd5ce;p=thirdparty%2Fntp.git

ntp_io.c:
  fix interface number log output

bk: 430ce9c9rky8QyhS_TBpGqc-f7YR2g
---

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 78bd20e267..e4e1d54091 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -399,14 +399,15 @@ interface_dump(struct interface *itf)
 static void
 print_interface(struct interface *iface, char *pfx, char *sfx)
 {
-	printf("%sinterface #%d: fd=%d, bfd=%d, name=%s, flags=0x%x, scope=%d",
+	printf("%sinterface #%d: fd=%d, bfd=%d, name=%s, flags=0x%x, scope=%d, ifindex=%d",
 	       pfx,
-	       iface->ifindex,
+	       iface->ifnum,
 	       iface->fd,
 	       iface->bfd,
 	       iface->name,
 	       iface->flags,
-	       iface->scopeid);
+	       iface->scopeid,
+	       iface->ifindex);
 	/* Leave these as three printf calls. */
 	printf(", sin=%s",
 	       stoa((&iface->sin)));
@@ -527,7 +528,7 @@ remove_interface(struct interface *interface)
 	if (interface->fd != INVALID_SOCKET) 
 	{
 		msyslog(LOG_INFO, "Deleting interface #%d %s, %s#%d",
-			interface->ifindex,
+			interface->ifnum,
 			interface->name,
 			stoa((&interface->sin)),
 			NTP_PORT);  /* XXX should extract port from sin structure */
@@ -537,7 +538,7 @@ remove_interface(struct interface *interface)
 	if (interface->bfd != INVALID_SOCKET) 
 	{
 		msyslog(LOG_INFO, "Deleting interface #%d %s, broadcast address %s#%d",
-			interface->ifindex,
+			interface->ifnum,
 			interface->name,
 			stoa((&interface->bcast)),
 			(u_short) NTP_PORT);  /* XXX extract port from sin structure */