Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pcap_lookupnet(): reset ifr before SIOCGIFNETMASK. Without it we get 

back a bogus netmask.
This commit is contained in:
bouyer 2009-09-29 19:00:45 +00:00
parent 21e3c4b6e7
commit 31c07c3453
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/libpcap/inet.c vendored
View File

@ -34,7 +34,7 @@
#ifndef lint
static const char rcsid[] _U_ =
"@(#) $Header: /cvsroot/src/dist/libpcap/Attic/inet.c,v 1.2 2006/02/27 15:53:24 drochner Exp $ (LBL)";
"@(#) $Header: /cvsroot/src/dist/libpcap/Attic/inet.c,v 1.3 2009/09/29 19:00:45 bouyer Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -573,6 +573,12 @@ pcap_lookupnet(device, netp, maskp, errbuf)
}
sin4 = (struct sockaddr_in *)&ifr.ifr_addr;
*netp = sin4->sin_addr.s_addr;
memset(&ifr, 0, sizeof(ifr));
#ifdef linux
/* XXX Work around Linux kernel bug */
ifr.ifr_addr.sa_family = AF_INET;
#endif
(void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifr) < 0) {
(void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
"SIOCGIFNETMASK: %s: %s", device, pcap_strerror(errno));