summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdumpMichael Richardson2011-04-2710-559/+1373
|\ \ | |/
| * Support RX flags, MCS and the vendor namespace, and fix Rate.Guy Harris2011-04-274-25/+628
| | | | | | | | | | | | | | | | | | | | Based on patches from an anonymous donor, support the radiotap RX flags and MCS fields, and the vendor namespace, and, if Channel and XChannel are both present, use XChannel, not Channel. Do not try to look up a rate for an MCS value from the Rate field; you cannot map an MCS value to a rate without also knowing the channel width and guard interval length.
| * Handle the enterprise field of the sflow flow and counter record format.Rick Jones2011-04-151-66/+111
| | | | | | | | | | | | | | | | Thanks to some traces sent my way by Gavin McCullagh, and a comparison against the output of inMon's sflowtool, I can confidently say "Yes Virginia, there is an enterprise other than zero." Which means lest we start trying to decode something as what it is not, we best actually look at the enterprise field and make sure it is one we recognize.
| * To enable printing of non-expanded samples I've shuffled a bunch of codeRick Jones2011-04-141-259/+528
| | | | | | | | | | | | | | | | | | | | around and created a bunch of smaller routines to more easily support printing of both expanded and non-expanded counter and flow samples. I've done simple testing of non-expanded counter and flow, and expanded counter, but I don't have expanded flow at present with which to test. So, that part of the change is only compile/eyeball tested. Reviewed-and-tweaked-by: Guy Harris <guy@alum.mit.edu>
| * Fix the handling of unknown tagged parameters in management frames.Guy Harris2011-04-051-4/+6
| | | | | | | | | | | | | | Fetch the element length early in the process, rather than fetching it each time we need it - even after we've advanced the pointer we are using to fetch it (doing the latter means we fetch the wrong value when we subtract it from the remaining length).
| * Process the flags even if parsing the full radiotap header fails.Guy Harris2011-04-041-1/+1
| | | | | | | | | | | | | | | | If we were able to get the flags, we should process them, so we know whether there's Atheros padding after the 802.11 header or if there's an FCS at the end of the packet, and properly process them; if we weren't able to get the flags, they're 0, so we're not doing anything differently, and that's the best we can do.
| * Don't return value from a filed cpack_uint8() call.Guy Harris2011-04-041-0/+2
| | | | | | | | | | | | If the cpack_uint8() call to fetch the flags for IEEE80211_RADIOTAP_FLAGS fails, don't return u.u8, as we didn't fetch anything into it.
| * Check the sample, flow, and counter lengths.Guy Harris2011-04-041-18/+61
| | | | | | | | | | | | | | | | | | | | | | When dissecting a sample, or a flow or counter within the sample, make sure we don't run past the length in the sample/flow/counter header. This also means we count the sample length down as we process the contents of the sample, so we only add what, if anything, remains of the sample to the pointer into the packet, and subtract that from the remaining data length in the packet, which means we properly handle packets with multiple samples.
| * Include <tcpdump-stdinc.h> when checking for headers.Guy Harris2011-04-042-290/+129
| | | | | | | | | | | | | | | | Now that we're setting V_INCLS correctly, we don't need to include "tcpdump-stdinc.h" - including <tcpdump-stdinc.h> works. This also picks up configure changes from the previous configure.in change.
| * Properly define {u_}intN_t types when testing pcap/*.h headers.Guy Harris2011-04-041-10/+13
| | | | | | | | | | | | | | pcap/bluetooth.h and pcap/usb.h require those types, so we check for those types before checking those headers, and we include "tcpdump-stdinc.h" in the tests, so the appropriate headers to define those types get pulled in.
| * Expand srcdir in V_INCLS at configure time, not make time.Guy Harris2011-04-043-6/+6
| | | | | | | | | | That way, if we temporarily set CPPFLAGS to include V_INCLS, it'll work correctly.
| * Fix one place where we didn't save and restore CPPFLAGS when modifying it.Guy Harris2011-04-042-0/+4
| |
| * Have empty.uu explicitly be a uuencoding of /dev/null.Guy Harris2011-04-042-2/+2
| | | | | | | | | | | | That way, uudecode will write the decoded output there, rather than to a file named "empty" that gets left around. That also means we don't need to redirect the output of uudecode to /dev/null, so don't do that.
| * Check for uudecode at make time by uudecoding a uuencoded empty file.Guy Harris2011-04-044-59/+6
| | | | | | | | | | | | | | Doing it at make time means you don't have to re-run the configure script if you add uudecode to your system, and doing it by uudecoding a uuencoded empty file means we don't depend on uudecode supporting "--help".
| * Don't assume uudecode supports a --help option; not all uudecodes do.Guy Harris2011-04-033-2/+59
| | | | | | | | | | | | | | | | Instead, check for uudecode in the configure script, and set the CHECK_UUDECODE configuration variable to "true" if we find it and to a command that prints an error message and exits with 1 if we don't find it, and substitute that variable into the Makefile as the first command for "make check".
* | Add printer for the Babel routing protocol (RFC 6126).Juliusz Chroboczek2011-04-276-5/+432
| | | | | | | | This version includes a couple of fixes from Wireshark.
* | added sflow test casesMichael Richardson2011-04-273-0/+1768
|/
* RESEND: [PATCH 1/1] ForCES fix SCTP TML portjamal2011-03-311-3/+3
| | | | | | | | | | | | | | | | | | | | | The old ports for SCTP TML ports were replaced at RFC editor publication time. Caught by folks preparing for an Interop tommorow. While we could add a backward compat support it seems meaningless if those ports will never ever be used in production. I will send new test/pcaps at a later point and remove the existing ones once this patch goes in. cheers, jamal commit 40ecad0e866e7567716e6e57158c5274c0786a21 Author: Jamal Hadi Salim <hadi@mojatatu.com> Date: Thu Feb 3 22:00:23 2011 -0500 Conform to new IANA assignment of ForCES SCTP TML Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com>
* Updated VERSIONMichael Richardson2011-03-281-1/+1
|
* Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdumpGuy Harris2011-03-082-3/+15
|\
| * From Minto Jeyananth <minto@juniper.net>: add support for IS-IS Generic ↵Hannes Gredler2011-03-021-1/+12
| | | | | | | | Cryptographic Authentication as per RFC 5310
| * From Minto Jeyananth <minto@juniper.net>: fix the IS-IS MT flag tokentableHannes Gredler2011-03-022-2/+3
| |
* | Fix plurals in packet count messages.Guy Harris2011-03-084-7/+13
|/ | | | | | | | Based on a patch from cr4ckn@sourceforge.net, but with a macro PLURAL_SUFFIX() defined to return either "s" or "" (rather than possibly printing a NUL character with %c), and with that macro used in a couple of cases where the equivalent had been done by hand, and with one case the patch missed fixed as well.
* Fix a comment, and note a potential issue.Guy Harris2011-03-011-1/+9
|
* Don't clear stuff we'll be overwriting in its entirety.Guy Harris2011-03-011-1/+13
| | | | | | | | | We only need to clear out the tha structure if we support IPv6, so that the addresses are IPv6 addresses, but we only have IPv4 addresses, so that the rest of the address bytes need to be set somehow. Also, explain what we're doing, so people don't ask why we're not zeroing it if we don't support IPv6.
* libpcap doesn't have that comment; remove it here.Guy Harris2011-02-011-3/+0
|
* Squelch warnings about datarootdir.Guy Harris2011-02-011-0/+4
|
* And another quoting of AC_LANG_SOURCE.Guy Harris2011-02-012-3/+4
|
* Put the call to AC_LANG_SOURCE in AC_C___ATTRIBUTE__ in quotes.Guy Harris2011-02-012-3/+4
| | | | | That's what they do in the autoconf manual; perhaps it'll squelch some warnings I'm seeing on NetBSD 5.1 with autoconf 2.68.
* Ignore os-proto.h - it might be a symlink to os/os-XXX.h for some XXX.Guy Harris2011-02-011-0/+1
|
* Get rid of unnecessary configure script tests and missing/XXX.h headers.Guy Harris2011-02-019-607/+0
| | | | | | | | This also fixes configure-script problems on OSes that have IPv6 support but don't have <netinet6/in6.h> - no standard I could find requires that header for IPv6 support (the Single UNIX Specification speaks of <netinet/in.h> for both IPv4 and IPv6, and RFCs 2292 and 3542 don't mention <netinet6/in6.h>, just <netinet/in.h> and <netinet6/ip6.h>).
* Fix e-mail address for tcpdump-workers.Guy Harris2011-01-272-3/+3
| | | | | Thanks to Cameron Elliott for pointing out that the address hadn't been updated.
* Add test pcap+output for nested and recursive pathdataJamal Hadi Salim2011-01-252-0/+602
| | | | | Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com> Signed-off-by: Michael Richardson <mcr@sandelman.ca>
* Use proper type (16bit) when extracting path id countJamal Hadi Salim2011-01-252-3/+3
| | | | | Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com> Signed-off-by: Michael Richardson <mcr@sandelman.ca>
* Fix mixing recursive and flat Path DataJamal Hadi Salim2011-01-251-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | +--PD . +--PD . | . | . +--PD . . +--PD | | +--PD or +--PD . +--PD . + . | . +--PD . + . | . +-- PD . + . | . +-- PD +--PD | | +--PD etc Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com> Signed-off-by: Michael Richardson <mcr@sandelman.ca>
* Fix indent space when we have padded dataJamal Hadi Salim2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | See if you can spot the difference between Pathdata: Flags 0x0 ID count 1 ID#01: 3 FULLDATA TLV (Length 10 DataLen 6 pad 2 Bytes) [ 0x0000: 0002 0406 080a 0000 ] and: Pathdata: Flags 0x0 ID count 1 ID#01: 3 FULLDATA TLV (Length 10 DataLen 6 pad 2 Bytes) [ 0x0000: 0002 0406 080a 0000 ] Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com> Signed-off-by: Michael Richardson <mcr@sandelman.ca>
* Point people to the autoconf documentation on shell substitution.Guy Harris2011-01-232-2/+30
| | | | | Hopefully this will keep people from sending "helpful" patches that break things.
* Handle POSIX quoting rules.Guy Harris2011-01-232-6/+10
| | | | | | | | | | See section 11.6 "Shell Substitutions" in the autoconf documentation, especially the There is just no portable way to use double-quoted strings inside double-quoted back-quoted expressions (pfew!). part.
* ip6_print() now takes a netdissect_options pointer as its first argument.Guy Harris2011-01-231-1/+1
|
* mistype of RPL type codes: off by one. fixedMichael Richardson2010-12-312-5/+5
|
* Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdumpMichael Richardson2010-12-3127-287/+497
|\
| * Use spaces for all entries. Fix Luis MartinGarcia's name.Luis MartinGarcia2010-11-301-187/+187
| |
| * Add support for nommu systems.Guy Harris2010-11-304-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | Rather than hardcode the WIN32 define, add proper fork checks to the configure script and check those. This fixes building for nommu systems which lack the fork function. While we're here though, add support for this functionality via vfork so that it does work on nommu systems. And fix an old bug where we exit properly in the forked child when the exec failed instead of just returning to the calling code (which isn't expecting it). Reviewed-By: Guy Harris <guy@alum.mit.edu>
| * Use AC_PATH_TOOL, not AC_PATH_PROG, to find pcap-config.Mike Frysinger2010-11-302-3/+65
| | | | | | | | | | | | | | | | | | The PROG variant does not take into consideration cross-compilation, so it always looks for "pcap-config" which finds the host script. So use the TOOL variant instead which first searches for the cross-prefixed pcap-config before falling back to the bare "pcap-config". Reviewed-By: Guy Harris <guy@alum.mit.edu>
| * Make sure we can link with libpcap.Guy Harris2010-11-142-0/+109
| | | | | | | | | | | | | | | | | | | | After finding libpcap and getting a list of other flags needed when linking, we check for "pcap_loop()", to make sure we found a working libpcap and have all the right other libraries with which dnl to link. (Otherwise, for example, the check for pcap_list_datalinks() will fail, not because the routines are missing from the library, but because we aren't linking properly with libpcap, and that will cause confusing errors at build time.)
| * Improve printout of DHCPv6 options.Steinar Haug2010-11-131-3/+3
| | | | | | | | Reviewed-By: Guy Harris <guy@alum.mit.edu>
| * Convert the IPv6 printer to use netdissect.Guy Harris2010-11-0718-60/+61
| |
| * Update Gisle Vanem's address.Guy Harris2010-11-071-1/+1
| |
| * Use the ndo argument to lane_hdr_print().Guy Harris2010-11-061-1/+1
| |
| * Use ND_PRINT().Guy Harris2010-11-061-14/+14
| |