Commit graph

686 commits

Author SHA1 Message Date
Guy Harris
03d1c9e781 Get rid of an out-of-date comment.
We only appear to need autoconf 2.52, not 2.53.

svn path=/trunk/; revision=10293
2004-03-04 06:30:14 +00:00
Guy Harris
ba72e955dc Have "wtap_read()" set "wth->phdr.pkt_encap" to "wth->file_encap",
rather than requiring individual capture file type handlers to do it
(unless they're doing per-packet encapsulation, in which case we check
to make sure they didn't *leave* it as WTAP_ENCAP_PER_PACKET).

svn path=/trunk/; revision=10290
2004-03-03 22:24:53 +00:00
Jörg Mayer
c4884cab89 Require autoconf 2.53 and automake 1.6
svn path=/trunk/; revision=10287
2004-03-03 21:35:57 +00:00
Guy Harris
cf1466d623 Set the packet encapsulation value to the file encapsulation.
svn path=/trunk/; revision=10285
2004-03-03 01:49:16 +00:00
Guy Harris
d7ea5b23cf A DLT_ value of 13, in a Nokia-format capture, appears to be an ATM
capture of some sort.

svn path=/trunk/; revision=10109
2004-02-19 08:02:06 +00:00
Guy Harris
b5881ce528 Get rid of unused variables and #defines.
svn path=/trunk/; revision=10059
2004-02-13 19:19:13 +00:00
Guy Harris
26536d7a41 Use "guint8" for 8-bit binary data.
"file_getc()" returns either an 8-bit unsigned value, or -1 for error or
EOF; store its return value into an "int", and check for -1 and return
-2, in "esc_read()" (rather than checking "file_error()" at the end).

Clean up some comments, routine names, and variable names - eyeSDN files
are binary, not text.

In "parse_eyesdn_packet_data()", handle the case of an EOF from
"esc_read()".

svn path=/trunk/; revision=10050
2004-02-12 21:25:07 +00:00
Guy Harris
0aef15283a Note that 164 is reserved for Juniper chassis-internal meta-information
(DLT_JUNIPER_MONITOR/LINKTYPE_JUNIPER_MONITOR).

Fix a typo.

svn path=/trunk/; revision=10046
2004-02-12 19:49:08 +00:00
Guy Harris
131be6ce7d Map WTAP_ENCAP_IEEE_802_11_WITH_RADIO to DLT_IEEE802_11, for now; we
could probably map it to one of the many different 802.11+radio headers,
but we should probably just have *one* Wiretap encapsulation for 802.11,
with a radiotap-style list of attributes attached to it.

svn path=/trunk/; revision=10041
2004-02-11 20:47:00 +00:00
Guy Harris
2df960325a From Rolf Fiedler: support for reading EyeSDN USB S0 trace files.
svn path=/trunk/; revision=10038
2004-02-11 20:05:16 +00:00
Guy Harris
31c636ff4a Cast the arguments to <ctype.h> macros to "guchar", to squelch
"subscript has type `char'" warnings and to make the code work correctly
if there are characters with the 8th bit set.

svn path=/trunk/; revision=10010
2004-02-09 00:06:30 +00:00
Guy Harris
a2d69c6fae Add extra {} to "avoid ambiguous `else'", to quote the GCC warning that
this squelches.

svn path=/trunk/; revision=10009
2004-02-09 00:05:35 +00:00
Jörg Mayer
55af6c35c4 Move -pedantic back to extra-gcc-flags, as glib generates more warnings than our code
svn path=/trunk/; revision=10008
2004-02-08 14:11:48 +00:00
Jörg Mayer
16970db9af Don't build as shared *and* static by default
svn path=/trunk/; revision=10004
2004-02-07 05:44:08 +00:00
Jörg Mayer
2a1cb9ce0f Ignore byproducts of shared lib compilation
svn path=/trunk/; revision=10003
2004-02-07 04:35:49 +00:00
Guy Harris
75d7c8727b Whether frames in an AiroPeek V9 802.11 capture have 4 bytes of 0 or an
FCS at the end appears to depend on the network subtype value.

svn path=/trunk/; revision=10001
2004-02-06 20:50:44 +00:00
Guy Harris
922c36ea57 A MediaSubType value of 1 also means 802.11. (Is that what indicates
whether there's an FCS or not?)

svn path=/trunk/; revision=9995
2004-02-06 05:23:46 +00:00
Guy Harris
f23a8e64c0 Make sure a packet has one and only one length field, one and only one
timestamp lower field, and one and only one timestamp lower field.

svn path=/trunk/; revision=9994
2004-02-06 04:48:06 +00:00
Guy Harris
95ff961e2d The time stamps in *Peek V9 files appear to be in nanoseconds from the
Windows FILETIME epoch, i.e. midnight, January 1, 1601.

svn path=/trunk/; revision=9993
2004-02-06 04:27:19 +00:00
Guy Harris
d5263942b5 Ethernet frames appear to have 4 bytes of 0 at the end, at least in the
captures I've seen.

svn path=/trunk/; revision=9991
2004-02-06 03:12:21 +00:00
Guy Harris
0875bf3afe V9 format appears to be used by some versions of EtherPeek, too.
The MediaType field seems to be 0 for the Ethernet captures; however,
the MediaSubType field is different.

The fields in the header are different - we can't use hard-coded offsets
for the fields, we have to process them as a sequence of tag/value
items.

Rename some routines to use the same naming convention as the V9 open
routine rather than the same convention as the V5/V6/V7 read and
seek/read routines.

svn path=/trunk/; revision=9990
2004-02-06 02:11:52 +00:00
Guy Harris
2cbe1a0bf5 Fix up a comment to note that this is also used for AiroPeek, and used
only for versions 5, 6, and 7 of the file format.

Add another comment explaining why this refers to "etherpeek" even
though it's also used for AiroPeek and probably also TokenPeek.

svn path=/trunk/; revision=9989
2004-02-06 02:09:11 +00:00
Guy Harris
f3a4c61c93 Sort the link-layer type values a little better.
svn path=/trunk/; revision=9987
2004-02-06 00:45:27 +00:00
Guy Harris
cf131d9e16 The DLT_ value 127 is being used for the BSD radio header, and the
current CVS libpcap uses 163 for the AVS radio header (127 was never
used for the AVS radio header).  Redo the Wiretap encapsulation values
for that (and shuffle them to put the 802.11 Wiretap values together).

svn path=/trunk/; revision=9904
2004-01-29 10:58:28 +00:00
Guy Harris
677db2dadd From Tomas Kukosa: reserve private WTAP_ENCAP values and map them to
reserved private DLT_ values.

svn path=/trunk/; revision=9892
2004-01-28 01:24:30 +00:00
Guy Harris
2528c053ce Supply a pseudo-header for all 802.11 packets; add an "fcs_len" field to
it, similar to the Ethernet pseudo-header's "fcs_len" field, and use it
in the 802.11 dissector.

svn path=/trunk/; revision=9884
2004-01-27 08:06:12 +00:00
Guy Harris
1c8f8924ac Fix a compiler warning.
svn path=/trunk/; revision=9867
2004-01-26 21:26:52 +00:00
Guy Harris
bbf3806ba7 Don't muck with the Ethernet pseudo-header if we have an 802.11 capture.
svn path=/trunk/; revision=9857
2004-01-25 23:50:48 +00:00
Guy Harris
d6cd61061e Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors.  Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.

Add messages for cases where those errors were returned without printing
an additional message.

Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.

Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument.  (That handles a lot of the work of putting the info
string into the error message.)

Make some variables in "ascend-grammar.y" static.

Check the return value of "erf_read_header()" in "erf_seek_read()".

Get rid of an unused #define in "i4btrace.c".

svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
Jörg Mayer
6e59f95ceb Fix all fixable warnings
Move addional warnings from extra-gcc-checks to normal compilation flags

svn path=/trunk/; revision=9826
2004-01-24 16:48:12 +00:00
Guy Harris
c19c7677fb It appears that, for ISDN captures, the rules for whether there's 4
bytes of extra stuff at the end of the packet or not are the same as for
Ethernet and 802.11.

svn path=/trunk/; revision=9728
2004-01-19 02:23:18 +00:00
Olivier Biot
2857dfc114 Add -Wbad-function-cast to extra gcc flags.
svn path=/trunk/; revision=9639
2004-01-10 16:51:07 +00:00
Guy Harris
f497416d24 The year in a LANalyzer capture's trace summary record is a 2-byte year
number.

svn path=/trunk/; revision=9583
2004-01-07 04:50:21 +00:00
Guy Harris
0b82bd5123 Packet data is an array of "guint8"s, not an array of "char"s; declare
variables appropriately.

Put in a cast to squelch MSVC++ warnings.

svn path=/trunk/; revision=9575
2004-01-06 20:05:39 +00:00
Ulf Lamping
f16ac7a482 removed some MSVC warnings (level 3)
svn path=/trunk/; revision=9558
2004-01-05 17:33:28 +00:00
Guy Harris
c45a2852f0 For WTAP_ENCAP_ETHERNET, you have to fill in the "eth.fcs_len" member of
the pseudo-header; these captures don't appear to have an FCS in them,
so set that member to 0.

svn path=/trunk/; revision=9502
2003-12-31 01:07:09 +00:00
Guy Harris
7110082aa4 From Neils Koot:
add the ability to read Ethernet captures;

	add the ability to read hex-only dumps.

svn path=/trunk/; revision=9468
2003-12-29 00:36:12 +00:00
Guy Harris
1b6d16c7cc Make all the byte arrays for writing out stuff "guint8" rather than
"gint8" - there's no reason for them to be signed, and making them
signed can cause compiler warnings if a value won't fit in 8 bits if
sign-extended.

svn path=/trunk/; revision=9467
2003-12-29 00:25:39 +00:00
Ulf Lamping
cb2658031d removed some MSVC warnings (warning level 2)
svn path=/trunk/; revision=9459
2003-12-28 12:43:40 +00:00
Jörg Mayer
982b7a3f2b Add -pedantic to --with-extra-gcc-checks
svn path=/trunk/; revision=9443
2003-12-24 14:45:48 +00:00
Ulf Lamping
467c05b3ea removed some MSVC warnings (conversions between double/float and int)
svn path=/trunk/; revision=9422
2003-12-23 00:16:46 +00:00
Ulf Lamping
3b77bfee59 removed some MSVC warnings (moved pcap.h before glib.h)
svn path=/trunk/; revision=9393
2003-12-21 12:19:39 +00:00
Jörg Mayer
8d1f1c9b4f libpcap.c:1777: warning: implicit declaration of function htons
svn path=/trunk/; revision=9388
2003-12-21 06:02:06 +00:00
Guy Harris
8b0f0d5b7e Add some additional sanity checking.
svn path=/trunk/; revision=9360
2003-12-19 22:23:05 +00:00
Guy Harris
95e6fb64c0 Add support for a link-layer type value of 143 as DOCSIS in libpcap
captures.

svn path=/trunk/; revision=9350
2003-12-18 23:50:44 +00:00
Guy Harris
b8299f0b98 From Jan Kiszka: IrDA support.
svn path=/trunk/; revision=9345
2003-12-18 19:07:14 +00:00
Guy Harris
a98aa75a58 WildPackets' EtherHelp appears to write EtherPeek-compatible files,
except that the 0x80 bit is turned on in the file version number field.
Turn that bit off before processing that field.

svn path=/trunk/; revision=9342
2003-12-18 03:43:40 +00:00
Guy Harris
c642c44ad8 Fix more "CPPLAGS" typoes.
svn path=/trunk/; revision=9310
2003-12-17 02:41:04 +00:00
Ulf Lamping
10e3320115 prevent MSVC warning:
"warning C4761: Gr��enkonflikt im Argument. Konvertierung vorgenommen"
-> size conflict in argument, conversion done

svn path=/trunk/; revision=9244
2003-12-11 21:23:37 +00:00
Guy Harris
02260b4056 From Jeff Morriss: add support for libpcap MTP2 and MTP3 captures.
Add a missing entry in "encap_table[]" for Bluetooth H4, and fix some
comments.

svn path=/trunk/; revision=9157
2003-12-03 22:40:39 +00:00