Commit Graph

2747 Commits

Author SHA1 Message Date
Michael Richardson
dbe12c41ed Merge pull request #5 from kmaehashi/feature-SIGUSR1
Use SIGUSR1 to request info when SIGINFO is not defined
2012-02-23 17:12:26 -08:00
Kenichi Maehashi
4442071079 tcpdump now accepts SIGUSR1 as a signal to print the statistics on systems that does not support SIGINFO 2012-02-07 22:16:19 +09:00
Michael Richardson
8b82b3557c Merge remote branch 'github/master' 2012-01-23 14:10:51 -05:00
Michael Richardson
57b20fbcc9 Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump 2012-01-23 14:10:40 -05:00
Michael Richardson
1118847da5 permit -n flag to affect print-ip for protocol numbers 2012-01-23 14:10:16 -05:00
Michael Richardson
a4a13734bb Merge pull request #4 from infrastation/master
ND_OPT_ADVINTERVAL is in milliseconds, not seconds
2012-01-23 11:02:41 -08:00
Denis Ovsienko
91045106fb 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.
2011-12-29 20:46:02 +04:00
Guy Harris
f062d715cd Note the length checks in the Babel printer. 2011-12-18 16:06:05 -08:00
Guy Harris
938becee00 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.
2011-12-18 16:05:05 -08:00
Guy Harris
a52a62784f Add the new PPPoE test files. 2011-12-17 11:41:33 -08:00
Guy Harris
4b285eac06 Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump 2011-12-17 11:38:33 -08:00
Michael Richardson
ac2a34f19c Merge pull request #3 from bodgit/master
Test case for PPPoE & RFC 4638 Payload Tag
2011-12-12 05:44:40 -08:00
Matt Dainty
d57e91f0fd Add simple PPPoE test case 2011-12-11 01:57:56 +00:00
Guy Harris
309ca62193 Add changes in 4.2.1. 2011-12-09 17:31:40 -08:00
Michael Richardson
104160e0b5 Merge remote branch 'github/master' 2011-12-09 20:04:11 -05:00
Michael Richardson
13028060e2 Merge pull request #2 from bodgit/master
Teach PPPoE parser about RFC 4638
2011-12-09 17:01:15 -08:00
Matt Dainty
ebdb1b1d30 Teach PPPoE parser about RFC 4638 2011-12-09 20:46:27 +00:00
Guy Harris
dde70ef8a6 Fix a typo (from the Red Hat tcpdump package) and use .LP. 2011-12-09 01:35:55 -08:00
Guy Harris
d6bb95e4f0 Get rid of an unused variable. 2011-12-08 23:06:00 -08:00
Sascha Wildner
684955d586 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 <guy@alum.mit.edu>
2011-12-07 10:42:12 -08:00
George Neville-Neil
5d52dbf4c7 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.
2011-11-23 11:53:13 -08:00
Guy Harris
36b75f7121 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.
2011-10-13 21:59:57 -07:00
Guy Harris
8b19304818 Constify some arguments. 2011-10-13 21:49:18 -07:00
Michal Sekletar
e26785e530 Put in missing break.
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2011-10-13 20:13:03 -07:00
Michal Sekletar
8dfb278a95 Remove unnecessary test.
Also, from me: add a comment explaining why the test isn't being done.

Reviewed-by: Guy Harris <guy@alum.mit.edu>
2011-10-13 20:10:11 -07:00
Guy Harris
f944e1e39d Clean up option-walking code.
Loop as long as the remaining option list length is not zero, even if
that means we try to process the remaining options if the remaining
length is 1, so that if the option length is bogus, we'll report it.

Check for a valid ESIS_OPTION_ES_CONF_TIME length - it's supposed to be
2.
2011-10-13 20:03:29 -07:00
zilog80a
026147c336 Fix test output - IP protocol 72 is in /etc/services on at least some UN*Xes.
Reviewed-By: Guy Harris <guy@alum.mit.edu>
2011-10-13 19:44:07 -07:00
Guy Harris
e40ffdfca7 Change name of Hilscher link types to say NETANALYER.
That makes the names a bit shorter, and mentions the specific Hilscher
product to which they apply.
2011-09-15 17:39:56 -07:00
Guy Harris
9c7d7c8a5c Add printers for the Hilscher Ethernet link-layer types. 2011-09-15 12:56:17 -07:00
Michael Richardson
8b6ba58727 Merge pull request #1 from jhsmt/master
restore some test cases for forces
2011-09-13 07:18:40 -07:00
Guy Harris
9daf436721 Handle systems with getrpcbynumber() but no header file for it.
Glibc 2.14 doesn't install the ONC RPC headers, but it installs the ONC
RPC routines, presumably for binary compatibility.  Don't use
getrpcbynumber() unless we have it *and* the header file to declare it.
2011-09-02 21:31:09 -07:00
Michael Richardson
894e8113f0 Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump
Conflicts:
	Makefile.in
2011-08-27 16:56:50 -04:00
Juliusz Chroboczek
2e2e33875f For Babel, recognise both UDP/6696 and UDP/6697.
IANA has reallocated the Babel port; it is now 6696.  This patch makes
tcpdump recognise both the old and the new Babel ports.
2011-08-27 16:55:32 -04:00
Michael Richardson
79bb56d318 remove deleted files from list of distributed files 2011-08-27 16:55:17 -04:00
Michael Richardson
e933eb54cd removed unnecessary file 2011-08-27 16:54:26 -04:00
Guy Harris
d2d1265a55 Get rid of another zero-length array. 2011-08-14 17:28:02 -07:00
Guy Harris
79f94f4c12 Don't compile print-babel.c if we don't have IPv6 support. 2011-08-14 16:26:32 -07:00
Guy Harris
c573fa52b8 Get rid of GCCisms.
Not all C compilers support anonymous unions in structures, zero-length
array members of structures, or __attribute__.
2011-08-14 15:42:31 -07:00
Guy Harris
2c3f157c85 Don't assume we have IPv6 support. 2011-08-14 15:32:06 -07:00
Guy Harris
961e28032f Declare all local variables before any executable statements.
Some C compilers let you get away with that C++-ism; not all do.
2011-08-14 15:29:49 -07:00
Romain Francoise
2e0ba2d689 Make sure ppi.h is in the release tarball.
Reviewed-By: Guy Harris <guy@alum.mit.edu>
2011-08-14 14:43:23 -07:00
Jamal Hadi Salim
d3d17f3d06 Restore forces3 pcap and associated output
Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com>
2011-07-26 13:28:06 -04:00
Jamal Hadi Salim
38efca1a71 Restore forces2 pcap and associated output
Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com>
2011-07-26 13:26:31 -04:00
Guy Harris
73e7c4e003 Update the EXTRA_DIST list to reflect what's now in the tests directory. 2011-07-26 10:24:31 -07:00
Michael Richardson
6b9177b5fb Changes for 4.2 of tcpdump 2011-07-24 20:15:39 -04:00
Jamal Hadi Salim
95e85c82a5 Fwd: pcap files
On Tue, Jun 28, 2011 at 3:52 PM, Michael Richardson <mcr@sandelman.ca> wrote:

> I'm not aware of a new file.

The email i responded to had 4 attachments sent by Evangelos.
Those were supposed to replace the files with those exact names.

> Please send github tree, ideally.

You mentioned github to me last time and offered to get me to
learn it in 5 minutes;->  I havent had time and the old school stuff i do
still works.
How about i send you patch #1 to delete the old files (as attached)
and another to re-add with new ones.
Alternatively: I could send one that overrides the existing ones.

cheers,
jamal
> --
> ]       He who is tired of Weird Al is tired of life!           |  firewalls  [
> ]   Michael Richardson, Sandelman Software Works, Ottawa, ON    |net architect[
> ] mcr@sandelman.ottawa.on.ca http://www.sandelman.ottawa.on.ca/ |device driver[
>   Kyoto Plus: watch the video <http://www.youtube.com/watch?v=kzx1ycLXQSE>
>                       then sign the petition.
>

commit d93443f24bfb5fd982ff33deb66979bae811db57
Author: Jamal Hadi Salim <jhs@mojatatu.com>
Date:   Tue Jun 28 16:15:49 2011 -0400

    [PATCH] Remove test files using old ForCES ports

    Signed-off-by: Jamal Hadi Salim <hadi@mojatatu.com>
2011-07-03 16:22:00 -04:00
Michael Richardson
021e25ed81 ignore more cruft 2011-07-03 16:14:31 -04:00
Michael Richardson
e7b58ef90b removed unneeded pcap file 2011-07-03 16:14:19 -04:00
Guy Harris
2c0a8eb4eb Note that ndo_error doesn't, and *ndo_error shouldn't, return.
Tcpdump's ndo_error() doesn't return.  Any other ndo_error routine
supplied to netdissect shouldn't, either, as printers expect it not to.
2011-06-24 18:24:11 -07:00
Guy Harris
4cc892cbff Use "-H", not "-h", for the 802.11s option, and improve error reporting.
I was rudely surprised to find that "tcpdump -h" wasn't printing a usage
message, and I'm the person who *added* the "-h" option.  Make it "-H",
and add an explicit "-h" option to print a usage message, so nobody else
makes the same mistake.  Also, don't clear opterr, so that if you give
an illegal command-line option, you get an explanatory error message.
2011-06-21 18:15:50 -07:00