Commit Graph

732 Commits

Author SHA1 Message Date
Guy Harris a3439d24fb Check for errors from all calls to "file_getc()".
If we get such an error, always call "file_error()" to get an indication
of what the error was and, if it returns 0, set the error to
WTAP_ERR_SHORT_READ.

svn path=/trunk/; revision=12442
2004-10-30 09:14:36 +00:00
Guy Harris 1e6a5d408c As Sam Leffler notes, the radiotap header isn't BSD-only, it's also used
by his madwifi Atheros driver on Linux; rename
WTAP_ENCAP_IEEE_802_11_WLAN_BSD to WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP,
and change its text name from "ieee-802-11-bsd" to
"ieee-802-11-radiotap".

svn path=/trunk/; revision=12429
2004-10-29 02:40:01 +00:00
Guy Harris 60bbdd93a7 From Mark C. Brown:
fix FDDI to use correct bit swapped encap;

	tweak file open code to guess at file encap so merge works
	better.

svn path=/trunk/; revision=12351
2004-10-19 22:28:27 +00:00
Guy Harris 88982558b0 file_hdr.network is one byte long, so don't use htoles() on values it's
set to - that causes it to be set to zero.

svn path=/trunk/; revision=12328
2004-10-17 06:20:43 +00:00
Guy Harris af061ccd60 From Mark C. Brown: add 100VG support.
svn path=/trunk/; revision=12299
2004-10-14 21:59:17 +00:00
Guy Harris eb608f1c98 From Mark C. Brown: support dumping files with the raw ICMP and raw
ICMPv6 encapsulations.

svn path=/trunk/; revision=12279
2004-10-12 17:23:15 +00:00
Guy Harris da8539cbdb Correctly update the count of bytes dumped.
svn path=/trunk/; revision=12275
2004-10-12 08:05:58 +00:00
Ulf Lamping 08ba61b48f fix MSVC unused magic warning
svn path=/trunk/; revision=12274
2004-10-12 06:32:57 +00:00
Guy Harris 1a15f79f26 From Mark C. Brown: add support for writing nettl files.
svn path=/trunk/; revision=12258
2004-10-11 07:18:20 +00:00
Guy Harris dba97f9cc5 From Mark C. Brown: add EISA 100BaseTX, EISA FDDI, and HSC FDDI support,
and make a small performance fix to HP-PB FDDI.

svn path=/trunk/; revision=12218
2004-10-06 10:08:29 +00:00
Guy Harris 5a46037813 From Mark C. Brown: support for the NETTL_SUBSYS_HPPB_FDDI records.
svn path=/trunk/; revision=12202
2004-10-05 08:59:57 +00:00
Guy Harris d525c0129e From Mark C. Brown: add the HP-PB FDDI card type, although we currently
don't have any code to handle it (other than to report that fact...).

Also, refer to the subsystem type code as such, not as a "network type".

svn path=/trunk/; revision=12178
2004-10-01 22:01:25 +00:00
Jörg Mayer 54e0e363a9 Get rid of warnings about shadowed variables (code was ok)
svn path=/trunk/; revision=12171
2004-10-01 12:31:52 +00:00
Guy Harris 3cdebd31db From Mark C. Brown: fix support for nettl NETTL_SUBSYS_NS_LS_ICMP and
NETTL_SUBSYS_NS_LS_ICMPV6 - they don't even have IP headers, so we need
to directly call the ICMP and ICMPv6 dissectors.

svn path=/trunk/; revision=12047
2004-09-19 07:13:52 +00:00
Guy Harris 32848e62b3 Improve the heuristic for Frame Relay, and move that heuristic after the
checks for Wellfleet and Cisco HDLC.

svn path=/trunk/; revision=11995
2004-09-15 07:22:34 +00:00
Ulf Lamping 19ddb92ce1 to prevent problems reported by David Richards, don't depend on the cvarsdll from win32.mak and define our own CVARSDLL
svn path=/trunk/; revision=11980
2004-09-12 23:29:33 +00:00
Guy Harris a686d1b953 From Mark C. Brown:
1) Change nettl subsystem ID's to decimal so as to
   match /etc/nettlgen.conf and ease maintenance

2) Add support for hp_apaport (PAgP), hp_apalacp,
   and IPv6 subsystem trace records

3) Correct handling of LOOPBACK trace records

svn path=/trunk/; revision=11901
2004-09-04 20:35:29 +00:00
Guy Harris 0d7309988e Rename HEADER_FILES to NONGENERATED_HEADER_FILES, so that it's clear
that it contains only the .h files not generated from other files.

svn path=/trunk/; revision=11531
2004-07-27 00:36:31 +00:00
Guy Harris 7f6ff83e35 Add a missing backslash.
svn path=/trunk/; revision=11530
2004-07-26 22:00:05 +00:00
Guy Harris 39ceb18bf1 Add a Makefile.common for Wiretap, and have Makefile.am and
Makefile.nmake include it.

svn path=/trunk/; revision=11528
2004-07-26 20:46:54 +00:00
Guy Harris f28323ba39 From Graham Bloice: add resources to wiretap.dll.
svn path=/trunk/; revision=11476
2004-07-23 06:11:50 +00:00
Jörg Mayer fd24ad7d92 .cvsignore is dead
it has been replaced by
svn proplist -v <dir/file>
and
svn propedit <dir/file>

svn path=/trunk/; revision=11422
2004-07-18 23:44:34 +00:00
Jörg Mayer 56c759212f Add epan/dissectors/.cvsignore
Add tags and TAGS to all .cvsignore files

svn path=/trunk/; revision=11419
2004-07-18 22:51:50 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Guy Harris 1715f98d9c This shouldn't be checked in, as it's generated from Makefile.am.
svn path=/trunk/; revision=11381
2004-07-16 23:26:27 +00:00
Guy Harris 6216591bdf If we don't know the board type in a Lanayzer capture, return
WTAP_ERR_UNSUPPORTED_ENCAP, not WTAP_ERR_UNSUPPORTED, as it presumably
means the capture was done on some type of device we don't know about.

svn path=/trunk/; revision=11339
2004-07-08 07:32:39 +00:00
Guy Harris 272a2055ab On at least some platforms, a #define of O_BINARY is needed even if
<fcntl.h> is included, as <fcntl.h> doesn't define it.

svn path=/trunk/; revision=11276
2004-06-30 06:58:59 +00:00
Ulf Lamping a24b176c32 define of O_BINARY not needed, if fcntl.h is included
other #include related cleanups

svn path=/trunk/; revision=11272
2004-06-29 20:51:26 +00:00
Guy Harris f17a8f98ec To return an EOF indication, return FALSE from the read routine *AND*
set "*err" to 0, rather than leaving what random value happened to be in
"*err" there.

svn path=/trunk/; revision=11158
2004-06-16 08:11:59 +00:00
Guy Harris c16562407d Add an encapsulation type for BACnet MS/TP, and map the newly-assigned
libpcap DLT_ value for BACnet MS/TP to it.

svn path=/trunk/; revision=11126
2004-06-07 20:28:51 +00:00
Jörg Mayer 01dd51cdf4 It really helps when you change the default from gtk1 -> gtk2 in the top
level configure.in to mirror that change in wiretap. Otherwise people who
have both versions of glib/gtk installed may see crashes.

svn path=/trunk/; revision=11049
2004-06-01 00:15:38 +00:00
Guy Harris 251ecc78f5 From Joe Marcus Clarke: force the standard output to be in binary mode
on Windows.

svn path=/trunk/; revision=10717
2004-04-28 05:47:33 +00:00
Olivier Biot af4a73a523 At last compiling on CygWin works again! Added the missing PCRE and GLIB
libraries to libftypes.

Provide caching of computed configure tests.

svn path=/trunk/; revision=10600
2004-04-14 18:42:19 +00:00
Guy Harris 1adc05c157 From Mark C. Brown: add support for FDDI and Token Ring cards.
Set the file encapsulation the same way it's done for iptrace captures -
leave it as "unknown" to start with, and, for each packet we see, set it
to the packet's encapsulation type if the file encapsulation type is
unknown and set it to "per-packet" if the file encapsulation type is
"known" but isn't the type of that packet, so files that have all the
same type of packet have that type as the file type and packets that
*don't* have all the same type of packet have "per-packet".

svn path=/trunk/; revision=10543
2004-04-02 08:27:26 +00:00
Guy Harris 78becd2967 From Rolf Fiedler: fix a comment, and fix the code to get the packet
length.

svn path=/trunk/; revision=10541
2004-04-02 07:40:37 +00:00
Guy Harris 5eb39c4638 From Albert Chin: "config.h" should come before all other #includes.
svn path=/trunk/; revision=10528
2004-03-30 19:37:31 +00:00
Jörg Mayer 9c83306a7e Some aclocal warning fixes during autogen.sh
svn path=/trunk/; revision=10507
2004-03-27 12:07:57 +00:00
Guy Harris 313ba9e2b8 From Mark C. Brown: add support for iether (dual-port gigabit) cards in
nettl files.

svn path=/trunk/; revision=10501
2004-03-27 11:16:54 +00:00
Olivier Biot eee9dc26ac Fix the CLEANFILES target so both static and shared libraries are cleaned.
svn path=/trunk/; revision=10475
2004-03-24 21:27:44 +00:00
Guy Harris 30b2831847 Add support for DLT_APPLE_IP_OVER_IEEE_1394.
svn path=/trunk/; revision=10446
2004-03-23 01:02:41 +00:00
Guy Harris ac38f86c69 Clean up the code to check the file type.
svn path=/trunk/; revision=10445
2004-03-23 00:17:50 +00:00
Guy Harris b9ab806214 In the read routine, set the 802.11 pseudo-header for
WTAP_ENCAP_PRISM_HEADER, WTAP_ENCAP_IEEE_802_11_WLAN_BSD, and
WTAP_ENCAP_IEEE_802_11_WLAN_AVS.

In the seek_read routine, set it for all 802.11 types.

svn path=/trunk/; revision=10404
2004-03-19 05:22:41 +00:00
Guy Harris 40f3136dbf "esc_read()" is passed a FILE_T, not a FILE_T * - a FILE_T is a pointer
(a FILE * if zlib isn't used, a gzFile if zlib is used).

Use "size_t" for the amount of data to read in
"eyesdn_check_file_type()", to squelch signed vs. unsigned warnings.

svn path=/trunk/; revision=10392
2004-03-17 09:24:41 +00:00
Jörg Mayer b7803c8fc6 Make libethereal and libwiretap shared libs.
svn path=/trunk/; revision=10368
2004-03-13 10:15:36 +00:00
Guy Harris 48cd9f9358 Add support for DLT_ value 99, as used by the Axent Raptor
firewall/Symantec Enterprise Firewall.  Thanks, Axent/Symantec, for not
asking us for a DLT_ value and not telling us about the link-layer type.

svn path=/trunk/; revision=10361
2004-03-11 09:18:33 +00:00
Guy Harris 5ae946d67c From Jeff Morriss: delete "ascend-grammar.c" and "ascend-grammar.h" with
"make maintainer-clean", as they're generated files.

svn path=/trunk/; revision=10336
2004-03-06 21:46:27 +00:00
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