Pick up changes from NetBSD:

[libpcap] / inet.c

diff --git a/inet.c b/inet.c
index d46904e91ae954d9b82086469f428e37300e54c9..44efda999ae2a68c5b4f13c2db828c3b2094db15 100644 (file)
--- a/inet.c
+++ b/inet.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.66.2.5 2006-12-30 09:54:16 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.66.2.6 2007-06-11 09:52:04 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -593,7 +593,7 @@ pcap_lookupnet(device, netp, maskp, errbuf)
        register char *errbuf;
 {
        register int fd;
-       register struct sockaddr_in *sin;
+       register struct sockaddr_in *sin4;
        struct ifreq ifr;
 
        /*
@@ -637,8 +637,8 @@ pcap_lookupnet(device, netp, maskp, errbuf)
                (void)close(fd);
                return (-1);
        }
-       sin = (struct sockaddr_in *)&ifr.ifr_addr;
-       *netp = sin->sin_addr.s_addr;
+       sin4 = (struct sockaddr_in *)&ifr.ifr_addr;
+       *netp = sin4->sin_addr.s_addr;
        if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifr) < 0) {
                (void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
                    "SIOCGIFNETMASK: %s: %s", device, pcap_strerror(errno));
@@ -646,7 +646,7 @@ pcap_lookupnet(device, netp, maskp, errbuf)
                return (-1);
        }
        (void)close(fd);
-       *maskp = sin->sin_addr.s_addr;
+       *maskp = sin4->sin_addr.s_addr;
        if (*maskp == 0) {
                if (IN_CLASSA(*netp))
                        *maskp = IN_CLASSA_NET;