diff options
| author | JP Abgrall <jpa@google.com> | 2014-02-12 13:46:45 -0800 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-02-12 22:15:16 +0000 |
| commit | 511eca30a483e912c274e1d8ba3a0f8f081e2227 (patch) | |
| tree | e1dac8bb306ec92296c44fbcd46553c1fe57cedd /fad-glifc.c | |
| parent | 3a7bce5dda6a8db92c9248846d0255e68c3a5b2a (diff) | |
| download | libpcap-511eca30a483e912c274e1d8ba3a0f8f081e2227.tar.gz | |
Merge remote-tracking branch 'goog/tcpdump'
* goog/tcpdump: (1872 commits)
Remove old version. Getting ready for new libpcap 1.5
Remove commas from clauses in a comma-separated list.
Fix typo.
Describe all NFLOG TLV types and define structures for some of them.
Check caplen in the NFLOG TLV loop.
Have nflog_tlv_t include only the TLV header.
Byte-swap the T and L in TLVs as necessary when reading an NFLOG file.
Don't support D-Bus sniffing on OS X.
Add post-1.5.2 bug fixes.
Tag some changes with a bug identifier.
Add items for 1.5.1 and 1.5.2.
Formatting tweak.
Count *ring buffer blocks*, not *packets* to be filtered in userland.
Add a PACKET_COUNT_IS_UNLIMITED() to test for a packet count <= 0.
Use HAVE_TPACKET3 rather than TPACKET_V3 to test for TPACKET_V3 support.
Fix builds on systems without TPACKET_V3.
tweak manpages formatting
Fix pcap_loop() with a count of 0 and TPACKET_V3.
Discourage the use of a zero timeout.
We can't use TPACKET_V3 in immediate mode, so fall back on TPACKET_V2.
...
Change-Id: I2aa9bd87673c56aee439e1154b96a14026ca7985
Diffstat (limited to 'fad-glifc.c')
| -rw-r--r-- | fad-glifc.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/fad-glifc.c b/fad-glifc.c index 8a86a3d2..b24b5644 100644 --- a/fad-glifc.c +++ b/fad-glifc.c @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/fad-glifc.c,v 1.5.2.1 2005/04/19 00:54:16 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/fad-glifc.c,v 1.7 2008-01-30 09:35:48 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -75,12 +75,12 @@ struct rtentry; /* declarations in <net/if.h> */ * The list, as returned through "alldevsp", may be null if no interfaces * were up and could be opened. * - * This is the implementation used on platforms that have SIOCLGIFCONF + * This is the implementation used on platforms that have SIOCGLIFCONF * but don't have "getifaddrs()". (Solaris 8 and later; we use - * SIOCLGIFCONF rather than SIOCGIFCONF in order to get IPv6 addresses.) + * SIOCGLIFCONF rather than SIOCGIFCONF in order to get IPv6 addresses.) */ int -pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) +pcap_findalldevs_interfaces(pcap_if_t **alldevsp, char *errbuf) { pcap_if_t *devlist = NULL; register int fd4, fd6, fd; @@ -362,15 +362,6 @@ pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) (void)close(fd6); (void)close(fd4); - if (ret != -1) { - /* - * We haven't had any errors yet; do any platform-specific - * operations to add devices. - */ - if (pcap_platform_finddevs(&devlist, errbuf) < 0) - ret = -1; - } - if (ret == -1) { /* * We had an error; free the list we've been constructing. |