Commit Graph

2747 Commits

Author SHA1 Message Date
Guy Harris
f05ce9e300 Add the contributors of the recent man page changes to the credits.
(And sort the credits by first name while we're at it.)
2010-06-05 00:38:19 -07:00
Romain Francoise
768c379e64 If -U is specified, flush the file after creating it, so it's not zero-length.
Reading from a capture file that has not yet received any packets fails
with "truncated dump file"; to avoid this, flush the file (forcing the
pcap header out) immediately after opening it.

(Added Romain to the credits.)

Reviewed-By: Guy Harris <guy@alum.mit.edu>
2010-06-05 00:37:27 -07:00
Romain Francoise
156d01c798 Merge back changes from the Debian package:
- fix TCP flags output description, by Christophe Rhodes <csr21@cantab.net>
  Original patch submitted in http://bugs.debian.org/575724
- two remaining typo fixes, by A Costa <agcosta@gis.net>
  Original patch submitted in http://bugs.debian.org/342310

Reviewed-By: Guy Harris <guy@alum.mit.edu>
2010-06-04 20:10:07 -07:00
Steve-o
86a1f52825 Add ACK decoding and add PGMCC DATA and FEEDBACK options.
Reviewed-By: Guy Harris <guy@alum.mit.edu>
2010-05-29 18:50:37 -07:00
Guy Harris
f5f7f4a343 Handle the reserved value for the addressing modes.
Report an error if the source or destination addressing mode has the
reserved value.  Also, squelch a warning.
2010-05-28 18:19:36 -07:00
Guy Harris
fe209f3b17 Add a -h flag, and only attempt to recognize 802.11s mesh headers if it's set.
I give up.  I have no access to the 802.11s drafts, I can't find
anything that suggests whether a heuristic check for an 802.11s header
should check for To DS and From DS both being set or either being set or
unset, or whether it should check for a QoS frame type (the examples in
all the documentation I can find have To DS and From DS set, and have a
QoS field, in the 802.11 header, but that might just be an example
802.11 header showing all the fields), so I'm just adding a -h
command-line flag; you need to specify it to get tcpdump to try to guess
whether a frame has a mesh header or not.  I'll leave it up to somebody
else to figure out what the best heuristic for detecting the presence of
mesh headers is (note that tcpdump and Wireshark have different
heuristics, both of which can probably get false positives, especially
with encrypted frames where the first payload byte just *happens* not to
have any of the reserved bits in the mesh header flags set).
2010-05-27 23:58:01 -07:00
Guy Harris
d6c865b144 Fix check for malformed frames.
Don't get confused by some malformed frames - always return -1 - and
assign the result of extract_header_length() to an int, so we don't get
warnings when we compare it against -1.  (Its return value always fits
in an int.)
2010-05-18 19:25:18 -07:00
Michael Richardson
04347dbebf Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump 2010-05-13 14:31:05 -04:00
Michael Richardson
1ace87d57b moved ieee802.15.4 to NDO system 2010-05-13 14:30:59 -04:00
Michael Richardson
896b5de8fc give credit to Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 2010-05-13 14:23:17 -04:00
Michael Richardson
3c4027f599 Merge commit 'lumag/master' 2010-05-13 13:52:46 -04:00
Guy Harris
ab0166f9be When printing the link-layer type list, send *all* output to stderr. 2010-05-07 01:11:45 -07:00
Guy Harris
e97d5ed3c2 Add a comment to the AC_DEFINE for _SUN, matching what we do in libpcap. 2010-04-16 03:31:33 -07:00
Guy Harris
55306e9542 Include the CFLAGS setting when configure was run in the compiler flags. 2010-04-16 03:24:45 -07:00
Guy Harris
8db70a1a1b Build fat appropriately for Leopard. 2010-04-06 15:10:31 -07:00
Guy Harris
610f938c11 OS X has its own optimized ntoh[ls]; use them, don't define our own. 2010-04-04 14:05:23 -07:00
Guy Harris
3938c9fe90 Fix error, pick up stuff from libpcap bittypes.h. 2010-04-04 13:49:03 -07:00
Guy Harris
9b2d37151d Don't define any of the SIZEOF_ values. 2010-04-04 13:41:27 -07:00
Guy Harris
b37df554f7 Don't depend on the settings of SIZEOF_ values.
We're eventually going to stop defining the SIZEOF_ values, as we
support, for example, building fat on Mac OS X, and SIZEOF_LONG, for
example, is different between 32-bit and 64-bit builds.
2010-04-04 13:36:21 -07:00
Guy Harris
e67e304a58 Our bittypes.h is needed only on Windows. Move it to win32/Include. 2010-04-04 13:24:32 -07:00
Guy Harris
427b1e0289 Back out mistaken change. 2010-04-04 12:45:06 -07:00
Guy Harris
103de367dc Fix check for Snow Leopard.
For OS X version 10.{x}.{y}, Darwin is (at least for later versions)
version {x+4}.{y}.
2010-04-04 12:42:00 -07:00
Guy Harris
c1b245043f Build universal on OS X by default; add an option to disable that.
Instead of requiring the user to specify -arch options on OS X to build
a universal version of tcpdump, just default to universal on OS X by
default.  Pick the particular targets to match the way tcpdump is built
for the OS for which we're building.
2010-04-04 12:08:11 -07:00
Guy Harris
51b8ec3c84 Make the date on the change notes for 4.1.0 match the release date. 2010-04-03 12:01:25 -07:00
Guy Harris
7d7201ff75 Add the tests to the release tarball. 2010-04-01 23:02:46 -07:00
Guy Harris
48c58c08b7 Re-generate configure script. 2010-04-01 23:01:56 -07:00
Peter Volkov
9aca99aa40 Respect --without-chroot correctly
./configure --without-chroot will configure tcpdump with "no" as the
value of chroot directory and cause tcpdump to fail with:

tcpdump: Couldn't chroot/chdir to 'no': No such file or directory

This patch makes ./configure to avoid chroot directory when called with
--without-chroot.
2010-04-01 22:55:22 -07:00
Guy Harris
9c52a8de33 The first 4.2.x release will be 4.2.0, not 4.2. 2010-04-01 22:51:09 -07:00
Guy Harris
83b8fd3d80 Add the current set of 4.1.1 changes from 4.1.0. 2010-04-01 22:49:56 -07:00
Guy Harris
0ff35b4da5 Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump
Conflicts:
	CHANGES
2010-04-01 22:43:56 -07:00
Guy Harris
3d1e6b5406 Update CHANGES to reflect more of the changes in 4.1.0. 2010-04-01 22:42:51 -07:00
Guy Harris
f7b185510a Add a --with-arch-flags configuration option to specify target architectures.
They allow the user to specify flags to indicate the target
architecture(s) (yes, possibly plural - think, for example, Mac OS X)
for which we're building.  Those might need to be used not only when
compiling, but also when linking and when building a shared library.

This is not for general cross-compiling, it's for use on platforms where
versions of the native OS support more than one instruction set and
where you want to build for the OS on which you're running but not for
the default build architecture on the machine on which you're running.

This may currently be less useful for tcpdump, as tcpdump currently
builds no libraries, but it's there for compatibility with libpcap.
2010-03-31 17:24:33 -07:00
Guy Harris
a08f866fcf Sync up the CHANGES file with the 4.1 branch. 2010-03-31 12:24:28 -07:00
Wesley Shields
fd269c123d Fix build on systems with PF.
Reviewed-By: Guy Harris <guy@alum.mit.edu>
2010-03-31 12:10:59 -07:00
Guy Harris
48ea21554b Don't blow up if a zero-length link-layer address is passed to linkaddr_string().
Clean up style a bit while we're at it.
2010-03-25 11:21:49 -07:00
Guy Harris
1b2e1a81e2 The draft in question has nothing to do with MPLS; clarify that.
Presumably the idea is that the technique is generally applicable as
long as the traffic being carried is either IPv4, IPv6, OSI CLNP, ES-IS,
or IS-IS.

Also, by the time we get there, we know we've reached the bottom of the
MPLS stack (the do loop either fails by running past the end of the
packet and going to trunc, or by terminating because we find a label
entry with the BOS bit set); there's no need to check for that.
2010-03-19 11:47:19 -07:00
Guy Harris
272333b0ed Print the MPLS-encapsulated packet regardless of whether -v was
specified.

Even with multiple layers in the stack, print on one line unless -v was
specified.
2010-03-19 11:26:56 -07:00
Guy Harris
f410ee46c5 There's now a 4.1 branch; the main branch will become 4.2. 2010-03-15 11:48:57 -07:00
test2
8781649e5e Added a missing source file to the cygwin makefile. 2010-03-09 12:33:23 -08:00
test2
f8377b4e66 Added the definition of NBBY for Visual Studio compilers. 2010-03-09 12:32:27 -08:00
test2
5b9f86469e Added the Windows VS2005 projects. 2010-03-09 12:31:20 -08:00
Dmitry Eremin-Solenikov
fffd9b826e print_802_15_4.c: extend 802.15.4 printer to dump header information
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
2010-03-09 18:20:50 +03:00
Dmitry Eremin-Solenikov
721345da68 tcpdump.c: fix merge error: ieee802_15_4_if_print isn't a new style printer
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
2010-03-09 18:13:48 +03:00
Dmitry Eremin-Solenikov
d8f84ef9f3 Makefile.in: fix print-802_15_4.c file order
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
2010-03-09 18:13:03 +03:00
Dmitry Eremin-Solenikov
4e25f49680 addrtoname.[ch]: add a printer for Little-Endian 64-bit address
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
2010-03-09 18:12:39 +03:00
Dmitry Eremin-Solenikov
ec799d60f6 Merge remote branch 'origin/master' 2010-03-09 17:36:58 +03:00
Michael Richardson
3541a555b1 uudecode actually does not support -h, but --help 2010-03-05 12:38:27 -05:00
Michael Richardson
1d1c9ba86a tell the user what package they might find uudecode in 2010-03-05 12:37:17 -05:00
Michael Richardson
717ea6359c Merge branch 'master' of git+ssh://kingsmere.gatineau.credil.org/home/mcr/src/tcpdump 2010-03-05 12:35:45 -05:00
Michael Richardson
ea7f14bc59 fail all tests on machines without uudecode installed 2010-03-05 12:35:00 -05:00