diff options
| author | delphij <delphij@FreeBSD.org> | 2009-11-12 19:02:10 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-11-12 19:02:10 +0000 |
| commit | 8fed657163fb373990aaa15c79b58a7c963373b2 (patch) | |
| tree | 16ac7b8e4875faf8659392bffa9753b287fa7398 /contrib/libpcap | |
| parent | 2f448a4a2a88e26012aba2a9ddf375e1a9f2eed1 (diff) | |
| download | FreeBSD-src-8fed657163fb373990aaa15c79b58a7c963373b2.zip FreeBSD-src-8fed657163fb373990aaa15c79b58a7c963373b2.tar.gz | |
Revert revision 199201 for now as it has introduced a kernel vulnerability
and requires more polishing.
Diffstat (limited to 'contrib/libpcap')
| -rw-r--r-- | contrib/libpcap/inet.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/contrib/libpcap/inet.c b/contrib/libpcap/inet.c index 8955f2c..aad8796 100644 --- a/contrib/libpcap/inet.c +++ b/contrib/libpcap/inet.c @@ -403,30 +403,22 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags, pcap_addr_t *curaddr, *prevaddr, *nextaddr; #ifdef SIOCGIFDESCR struct ifreq ifrdesc; -#ifdef __FreeBSD__ -#define _IFDESCRSIZE 64 - char ifdescr[_IFDESCRSIZE]; -#else char ifdescr[IFDESCRSIZE]; -#endif int s; +#endif +#ifdef SIOCGIFDESCR /* * Get the description for the interface. */ memset(&ifrdesc, 0, sizeof ifrdesc); strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); -#ifdef __FreeBSD__ - ifrdesc.ifr_buffer.buffer = ifdescr; - ifrdesc.ifr_buffer.length = _IFDESCRSIZE; -#else ifrdesc.ifr_data = (caddr_t)&ifdescr; -#endif s = socket(AF_INET, SOCK_DGRAM, 0); if (s >= 0) { if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0 && - strlen(ifdescr) != 0) - description = ifdescr; + strlen(ifrdesc.ifr_data) != 0) + description = ifrdesc.ifr_data; close(s); } #endif |
