Removed portability ifdefs and calls to nonstandard back-end.

1 files changed, 13 insertions, 57 deletions

diff --git a/src/lib/libc/net/if_nameindex.c b/src/lib/libc/net/if_nameindex.c
index 65bdbde9af..ba7f5e5525 100644
--- a/src/lib/libc/net/if_nameindex.c
+++ b/src/lib/libc/net/if_nameindex.c
@@ -58,33 +58,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Craig Metz and
- *      by other contributors.
- * 4. Neither the name of the author nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
  */
 
 #include <stdlib.h>
@@ -92,9 +65,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#ifdef AF_LINK
 #include <net/if_dl.h>
-#endif /* AF_LINK */
 #include <errno.h>
 
 struct if_nameindex *if_nameindex(void)
@@ -109,10 +80,16 @@ struct if_nameindex *if_nameindex(void)
   if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
     return NULL;
 
-  if (__siocgifconf(fd, &ifconf)) {
-    close(fd);
-    return NULL;
-  };
+  ifconf.ifc_len = 0;
+  ifconf.ifc_buf = 0;
+  if (ioctl(fd, SIOCGIFCONF, (void *)&ifconf))
+    goto ret;
+  if (ifconf->ifc_len < IFNAMSIZ)
+    goto ret;
+  if (!(ifconf->ifc_buf = malloc(ifconf->ifc_len)))
+    goto ret;
+  if (ioctl(fd, SIOCGIFCONF, (void *)&ifconf))
+    goto ret;
 
   i = sizeof(struct if_nameindex);
   j = 0;
@@ -145,9 +122,6 @@ struct if_nameindex *if_nameindex(void)
   memset(nameindex, 0, i + j);
 
   {
-#ifdef SIOCGIFINDEX
-  struct ifreq ifreq;
-#endif /* SIOCGIFINDEX */
   struct if_nameindex *n;
   char *c;
 
@@ -163,16 +137,8 @@ struct if_nameindex *if_nameindex(void)
       goto ret;
     if (strncmp(lastname, p, IFNAMSIZ)) {
       if (i) {
-        if (!n->if_index) {
-#ifdef SIOCGIFINDEX
-        strcpy(ifreq.ifr_name, lastname);
-        if (ioctl(fd, SIOCGIFINDEX, &ifreq))
-          goto ret;
-        n->if_index = ifreq.ifr_ifindex;
-#else /* SIOCGIFINDEX */
-        n->if_index = i;
-#endif /* SIOCGIFINDEX */
-        };
+        if (!n->if_index)
+          n->if_index = i;
         n++;
       };
       i++;
@@ -185,24 +151,14 @@ struct if_nameindex *if_nameindex(void)
 
     if (len < SA_LEN((struct sockaddr *)p))
       goto ret;
-#ifdef AF_LINK
     if (((struct sockaddr *)p)->sa_family == AF_LINK)
       n->if_index = ((struct sockaddr_dl *)p)->sdl_index;
-#endif /* AF_LINK */
     len -= SA_LEN((struct sockaddr *)p);
     p += SA_LEN((struct sockaddr *)p);
   };
 
-  if (!n->if_index) {
-#ifdef SIOCGIFINDEX
-    strcpy(ifreq.ifr_name, lastname);
-    if (ioctl(fd, SIOCGIFINDEX, &ifreq))
-      goto ret;
-    n->if_index = ifreq.ifr_ifindex;
-#else /* SIOCGIFINDEX */
+  if (!n->if_index)
     n->if_index = i;
-#endif /* SIOCGIFINDEX */
-  };
   };
 
 ret: