]> The Tcpdump Group git mirrors - tcpdump/log
tcpdump
12 years agoAddress Michael's comments.
Wesley Shields [Thu, 6 Sep 2012 18:40:21 +0000 (14:40 -0400)] 
Address Michael's comments.

Be more portable when opening stdin.

Refactor reading from VFile into a function.

12 years agoProperly print when dlt changes.
Wesley Shields [Sat, 11 Aug 2012 18:34:24 +0000 (14:34 -0400)] 
Properly print when dlt changes.

When we open a new file we need to get new printinfo.

12 years agoDLT change detection.
Wesley Shields [Sat, 11 Aug 2012 18:19:31 +0000 (14:19 -0400)] 
DLT change detection.

If when writing an output file, error if the DLT of subsequent files is not
the same as the original.

12 years agoAdd multi-file support.
Wesley Shields [Sat, 11 Aug 2012 01:43:54 +0000 (21:43 -0400)] 
Add multi-file support.

12 years agoMerge remote branch 'github/master'
Michael Richardson [Thu, 12 Jul 2012 17:46:06 +0000 (13:46 -0400)] 
Merge remote branch 'github/master'

12 years agoMerge pull request #20 from infrastation/master
Michael Richardson [Thu, 5 Jul 2012 18:43:21 +0000 (11:43 -0700)] 
Merge pull request #20 from infrastation/master

another Babel update

12 years agoAs we're always printing "LLDP, length XXX", don't do it for the system name.
Guy Harris [Sat, 30 Jun 2012 23:10:40 +0000 (16:10 -0700)] 
As we're always printing "LLDP, length XXX", don't do it for the system name.

12 years agoAdd "radius" as an option for -T.
Guy Harris [Sat, 30 Jun 2012 22:59:18 +0000 (15:59 -0700)] 
Add "radius" as an option for -T.

This allows tcpdump to handle RADIUS running on non-standard ports.

Submitted-By: [email protected]
Man page also updated by me.

12 years agoNote that we now document "-T carp".
Guy Harris [Sat, 30 Jun 2012 22:51:04 +0000 (15:51 -0700)] 
Note that we now document "-T carp".

12 years agoDocument "-T carp".
Guy Harris [Sat, 30 Jun 2012 22:50:11 +0000 (15:50 -0700)] 
Document "-T carp".

12 years agoUpdate for changes in the 4.3 branch.
Guy Harris [Sat, 30 Jun 2012 19:46:15 +0000 (12:46 -0700)] 
Update for changes in the 4.3 branch.

12 years agoLLDP: print packet protocol at all verbosity levels
Romain Francoise [Sat, 30 Jun 2012 19:42:41 +0000 (12:42 -0700)] 
LLDP: print packet protocol at all verbosity levels

The LLDP printer doesn't show the packet protocol unless -v is used,
which results in pretty useless output lines where only the timestamp is
present. Make sure we include the default protocol+length output even in
default mode.

12 years agoupdate Babel decoder for DLen in HD TLV
Denis Ovsienko [Fri, 29 Jun 2012 18:27:16 +0000 (22:27 +0400)] 
update Babel decoder for DLen in HD TLV

This change reflects a new Digest Length field added to Hash Digest TLV
in the current draft of Babel authentication spec. babel_print_v2() is
updated to fetch and validate the new field. Test files too.

12 years agoMerge pull request #18 from infrastation/master
Michael Richardson [Tue, 26 Jun 2012 21:48:03 +0000 (14:48 -0700)] 
Merge pull request #18 from infrastation/master

fix printing of infinite lifetime in ICMPv6

12 years agofix printing of infinite lifetime in ICMPv6
Denis Ovsienko [Thu, 21 Jun 2012 13:14:55 +0000 (17:14 +0400)] 
fix printing of infinite lifetime in ICMPv6

icmp6_opt_print() in the case of ND_OPT_PREFIX_INFORMATION always
appended "s" (seconds) to the returned string result of get_lifetime(),
which could be either a printed number or the "infinite" word. This
change leaves it up to get_lifetime() to decide if "s" is necessary.
This also improves the ND_OPT_ROUTE_INFO case, where route information
lifetime has the same type and semantics.

12 years agoMerge pull request #17 from infrastation/master
Michael Richardson [Thu, 14 Jun 2012 19:22:50 +0000 (12:22 -0700)] 
Merge pull request #17 from infrastation/master

RIPv1/v2 updates

12 years agofix Babel type 11 TLV length check
Denis Ovsienko [Wed, 13 Jun 2012 09:06:32 +0000 (13:06 +0400)] 
fix Babel type 11 TLV length check

RFC6126 4.3. TLV Format: "If the body is longer than the expected length
of a given type of TLV, any extra data MUST be silently ignored."

12 years agodecode RIPv2 authentication up to RFC4822
Denis Ovsienko [Mon, 11 Jun 2012 17:06:00 +0000 (21:06 +0400)] 
decode RIPv2 authentication up to RFC4822

This change addresses a few issues in rip_entry_print_v2() and
rip_print():

1. In the case of Simple Password (RFC2453) authentication the last
(16th) character of a password was never printed. Other password
characters were printed regardless of existing isprint() test.

2. In the case of Cryptographic (RFC4822) authentication there were no
details available for fixed-size auth header and variable-size auth
trailer.

3. Depending on particular hash function used, a normal authentication
trailer "RTE" may be 20 or more bytes long. Iteration over packet RTEs
should stop once a trailer is decoded. Exact number of RTEs in a message
cannot be told from message size any more.

Test cases are added for Request and Response messages with Simple
Password, Keyed-MD5, HMAC-SHA-1, HMAC-SHA-256, HMAC-SHA-384 and
HMAC-SHA-512 authentication modes. Earlier test case is updated to match
new "number of routes" output format.

12 years agofix RIP Request/full table decoding issues
Denis Ovsienko [Mon, 11 Jun 2012 17:01:34 +0000 (21:01 +0400)] 
fix RIP Request/full table decoding issues

RIP Request and Response messages have the same structure. Update a
switch block in rip_print() to proceed with decoding of both.

A Request message may contain an AFI 0 RTE standing for a full table
request, normally sent on a router start. Update rip_entry_print_v1()
and rip_entry_print_v2() to treat IPv4 and AFI 0 as two valid,
distinguishable cases.

12 years agoNo declarations in the middle of a block - not all C compilers support that.
Guy Harris [Sun, 10 Jun 2012 20:31:14 +0000 (13:31 -0700)] 
No declarations in the middle of a block - not all C compilers support that.

12 years agoFix "no IPv6" code path.
Guy Harris [Sat, 9 Jun 2012 19:16:41 +0000 (12:16 -0700)] 
Fix "no IPv6" code path.

12 years agoGet rid of unused (but set) variable.
Guy Harris [Sat, 9 Jun 2012 02:15:28 +0000 (19:15 -0700)] 
Get rid of unused (but set) variable.

12 years agoCheck the return value of some print routines.
Guy Harris [Sat, 9 Jun 2012 02:14:06 +0000 (19:14 -0700)] 
Check the return value of some print routines.

Some routines return -1 on error; bail and return -1 if they do.

12 years agoAdd some attribute/TLV length checks.
Guy Harris [Sat, 9 Jun 2012 02:07:20 +0000 (19:07 -0700)] 
Add some attribute/TLV length checks.

Make sure we don't run past the end of a BGP attribute or LDP TLV when
dissecting the attribute/TLV.

Make some of the code do a bit more of a "step the pointer through the
data"-style dissection; that was done while debugging the changes in
question.  It also fixes up some code to not check for more data than
should actually be there.

Update references to RFC 4906 from the draft, and note that RFC 4447
replaces it.

12 years ago0x%02d is silly - 0x means "hex", so it should be 0x%02x.
Guy Harris [Fri, 8 Jun 2012 17:14:14 +0000 (10:14 -0700)] 
0x%02d is silly - 0x means "hex", so it should be 0x%02x.

Found by Xavier Heiny.

12 years ago"lmp.new" isn't a checked-in file; don't make it part of the distribution.
Guy Harris [Fri, 8 Jun 2012 07:41:09 +0000 (00:41 -0700)] 
"lmp.new" isn't a checked-in file; don't make it part of the distribution.

12 years agoFix an error and a warning.
Guy Harris [Fri, 8 Jun 2012 05:24:04 +0000 (22:24 -0700)] 
Fix an error and a warning.

Use a separate variable to index through the hash digest, not the
variable used to index through the packet.

Make some variables holding one-byte quantities u_int rather than u_char
while we're at it - not much use in *requiring* them to fit into 8 bits
(the code might be better if we don't, and that eliminates a warning).

12 years agoFix some errors.
Guy Harris [Fri, 8 Jun 2012 05:18:25 +0000 (22:18 -0700)] 
Fix some errors.

isis_print_mcid() returns no value and nobody expects it to; declare it
void, not int.

Fix a typo in a case statement ("defualt" rather than "default").

Fix indentation.

12 years agoFix printing of 64-bit quantities.
Guy Harris [Fri, 8 Jun 2012 05:12:28 +0000 (22:12 -0700)] 
Fix printing of 64-bit quantities.

Do *NOT* assume that "%l[doxu]x" - or "%ll[doxu]" - is the way to print
a 64-bit quantity; on UN*X, it might be a "long" or a "long long",
depending on whether you're on a 32-bit or 64-bit platform and, on
Windows with MSVC++, it's not a long (even in 64-bit mode) and doesn't
use "%ll[doxu]", either.  Instead, use PRI[doxu]64; that's what C99
defines, and what we define ourselves if the C environment doesn't
define it.

12 years agoMerge pull request #16 from infrastation/master
Michael Richardson [Thu, 7 Jun 2012 13:32:57 +0000 (06:32 -0700)] 
Merge pull request #16 from infrastation/master

add decoding of Babel authentication TLVs

12 years agoadd decoding of Babel authentication TLVs
Denis Ovsienko [Wed, 6 Jun 2012 13:57:20 +0000 (17:57 +0400)] 
add decoding of Babel authentication TLVs

This change extends existing Babel protocol decoder to recognise
experimental authentication TLVs (types 11 and 12) and includes
a respective test case for the new code.

12 years agoMerge pull request #15 from ajithadapa/master
Michael Richardson [Tue, 5 Jun 2012 13:39:39 +0000 (06:39 -0700)] 
Merge pull request #15 from ajithadapa/master

Added spb.out and spb.pcap

12 years agoAdding the test files for SPB
Ajith Adapa [Tue, 5 Jun 2012 06:33:01 +0000 (12:03 +0530)] 
Adding the test files for SPB

12 years agoMerge pull request #14 from ajithadapa/master
Michael Richardson [Mon, 4 Jun 2012 17:12:12 +0000 (10:12 -0700)] 
Merge pull request #14 from ajithadapa/master

Support for SPB related SUB-TLVs

12 years agoAdded test files for spb.
Ajith Adapa [Mon, 4 Jun 2012 03:55:13 +0000 (09:25 +0530)] 
Added test files for spb.

12 years agospelling fixes
Romain Francoise [Mon, 28 May 2012 18:33:07 +0000 (14:33 -0400)] 
spelling fixes

12 years agoMerge pull request #12 from msekletar/master
Michael Richardson [Mon, 28 May 2012 13:38:11 +0000 (06:38 -0700)] 
Merge pull request #12 from msekletar/master

Dropping root privileges

12 years agoDropping root priviledges using Linux Capabilities
Michal Sekletar [Fri, 25 May 2012 14:26:17 +0000 (16:26 +0200)] 
Dropping root priviledges using Linux Capabilities

12 years agoAdded support for SPBM Service Identifier and Unicast Address subtlv
Ajith Adapa [Tue, 22 May 2012 13:53:06 +0000 (19:23 +0530)] 
Added support for SPBM Service Identifier and Unicast Address subtlv

12 years agoAdded support for SPB
Ajith Adapa [Tue, 22 May 2012 12:27:33 +0000 (17:57 +0530)] 
Added support for SPB

13 years agoMerge remote-tracking branch 'infrastation/master'
Michael Richardson [Thu, 3 May 2012 17:41:09 +0000 (13:41 -0400)] 
Merge remote-tracking branch 'infrastation/master'

13 years agoMerge pull request #11 from yekm/master
Michael Richardson [Thu, 3 May 2012 14:18:52 +0000 (07:18 -0700)] 
Merge pull request #11 from yekm/master

Minor manpage change

13 years agominor manpage fix
yekm [Mon, 16 Apr 2012 11:24:47 +0000 (15:24 +0400)] 
minor manpage fix

13 years agoadd DNSSL (RFC6106) support
Denis Ovsienko [Fri, 13 Apr 2012 12:32:40 +0000 (16:32 +0400)] 
add DNSSL (RFC6106) support

The most notable difference between RFC5006 and RFC6106 is the addition
of DNSSL RA option. This commit adds DNSSL handling code to make tcpdump
fully RFC6106-aware. This code has been tested against RA packets
generated by Quagga and radvd.

13 years agoadded missing test files to releasetar
Michael Richardson [Sun, 8 Apr 2012 01:18:44 +0000 (21:18 -0400)] 
added missing test files to releasetar

13 years agodo not ship bittypes.h
Michael Richardson [Sun, 8 Apr 2012 00:47:44 +0000 (20:47 -0400)] 
do not ship bittypes.h

13 years agodo not convert protocol to names if -n flag
Michael Richardson [Sun, 8 Apr 2012 00:32:04 +0000 (20:32 -0400)] 
do not convert protocol to names if -n flag

13 years agominor whitespace changes
Michael Richardson [Sun, 8 Apr 2012 00:31:47 +0000 (20:31 -0400)] 
minor whitespace changes

13 years agoupdated platforms
Michael Richardson [Sun, 8 Apr 2012 00:28:19 +0000 (20:28 -0400)] 
updated platforms

13 years agoVERSION updated back to GIT
Michael Richardson [Thu, 5 Apr 2012 14:11:33 +0000 (10:11 -0400)] 
VERSION updated back to GIT

13 years agoupdated test case outputs
Michael Richardson [Tue, 3 Apr 2012 19:57:13 +0000 (15:57 -0400)] 
updated test case outputs

13 years agoprep for 4.3.0 release
Michael Richardson [Tue, 3 Apr 2012 17:28:00 +0000 (13:28 -0400)] 
prep for 4.3.0 release

13 years agofixes from Jamal Hadi Salim <[email protected]> for forces: SPARSE data (per RFC...
Michael Richardson [Thu, 29 Mar 2012 14:08:35 +0000 (16:08 +0200)] 
fixes from Jamal Hadi Salim <[email protected]> for forces: SPARSE data (per RFC 5810)

13 years agowhitespace changes in print-ip.c
Michael Richardson [Thu, 29 Mar 2012 14:05:15 +0000 (16:05 +0200)] 
whitespace changes in print-ip.c

13 years agoadded icmpv6 test case
Michael Richardson [Thu, 29 Mar 2012 14:04:51 +0000 (16:04 +0200)] 
added icmpv6 test case

13 years agoerror in passed calculation
Michael Richardson [Thu, 29 Mar 2012 14:04:02 +0000 (16:04 +0200)] 
error in passed calculation

13 years agoGive more information on -l, and note that -U works without -w.
Guy Harris [Sat, 10 Mar 2012 23:23:50 +0000 (15:23 -0800)] 
Give more information on -l, and note that -U works without -w.

Note that -l, on Windows (i.e., in WinDump), is unbuffered, not
line-buffered, and describe -U as an alternative (that doesn't have that
problem on Windows).

Note that -U does packet-buffering without -w.

Fix up the formatting of the example command lines with -l.

13 years agoDiscuss buffering when describing the -w flag.
Guy Harris [Sat, 10 Mar 2012 22:57:00 +0000 (14:57 -0800)] 
Discuss buffering when describing the -w flag.

Mention that the output of tcpdump -w is buffered, and note that this
means packets won't necessarily show up in the output as soon as they're
received, so programs reading that output won't see them immediately,
and note that the -U flag forces "packet buffering" so that a reader
will see the packets as soon as they're received.

13 years agoFix the other typo, so setting CPPFLAGS in the environment works correctly.
Guy Harris [Mon, 5 Mar 2012 16:12:32 +0000 (08:12 -0800)] 
Fix the other typo, so setting CPPFLAGS in the environment works correctly.

Based-On-Patch-From: Simon Ruderich <[email protected]>

13 years agoAsk for the libpcap Makefile while we're at it.
Guy Harris [Sun, 4 Mar 2012 00:10:42 +0000 (16:10 -0800)] 
Ask for the libpcap Makefile while we're at it.

...so that we can see what's being used to turn grammar.y into
grammar.c.

While we're at it, say "config.log file from the libpcap source
directory", in the hopes of making it more likely that we'll get it in
addition to the tcpdump config.log.

13 years agoFix typo, so setting CPPFLAGS in the environment works correctly.
Guy Harris [Sat, 3 Mar 2012 21:36:17 +0000 (13:36 -0800)] 
Fix typo, so setting CPPFLAGS in the environment works correctly.

Based-On-Patch-From: Simon Ruderich <[email protected]>

13 years agoAsk for more information if we don't find pcap_loop.
Guy Harris [Sat, 3 Mar 2012 21:32:11 +0000 (13:32 -0800)] 
Ask for more information if we don't find pcap_loop.

I give up.

People keep reporting that the configure process for tcpdump fails to
find pcap_loop, and the config.log file they send us says there's no
pcap_parse in libpcap, which suggests that something went wrong in the
build process for libpcap; perhaps they don't have Bison and the
configure script got confused and failed to cause the parser to be named
"pcap_parse", or something such as that, or perhaps Bison was recently
"improved" in a fashion that breaks that, but I've never been able to
reproduce this on any of the Linux distribution installations to which
*I* have access.

I therefore ask them to send the config.log output and make output for
libpcap; *not one of the reporters of this problem* has bothered to send
that information, so we're stuck.  Perhaps they don't care enough (in
which case, why did they bother asking us about it?), or perhaps they're
annoyed that we asked them a further question rather than Just Fixing
The Problem(TM) (in which case, all I have to say is "welcome to the
Wonderful World Of Computer Software(TM) - get used to it").

So let's just ask for all that information.  (I would not be surprised
if this doesn't suffice and that they *still* just send us the tcpdump
config.log output, but at least I'll be able to tell them that they
should have Read The Fine Error Message(TM).)

13 years agoFix printing of BGP optional headers.
Guy Harris [Sat, 3 Mar 2012 01:30:32 +0000 (17:30 -0800)] 
Fix printing of BGP optional headers.

Anonymously contributed patch; tested with Cisco and Arista routers by
the patch contributor.

13 years agoBack out DLT_PFSYNC support.
Guy Harris [Thu, 1 Mar 2012 05:14:50 +0000 (21:14 -0800)] 
Back out DLT_PFSYNC support.

Unfortunately, the DLT_PFSYNC support depends on header files included
from the pfctl command's source tree, and trying to arrange to find that
would be too much trouble.

13 years agoAdd DLT_PFSYNC support.
Guy Harris [Wed, 29 Feb 2012 09:51:27 +0000 (01:51 -0800)] 
Add DLT_PFSYNC support.

From FreeBSD PR bin/124825: tcpdump(8) does not support pfsync(4) data,
which in turn was ported over from OpenBSD.  We already have CARP
support, so we did not port that part over.

13 years agoPut the addresses early in the message format, and handle short messages.
Guy Harris [Wed, 29 Feb 2012 09:09:40 +0000 (01:09 -0800)] 
Put the addresses early in the message format, and handle short messages.

Putting the addresses after "TIPC vX.Y" matches other protocols, such as
IPv4/IPv6.

Not all messages have full headers.

Also, constify some parameters and variables.

13 years agoPrint only one line in non-verbose mode.
Guy Harris [Wed, 29 Feb 2012 05:12:26 +0000 (21:12 -0800)] 
Print only one line in non-verbose mode.

Also, don't print extra blank lines in verbose mode.

13 years agoTIPC support.
ABHIMANYU [Wed, 29 Feb 2012 04:36:55 +0000 (20:36 -0800)] 
TIPC support.

Reviewed-and-much-modified-by: Guy Harris <[email protected]>
13 years agoPrint a space after the options if there are any options.
Guy Harris [Tue, 28 Feb 2012 23:45:48 +0000 (15:45 -0800)] 
Print a space after the options if there are any options.

13 years agoGet rid of extra blank after unknown options.
Matthew Luckie [Tue, 28 Feb 2012 23:41:12 +0000 (15:41 -0800)] 
Get rid of extra blank after unknown options.

Reviewed-By: Guy Harris <[email protected]>
13 years agoUse expr instead of bashisms.
Dagobert Michelsen [Tue, 28 Feb 2012 23:31:38 +0000 (15:31 -0800)] 
Use expr instead of bashisms.

Reviewed-By: Guy Harris <[email protected]>
13 years agoMerge remote branch 'github/master'
Michael Richardson [Fri, 24 Feb 2012 01:15:15 +0000 (20:15 -0500)] 
Merge remote branch 'github/master'

13 years agoMerge pull request #7 from clifffrey/fix-lldp-network-policy
Michael Richardson [Fri, 24 Feb 2012 01:14:29 +0000 (17:14 -0800)] 
Merge pull request #7 from clifffrey/fix-lldp-network-policy

Fix LLDP Network Policy bit definitions.

13 years agoMerge pull request #6 from fenner/master
Michael Richardson [Fri, 24 Feb 2012 01:13:35 +0000 (17:13 -0800)] 
Merge pull request #6 from fenner/master

IGMPv3 Max Response Time is in units of 0.1 second.

13 years agoMerge pull request #5 from kmaehashi/feature-SIGUSR1
Michael Richardson [Fri, 24 Feb 2012 01:12:26 +0000 (17:12 -0800)] 
Merge pull request #5 from kmaehashi/feature-SIGUSR1

Use SIGUSR1 to request info when SIGINFO is not defined

13 years agoadded test packet for icmpv6 advertisement interval fix
Michael Richardson [Fri, 24 Feb 2012 01:11:32 +0000 (20:11 -0500)] 
added test packet for icmpv6 advertisement interval fix

13 years agoFix LLDP Network Policy bit definitions.
Cliff Frey [Thu, 23 Feb 2012 19:19:48 +0000 (11:19 -0800)] 
Fix LLDP Network Policy bit definitions.

13 years agoPrevious commit accidentally used 6 seconds cutoff.
Bill Fenner [Mon, 13 Feb 2012 16:32:14 +0000 (08:32 -0800)] 
Previous commit accidentally used 6 seconds cutoff.

60 seconds == 600 in units of 0.1, oops.

13 years agoIGMPv3's Max Response Time is in units of 0.1 second.
Bill Fenner [Mon, 13 Feb 2012 16:27:08 +0000 (08:27 -0800)] 
IGMPv3's Max Response Time is in units of 0.1 second.

If it's less than 60 seconds, print it as %.1fs, to be able to
accurately represent small values including the tenths-of-a-second.
Only use relts_print() when it is 60 seconds or more.

13 years agotcpdump now accepts SIGUSR1 as a signal to print the statistics on systems that does...
Kenichi Maehashi [Tue, 7 Feb 2012 13:16:19 +0000 (22:16 +0900)] 
tcpdump now accepts SIGUSR1 as a signal to print the statistics on systems that does not support SIGINFO

13 years agoMerge remote branch 'github/master'
Michael Richardson [Mon, 23 Jan 2012 19:10:51 +0000 (14:10 -0500)] 
Merge remote branch 'github/master'

13 years agoMerge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump
Michael Richardson [Mon, 23 Jan 2012 19:10:40 +0000 (14:10 -0500)] 
Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

13 years agopermit -n flag to affect print-ip for protocol numbers
Michael Richardson [Mon, 23 Jan 2012 19:10:16 +0000 (14:10 -0500)] 
permit -n flag to affect print-ip for protocol numbers

13 years agoMerge pull request #4 from infrastation/master
Michael Richardson [Mon, 23 Jan 2012 19:02:41 +0000 (11:02 -0800)] 
Merge pull request #4 from infrastation/master

ND_OPT_ADVINTERVAL is in milliseconds, not seconds

13 years agoND_OPT_ADVINTERVAL is in milliseconds, not seconds
Denis Ovsienko [Thu, 29 Dec 2011 16:46:02 +0000 (20:46 +0400)] 
ND_OPT_ADVINTERVAL is in milliseconds, not seconds

RFC 6275 7.3. New Advertisement Interval Option Format

   Advertisement Interval

      32-bit unsigned integer.  The maximum time, in milliseconds,
      between successive unsolicited Router Advertisement messages sent
      by this router on this network interface.

13 years agoNote the length checks in the Babel printer.
Guy Harris [Mon, 19 Dec 2011 00:06:05 +0000 (16:06 -0800)] 
Note the length checks in the Babel printer.

13 years agoAdd length checks, use EXTRACT_16BITS().
Guy Harris [Mon, 19 Dec 2011 00:05:05 +0000 (16:05 -0800)] 
Add length checks, use EXTRACT_16BITS().

Use EXTRACT_16BITS() rather than a hand-rolled macro to extract
big-endian 16-bit quantities from the packet.

When processing the message, check against the body length *and* the UDP
payload length, as well as against the raw frame length.

13 years agoAdd the new PPPoE test files.
Guy Harris [Sat, 17 Dec 2011 19:41:33 +0000 (11:41 -0800)] 
Add the new PPPoE test files.

13 years agoMerge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump
Guy Harris [Sat, 17 Dec 2011 19:38:33 +0000 (11:38 -0800)] 
Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

13 years agoMerge pull request #3 from bodgit/master
Michael Richardson [Mon, 12 Dec 2011 13:44:40 +0000 (05:44 -0800)] 
Merge pull request #3 from bodgit/master

Test case for PPPoE & RFC 4638 Payload Tag

13 years agoAdd simple PPPoE test case
Matt Dainty [Sun, 11 Dec 2011 01:57:56 +0000 (01:57 +0000)] 
Add simple PPPoE test case

13 years agoAdd changes in 4.2.1.
Guy Harris [Sat, 10 Dec 2011 01:31:08 +0000 (17:31 -0800)] 
Add changes in 4.2.1.

13 years agoMerge remote branch 'github/master'
Michael Richardson [Sat, 10 Dec 2011 01:04:11 +0000 (20:04 -0500)] 
Merge remote branch 'github/master'

13 years agoMerge pull request #2 from bodgit/master
Michael Richardson [Sat, 10 Dec 2011 01:01:15 +0000 (17:01 -0800)] 
Merge pull request #2 from bodgit/master

Teach PPPoE parser about RFC 4638

13 years agoTeach PPPoE parser about RFC 4638
Matt Dainty [Fri, 9 Dec 2011 20:46:27 +0000 (20:46 +0000)] 
Teach PPPoE parser about RFC 4638

13 years agoFix a typo (from the Red Hat tcpdump package) and use .LP.
Guy Harris [Fri, 9 Dec 2011 09:35:55 +0000 (01:35 -0800)] 
Fix a typo (from the Red Hat tcpdump package) and use .LP.

13 years agoGet rid of an unused variable.
Guy Harris [Fri, 9 Dec 2011 07:06:00 +0000 (23:06 -0800)] 
Get rid of an unused variable.

13 years agoFix a bunch of "sizeof(sizeof(XXX))".
Sascha Wildner [Wed, 7 Dec 2011 18:42:12 +0000 (10:42 -0800)] 
Fix a bunch of "sizeof(sizeof(XXX))".

In some places, there was one too many levels of sizeof() -
sizeof(sizeof(XXX)) is sizeof(size_t), but we wanted the size of type
XXX.

Reviewed-By: Guy Harris <[email protected]>
13 years agoAdd a CARP dissector and a command-line option to dissect proto 112 as CARP.
George Neville-Neil [Wed, 23 Nov 2011 19:53:13 +0000 (11:53 -0800)] 
Add a CARP dissector and a command-line option to dissect proto 112 as CARP.

CARP and VRRP both use IP protocol number 112, so there needs to be a -T
flag to specify that protocol 112 be dissected as CARP rather than VRRP.

Also update the man page.

13 years agoRedo length checks in ospf6_print_lsa().
Guy Harris [Fri, 14 Oct 2011 04:59:57 +0000 (21:59 -0700)] 
Redo length checks in ospf6_print_lsa().

Check to make sure we haven't run past the end of the LSA by doing
length checks - and be a bit fussier about length checks.  Do more
end-of-packet checks as well.