1667. [port] linux: not all versions have IF_NAMESIZE.

diff --git a/CHANGES b/CHANGES
index 5383561a78484a500254c13242064e6a205e52fd..72201960ea096957ee42aac0a5bece6e02386f59 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1667.  [port]          linux: not all versions have IF_NAMESIZE.
+
 1666.  [bug]           The optional port on hostnames in dual-stack-servers
                        was being ignored.
 

diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index ef2850ad197a7f86ef30d06335cd7604a1c77d69..9e9447cba8e614e0cd72151fc38f09fc9e84f741 100644 (file)
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.46 2004/05/06 03:16:07 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.47 2004/06/19 00:48:15 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@@ -100,6 +100,16 @@ struct isc_interfaceiter {
 #define IFCONF_BUFSIZE_INITIAL 4096
 #define IFCONF_BUFSIZE_MAX     1048576
 
+#ifdef __linux
+#ifndef IF_NAMESIZE
+# ifdef IFNAMSIZ
+#  define IF_NAMESIZE  IFNAMSIZ  
+# else
+#  define IF_NAMESIZE 16
+# endif
+#endif
+#endif
+
 static isc_result_t
 getbuf4(isc_interfaceiter_t *iter) {
        char strbuf[ISC_STRERRORSIZE];

diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c
index 5025d946216509d508cc5d409e0e2446106edc84..5f2d06f5be0aeb4e461ef3f0e7327064a9e4097e 100644 (file)
--- a/lib/isc/unix/interfaceiter.c
+++ b/lib/isc/unix/interfaceiter.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfaceiter.c,v 1.36 2004/04/20 06:46:46 marka Exp $ */
+/* $Id: interfaceiter.c,v 1.37 2004/06/19 00:48:15 marka Exp $ */
 
 #include <config.h>
 
@@ -65,6 +65,11 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src,
 {
        struct sockaddr_in6 *sa6;
 
+#if !defined(ISC_PLATFORM_HAVEIFNAMETOINDEX) || \
+    !defined(ISC_PLATFORM_HAVESCOPEID)
+       UNUSED(ifname);
+#endif
+
        /* clear any remaining value for safety */
        memset(dst, 0, sizeof(*dst));