Commit Graph

1430 Commits

Author SHA1 Message Date
Guy Harris 149ccb3b68 Attempt to handle isochronous descriptors between the 64-byte header and
the payload.  Should fix bug 4401.

svn path=/trunk/; revision=32828
2010-05-16 03:19:40 +00:00
Martin Mathieson 33dc9a3eb4 Fix non-libz build.
svn path=/trunk/; revision=32734
2010-05-10 12:56:01 +00:00
Guy Harris 31fbc9f528 Add wtap_cleareof().
svn path=/trunk/; revision=32719
2010-05-08 00:43:23 +00:00
Gerald Combs 0a209d762e Zlib has an officially-sanctioned way of clearing EOF when we're tailing
a file.  Use it.

svn path=/trunk/; revision=32716
2010-05-07 21:15:24 +00:00
Gerald Combs 52cbbd605f EOF in zlib 1.2.5 seems to be sticky. When we're tailing a file and we
reach EOF, zlib's file handle seems to stay at EOF even when more data
is appended to the file. Add a check for 1.2.5 which calls gzseek in
order to unset EOF. Fixes bugs 4708 and 4748.

svn path=/trunk/; revision=32715
2010-05-07 19:45:47 +00:00
Anders Broman a34b791645 Whitespace changes.
svn path=/trunk/; revision=32575
2010-04-27 10:35:12 +00:00
Guy Harris adf7e45432 Clean up properly if we get an error after allocating the private data
structure.

svn path=/trunk/; revision=32563
2010-04-26 02:26:22 +00:00
Guy Harris ea392ce83d A bit more information.
svn path=/trunk/; revision=32537
2010-04-22 04:50:55 +00:00
Guy Harris 53850f189a More updates to reflect all the hairy details of Linux USB capture.
svn path=/trunk/; revision=32536
2010-04-22 04:38:48 +00:00
Guy Harris c6e453d090 Update a comment to reflect recent changes and to reflect behavior of
later Linux kernels.

svn path=/trunk/; revision=32535
2010-04-22 00:10:17 +00:00
Guy Harris 21a210b777 From Chris Maynard:
Support PPP-over-USB.

	Don't remove the USB pseudo-header from the packet data for
	Linux USB packets, just byte-swap it if necessary and have the
	USB dissector fetch the pseudo-header from the raw packet data.

	Update USB language ID values.

svn path=/trunk/; revision=32534
2010-04-21 20:51:22 +00:00
Stig Bjørlykke 51af731c3a From Jakub Zawadzki:
Fix compile without zlib.

svn path=/trunk/; revision=32501
2010-04-17 10:09:52 +00:00
Stig Bjørlykke 7b1e97b64e Make it build without zlib on OSX.
svn path=/trunk/; revision=32472
2010-04-15 13:59:15 +00:00
Anders Broman 441c3f63b2 From Stephen Donnelly:
InfiniBand Link Packet (flow control) dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4656

svn path=/trunk/; revision=32425
2010-04-08 08:41:56 +00:00
Guy Harris 400d57fa2f Treat the first block we read, when opening, specially:
1) if it's not an SHB, just say "this is not a pcap-ng file",
	   don't try to process it (we can't process it, as we haven't
	   finished setting up all the state information yet);

	2) if it has the right SHB type code, but isn't a valid SHB,
	   just say "this is not a pcap-ng file".

For all other SHB's, treat anything that renders it invalid as an error.

svn path=/trunk/; revision=32393
2010-04-05 22:20:21 +00:00
Guy Harris 6ebf4bf0d2 From Robert Bullen: give the Bluetooth-H4-with-Linux-pseudo-header
encapsulation a name different from the no-pseudo-header H4
encapsulation.

svn path=/trunk/; revision=32321
2010-03-28 19:35:14 +00:00
Guy Harris 2101397e40 Update a comment to discuss how zlib and z_off_t has gotten messier lately.
svn path=/trunk/; revision=32280
2010-03-25 19:45:29 +00:00
Jörg Mayer 96779de920 cmake changes:
- Add checking for linker flags
- Install plugins with the name including the Wireshark version.
  This will make it easier to find matching plugin versions if
  files get just copied over.


svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
Guy Harris c1efdf167a Fix some types, to squelch compiler warnings (this should introduce
another valid warning, if you've turned the warnings up high enough; we
need to generate a zlib version of stdout).

svn path=/trunk/; revision=32027
2010-02-27 02:23:44 +00:00
Guy Harris 17392a865a Move the definitions of all the private data structures out of
wtap-int.h, and change the unions of pointers to those private data
structures into just void *'s.

Have the generic wtap close routine free up the private data, rather
than the type-specific close routine, just as the wtap_dumper close
routine does for its private data.  Get rid of close routines that don't
do anything any more.

svn path=/trunk/; revision=32015
2010-02-26 07:59:54 +00:00
Guy Harris 207a75388a Have parse_ascend() return:
PARSED_RECORD if we got a packet;

    PARSED_NONRECORD if the parser succeeded but didn't see a packet;

    PARSE_FAILED if the parser failed.

Treat anything other than PARSED_RECORD as a failure, for now; I'm not
sure why we were treating "parser succeeded but didn't see a packet" as
success, as that was causing us to recognize some non-Ascend-output text
files as Ascend files and to return "records" with bogus caplen and len
values.

svn path=/trunk/; revision=32009
2010-02-25 20:45:59 +00:00
Guy Harris 756bf60020 Move the definition of the private data structure from wtap-int.h to the
iSeries capture processor.  Parse the start date into year/month/day at
the time we see it, rather than for every packet; that means we don't
need to allocate a buffer to hold the date as a string (a buffer which
we weren't ever freeing).

svn path=/trunk/; revision=31981
2010-02-24 08:39:19 +00:00
Guy Harris dde6d97f63 Define the private data structures for some particular capture file
types in the modules for those capture file types, not in wtap-int.h, so
wtap-int.h doesn't have to change when the code to handle that
particular capture type changes, or a new capture file type is added.
(Ultimately, we should do this for all the private data structures.)

svn path=/trunk/; revision=31974
2010-02-24 07:21:17 +00:00
Guy Harris c85899e946 Move the declarations of wtap_pcap_encap_to_wtap_encap() and
wtap_wtap_encap_to_pcap_encap() to wiretap/pcap-encap.h.  Include it
where it's needed; don't include other Wiretap headers where they're not
needed.

Include pcapng.h in pcapng.c, to declare the functions defined in
pcapng.c.  Add some casts to squelch some warnings, and add to a comment
to indicate one of the problems.

svn path=/trunk/; revision=31960
2010-02-23 03:50:42 +00:00
Guy Harris 41b012403e Squelch some compiler warnings (some of which indicate potential
problems, and some of which are, at least, incorrect casts).

svn path=/trunk/; revision=31957
2010-02-23 02:11:52 +00:00
Guy Harris 9845a10325 Don't use C++ keywords as variable names - prepend "ber_" in front of
variables with BER metadata.

svn path=/trunk/; revision=31956
2010-02-23 02:10:54 +00:00
Guy Harris dda82be58c Squelch some (valid) warnings.
svn path=/trunk/; revision=31955
2010-02-23 01:23:39 +00:00
Guy Harris 2d1e27dddb Fix cast.
svn path=/trunk/; revision=31954
2010-02-23 01:23:07 +00:00
Guy Harris ef418305f0 Attempt to squelch some compiler warnings.
svn path=/trunk/; revision=31953
2010-02-23 01:16:48 +00:00
Anders Broman 6dfde68911 From Stephen Donnelly:
Endace ATM and AAL2 enhancements.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4447

svn path=/trunk/; revision=31766
2010-02-02 04:56:39 +00:00
Anders Broman 2f6f1e48af From Tobias Witek:
Replace ERF dissector with ATM dissector for protocols 'FP Hint' and 'META'
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4384

svn path=/trunk/; revision=31761
2010-02-01 20:27:16 +00:00
Guy Harris 1c88b1f221 Fix a comment.
svn path=/trunk/; revision=31693
2010-01-27 00:35:32 +00:00
Jaap Keuter 7049fa5678 Fix for bug 4408:
Make further encapsulation determination between "VC-multiplexed PPP" and "LLC encapsulated PPP". See RFC 2364.

svn path=/trunk/; revision=31634
2010-01-23 16:45:03 +00:00
Bill Meier f1d4716d18 Fix gcc -Wshadow warnings ....
svn path=/trunk/; revision=31558
2010-01-18 21:50:50 +00:00
Guy Harris e5b99619b7 The maker of *Peek is WildPackets, InterCap and all, not Wildpacket.
svn path=/trunk/; revision=31358
2009-12-23 22:20:41 +00:00
Stig Bjørlykke 1439e56e5f From Petr Sumbera:
Small comment fix.

svn path=/trunk/; revision=31293
2009-12-17 15:32:23 +00:00
Stephen Fisher 233bb9cd25 When reading NetMon capture files version 2.1 and higher (the latest is 2.2 right
now), the capture file's header encapsulation type is set to 1 for Ethernet for
backwards compability only.  These files use per-packet encapsulation types
instead.  For now, set it to Unknown file encapsulation until we can find a
way to set it to WTAP_ENCAP_PER_PACKET without having to assert in wtap_read()
so the user can see that it is a per-packet encapulation in places such as
the capinfos program.


svn path=/trunk/; revision=31213
2009-12-09 03:27:12 +00:00
Stephen Fisher 09a4f2af2f From Felix Obenhuber via bug #4299: SocketCAN dissector patch
From me: Remove changes related to the ARP protocol because it doesn't
appear to be necessary for SocketCAN.  Will add later if Felix says it is
needed.


svn path=/trunk/; revision=31196
2009-12-08 07:21:33 +00:00
Bill Meier 0f1d360f64 Revise #31172 slightly to clarify #define dependencies
svn path=/trunk/; revision=31173
2009-12-04 16:56:34 +00:00
Bill Meier 2dd96f051a From: babi
[Fix] potential memory problem (crash?) in daintree-sna.

See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4294

(A parameterized version of the patch supplied in the above)



svn path=/trunk/; revision=31172
2009-12-04 16:42:14 +00:00
Bill Meier cc43ff3835 From: Ravi Kondamuru:
"... a patch to make the netscaler wiretap code independent of the
 host system endian-ness. 
 I have taken care of (1) reading and writing nstrace files (netscaler.c) and
 (2) reading in dissector code (packet-nstrace.c) also."

See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3540#c26

svn path=/trunk/; revision=31171
2009-12-04 15:21:48 +00:00
Stig Bjørlykke 11ba06366d Renamed some wtap defines:
WTAP_GCOM_TIE1 => WTAP_ENCAP_GCOM_TIE1
WTAP_GCOM_SERIAL => WTAP_ENCAP_GCOM_SERIAL

svn path=/trunk/; revision=31161
2009-12-03 15:47:52 +00:00
Stig Bjørlykke fcee7ad2df Added missing WTAP_ENCAP_DPNSS and WTAP_ENCAP_PACKETLOGGER to encap_table_base[]
Fixed some comments.

svn path=/trunk/; revision=31160
2009-12-03 15:40:15 +00:00
Stig Bjørlykke e592902393 From Petr Sumbera via bug 4284:
Added support for Solaris IPNET layer

From me:
Some code cleanup in packet-ipnet.c
Added packet-ipnet.c to CMakeFiles.txt
Added WTAP_ENCAP_IPNET to encap_table_base[]

svn path=/trunk/; revision=31159
2009-12-03 15:27:39 +00:00
Stig Bjørlykke e6a57f0107 Switch HighHdr and LowHdr to build correct absolute time.
svn path=/trunk/; revision=31005
2009-11-18 16:29:13 +00:00
Stig Bjørlykke 0eba377436 Another try to treat the two 32bit time values (low, high) in v23 format
as a 64bit value.

svn path=/trunk/; revision=31002
2009-11-18 07:48:03 +00:00
Guy Harris d393e03e07 If no error is returned by a Wiretap routine, err_info is presumed not
to have been set.  Do not set it to something g_mallocated in that case,
as that will cause a memory leak - the error string will not be freed by
the caller, as it's presumed not to have been set.

svn path=/trunk/; revision=31001
2009-11-18 06:36:13 +00:00
Stig Bjørlykke 99b8600eca From Ravi Kondamuru via bug 3540:
Treat the two 32bit time values (low, high) in v23 format as a 64bit value.

svn path=/trunk/; revision=30994
2009-11-17 18:23:40 +00:00
Jörg Mayer d2cc318f4f Beginnings of enabling static builds. Still to do:
* Add -static
* Registration may need different handling
* Add plugins
* Build error in wslua

svn path=/trunk/; revision=30987
2009-11-17 11:58:36 +00:00
Stig Bjørlykke 7d26a109cd Removed an unused assignment.
svn path=/trunk/; revision=30892
2009-11-09 14:24:02 +00:00