dect
/
libpcap
Archived
13
0
Fork 0
Code Releases Activity

Update to handle arbitrary-length interface descriptions on FreeBSD. 

Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Xin Li 2010-03-10 15:55:44 -08:00 committed by Guy Harris
parent c3184553df
commit f6cbf3b4de
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS
View File

@ -129,6 +129,7 @@ Additional people who have contributed patches:
Uwe Girlich <Uwe dot Girlich at philosys dot de> Uwe Girlich <Uwe dot Girlich at philosys dot de>
Wesley Shields <wxs at FreeBSD dot org> Wesley Shields <wxs at FreeBSD dot org>
Xianjie Zhang <xzhang at cup dot hp dot com> Xianjie Zhang <xzhang at cup dot hp dot com>
Xin Li <delphij at FreeBSD dot org>
Yen Yen Lim Yen Yen Lim
Yvan Vanhullebus <vanhu at sourceforge dot net> Yvan Vanhullebus <vanhu at sourceforge dot net>
Yoann Vandoorselaere <yoann at prelude-ids dot org> Yoann Vandoorselaere <yoann at prelude-ids dot org>

42
inet.c
View File

@ -417,10 +417,9 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
int s; int s;
struct ifreq ifrdesc; struct ifreq ifrdesc;
#ifndef IFDESCRSIZE #ifndef IFDESCRSIZE
#define _IFDESCRSIZE 64 size_t descrlen = 64;
char ifdescr[_IFDESCRSIZE]; #else
#else /* IFDESCRSIZE */ size_t descrlen = IFDESCRSIZE;
char ifdescr[IFDESCRSIZE];
#endif /* IFDESCRSIZE */ #endif /* IFDESCRSIZE */
#endif /* SIOCGIFDESCR */ #endif /* SIOCGIFDESCR */
@ -430,28 +429,45 @@ add_addr_to_iflist(pcap_if_t **alldevs, const char *name, u_int flags,
*/ */
memset(&ifrdesc, 0, sizeof ifrdesc); memset(&ifrdesc, 0, sizeof ifrdesc);
strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name);
#ifdef __FreeBSD__
ifrdesc.ifr_buffer.buffer = ifdescr;
ifrdesc.ifr_buffer.length = sizeof(ifdescr);
#else /* __FreeBSD__ */
ifrdesc.ifr_data = (caddr_t)ifdescr;
#endif /* __FreeBSD__ */
s = socket(AF_INET, SOCK_DGRAM, 0); s = socket(AF_INET, SOCK_DGRAM, 0);
if (s >= 0) { if (s >= 0) {
if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0 && for (;;) {
strlen(ifdescr) != 0) free(description);
description = ifdescr; if ((description = malloc(descrlen)) != NULL) {
#ifdef __FreeBSD__
ifrdesc.ifr_buffer.buffer = description;
ifrdesc.ifr_buffer.length = descrlen;
#else /* __FreeBSD__ */
ifrdesc.ifr_data = (caddr_t)description;
#endif /* __FreeBSD__ */
if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0)
break;
#ifdef __FreeBSD__
else if (errno == ENAMETOOLONG)
descrlen = ifrdesc.ifr_buffer.length;
#endif /* __FreeBSD__ */
else
break;
} else
break;
}
close(s); close(s);
if (description != NULL && strlen(description) == 0) {
free(description);
description = NULL;
}
} }
#endif /* SIOCGIFDESCR */ #endif /* SIOCGIFDESCR */
if (add_or_find_if(&curdev, alldevs, name, flags, description, if (add_or_find_if(&curdev, alldevs, name, flags, description,
errbuf) == -1) { errbuf) == -1) {
free(description);
/* /*
* Error - give up. * Error - give up.
*/ */
return (-1); return (-1);
} }
free(description);
if (curdev == NULL) { if (curdev == NULL) {
/* /*
* Device wasn't added because it can't be opened. * Device wasn't added because it can't be opened.