1 files changed, 10 insertions, 77 deletions

diff --git a/src/lib/libc/net/if_nametoindex.c b/src/lib/libc/net/if_nametoindex.c
index 8ec2b233d1..2b9810d314 100644
--- a/src/lib/libc/net/if_nametoindex.c
+++ b/src/lib/libc/net/if_nametoindex.c
@@ -30,61 +30,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.
- *
- * 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 <sys/types.h>
@@ -92,40 +37,31 @@
 #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>
 
 unsigned int if_nametoindex(const char *name)
 {
   int i, fd;
-#ifdef SIOCGIFINDEX
-  struct ifreq ifreq;
-#else /* SIOCGIFINDEX */
   struct ifconf ifconf;
   void *p;
   int len;
   char lastname[IFNAMSIZ + 1], *thisname;
   unsigned int index = 0;
-#endif /* SIOCGIFINDEX */
 
   if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
     return 0;
 
-#ifdef SIOCGIFINDEX
-  strcpy(ifreq.ifr_name, name);
-  i = ioctl(fd, SIOCGIFINDEX, &ifreq);
-  close(fd);
-  if (i)
-    return 0;
-
-  return ifreq.ifr_ifindex;
-#else /* SIOCGIFINDEX */
-  if (__siocgifconf(fd, &ifconf)) {
-    close(fd);
-    return 0;
-  };
+  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 = 0;
   p = ifconf.ifc_buf;
@@ -149,12 +85,10 @@ unsigned int if_nametoindex(const char *name)
     len -= IFNAMSIZ;
     p += IFNAMSIZ;
 
-#ifdef AF_LINK
     if (!strncmp(thisname, name, IFNAMSIZ) && (((struct sockaddr *)p)->sa_family == AF_LINK)) {
       index = ((struct sockaddr_dl *)p)->sdl_index;
       goto ret;
     };
-#endif /* AF_LINK */
 
     if (len < SA_LEN((struct sockaddr *)p))
       goto ret;
@@ -169,5 +103,4 @@ ret:
   close(fd);
   free(ifconf.ifc_buf);
   return index;
-#endif /* SIOCGIFINDEX */
 };