Commit Graph

2704 Commits

Author SHA1 Message Date
Guy Harris
91942a9cb6 Fix plurals in packet count messages.
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.
2011-03-08 09:11:25 -08:00
Hannes Gredler
548cef814d From Minto Jeyananth <minto@juniper.net>: add support for IS-IS Generic Cryptographic Authentication as per RFC 5310 2011-03-02 16:57:03 +01:00
Hannes Gredler
aac33a3684 From Minto Jeyananth <minto@juniper.net>: fix the IS-IS MT flag tokentable 2011-03-02 16:49:28 +01:00
Guy Harris
7e44242ea8 Fix a comment, and note a potential issue. 2011-03-01 16:41:39 -08:00
Guy Harris
64c6e944c6 Don't clear stuff we'll be overwriting in its entirety.
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.
2011-03-01 16:38:24 -08:00
Guy Harris
7784843320 libpcap doesn't have that comment; remove it here. 2011-02-01 15:39:57 -08:00
Guy Harris
9678c36f1f Squelch warnings about datarootdir. 2011-02-01 15:38:54 -08:00
Guy Harris
f663403419 And another quoting of AC_LANG_SOURCE. 2011-02-01 15:04:00 -08:00
Guy Harris
6d9c7f9ae0 Put the call to AC_LANG_SOURCE in AC_C___ATTRIBUTE__ in quotes.
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.
2011-02-01 14:59:53 -08:00
Guy Harris
b77683541e Ignore os-proto.h - it might be a symlink to os/os-XXX.h for some XXX. 2011-02-01 12:44:11 -08:00
Guy Harris
687b442022 Get rid of unnecessary configure script tests and missing/XXX.h headers.
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>).
2011-02-01 02:08:41 -08:00
Guy Harris
aa0cc41863 Fix e-mail address for tcpdump-workers.
Thanks to Cameron Elliott for pointing out that the address hadn't been
updated.
2011-01-27 11:09:28 -08:00
Jamal Hadi Salim
1f4fe57314 Add test pcap+output for nested and recursive pathdata
Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com>
Signed-off-by: Michael Richardson <mcr@sandelman.ca>
2011-01-25 19:59:46 -05:00
Jamal Hadi Salim
f65274c570 Use proper type (16bit) when extracting path id count
Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com>
Signed-off-by: Michael Richardson <mcr@sandelman.ca>
2011-01-25 19:59:44 -05:00
Jamal Hadi Salim
a9de1ae94e Fix mixing recursive and flat Path Data
+--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>
2011-01-25 19:57:55 -05:00
Jamal Hadi Salim
375352c72b Fix indent space when we have padded data
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>
2011-01-25 19:56:52 -05:00
Guy Harris
7254c152b3 Point people to the autoconf documentation on shell substitution.
Hopefully this will keep people from sending "helpful" patches that
break things.
2011-01-23 15:07:01 -08:00
Guy Harris
869efa23a3 Handle POSIX quoting rules.
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.
2011-01-23 13:35:31 -08:00
Guy Harris
29b7e58f10 ip6_print() now takes a netdissect_options pointer as its first argument. 2011-01-23 01:24:22 -08:00
Michael Richardson
3e508b0074 mistype of RPL type codes: off by one. fixed 2010-12-31 12:36:24 -05:00
Michael Richardson
10bdeb0c44 Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump 2010-12-31 12:28:51 -05:00
Michael Richardson
d1088041e2 updated RPL type code to RPL-17 draft
added secure bit
updated single test case
2010-12-31 12:28:43 -05:00
Luis MartinGarcia
3ef65fe7af Use spaces for all entries. Fix Luis MartinGarcia's name. 2010-11-30 16:29:58 -08:00
Guy Harris
d8252d0c05 Add support for nommu systems.
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>
2010-11-30 16:18:32 -08:00
Mike Frysinger
316d5087cc Use AC_PATH_TOOL, not AC_PATH_PROG, to find pcap-config.
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>
2010-11-30 16:13:05 -08:00
Guy Harris
71894d1a62 Make sure we can link with libpcap.
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.)
2010-11-14 12:23:40 -08:00
Steinar Haug
705328c505 Improve printout of DHCPv6 options.
Reviewed-By: Guy Harris <guy@alum.mit.edu>
2010-11-13 10:34:49 -08:00
Guy Harris
a91d20cc84 Convert the IPv6 printer to use netdissect. 2010-11-07 12:50:16 -08:00
Guy Harris
6cd498ec32 Update Gisle Vanem's address. 2010-11-07 11:24:39 -08:00
Guy Harris
c4aa877590 Use the ndo argument to lane_hdr_print(). 2010-11-06 19:53:17 -07:00
Guy Harris
af1f106abf Use ND_PRINT(). 2010-11-06 19:52:48 -07:00
Guy Harris
3141fb4fb7 More correctly and completely describe what -Z does now. 2010-11-06 19:38:32 -07:00
Paul Ferrell
d2c7d4e92b Switch user ID/root directory with -Z before opening savefiles for output.
In addition to Paul's change, I added a comment explaining why we do
this, and explaining that doing so after opening the first savefile
doesn't help with subsequent savefiles, so you'll have to come up with a
better fix if you want the savefiles opened by the original UID or
outside the chroot.

Reviewed-By: Guy Harris <guy@alum.mit.edu>
2010-11-06 19:28:10 -07:00
Michael Richardson
91021f01ab make test cases a bit quieter 2010-10-07 14:47:42 -04:00
Michael Richardson
28b293f330 added support and test case for QinQ packets 2010-10-07 14:47:22 -04:00
Michael Richardson
0cd4e1d659 updated test with extra length printed 2010-10-07 14:44:45 -04:00
Michael Richardson
1cead823ec reworked print-ether to use netdissect 2010-10-07 14:40:50 -04:00
Guy Harris
53412397f6 Mark various IPv4 and IPv6 headers as unaligned.
This prevents GCC on SPARC from generating code that assumes those
structures are aligned naturally, which they are not guaranteed to be.

Move some #defines from interface.h to tcpdump-stdinc.h to make them
available to code that doesn't include interface.h.

Move the declaration of nextproto6_cksum() to ip6.h, so that only files
that use it get it declared, and thus so that you don't need to define
"struct ip6_hdr" in everything that includes interface.h.  Don't include
ip6.h in tcpdump-stdinc.h.
2010-08-31 10:03:47 -07:00
Guy Harris
4be7a37b2c Point users to the pcap-tstamp-type man page for information for -j. 2010-08-23 15:38:56 -07:00
Guy Harris
ce0f1d2e8e Document -j and -J. List -h in the usage message. 2010-08-23 15:30:56 -07:00
Guy Harris
1b15fedd1c Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump 2010-08-23 03:40:53 -07:00
Guy Harris
53d7d1c12b Get rid of another unused win32/Include header. 2010-08-23 03:38:32 -07:00
Guy Harris
d16b45ee86 As with libpcap, get rid of autom4te.cache when doing "make distclean". 2010-08-23 03:36:12 -07:00
Guy Harris
36791a862e Get rid of some more include files we no longer need.
We have our own copies of those include files, which we use; we haven't
used the system versions for a long time, so we don't need to drag them
along for compiling WinDump.
2010-08-23 03:30:54 -07:00
Guy Harris
6c9745e5cb Clean up handling of tftp.h.
Don't include the win32/Include/Arpa copy in print-udp.c; don't put that
copy into the release tarball; and don't talk about <arpa/tftp.h>, or
work around its deficiencies in some OSes, as we no longer include it,
we include our own tftp.h, which has a th_stuff array in its structure
definition.
2010-08-23 03:22:25 -07:00
Guy Harris
53e8e5567d Handle DLT_IEEE802_15_4_NOFCS like DLT_IEEE802_15_4. 2010-08-22 18:00:27 -07:00
Guy Harris
14fff3bc4e Print a -L-like header for -J. 2010-08-22 17:59:00 -07:00
Guy Harris
a20a6126fc Add support for setting the time stamp type for a capture.
Based on a patch from Scott Mcmillan <scott.a.mcmillan@intel.com>.

While we're at it, make some error messages a bit less geeky.
2010-08-22 17:32:26 -07:00
Guy Harris
04f2f280cd Fix credits item for Pawel Worach.
(This is for the "Correctly check for various values of the ICMP type
field." fixes to print-icmp6.c.)
2010-08-22 13:49:00 -07:00
Guy Harris
020b16ec4f Correctly check for various values of the ICMP type field.
clang+llvm warnings pointed out some incorrect code - you can't, in C,
check for multiple values for a variable that way.
2010-08-19 19:23:08 -07:00