diff options
| author | delphij <delphij@FreeBSD.org> | 2009-11-11 21:30:58 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-11-11 21:30:58 +0000 |
| commit | 13a19ef806aacb68fca8a06969fe760e790cf191 (patch) | |
| tree | eea1594231338258764b9d2c6a5b8c04a07d0269 /contrib/libpcap | |
| parent | 7f8b0bd4a81476d4906f4ec7983d3328593bebde (diff) | |
| download | FreeBSD-src-13a19ef806aacb68fca8a06969fe760e790cf191.zip FreeBSD-src-13a19ef806aacb68fca8a06969fe760e790cf191.tar.gz | |
Add interface description capability as inspired by OpenBSD.
MFC after: 3 months
Diffstat (limited to 'contrib/libpcap')
| -rw-r--r-- | contrib/libpcap/inet.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/contrib/libpcap/inet.c b/contrib/libpcap/inet.c index aad8796..8955f2c 100644 --- a/contrib/libpcap/inet.c +++ b/contrib/libpcap/inet.c @@ -403,22 +403,30 @@ 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]; - int s; #endif + int s; -#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(ifrdesc.ifr_data) != 0) - description = ifrdesc.ifr_data; + strlen(ifdescr) != 0) + description = ifdescr; close(s); } #endif |
