Commit Graph

1355 Commits

Author SHA1 Message Date
Jörg Mayer 1aca48909c - now wireshark compiles with cmake as well
svn path=/trunk/; revision=29799
2009-09-08 15:56:16 +00:00
Jörg Mayer d26cdc30ea Beginnings of getting cmake to build stuff in epan.
It's only beginnings, so epan is commented out in
the subdirs statement.

This is more a synch to avoid duplicate work and creating
conflicting patches to the cmake stuff.

svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
Kovarththanan Rajaratnam 13df2a878b On Windows a shared library in divided into a DLL part (RUNTIME) and an import lib (ARCHIVE).
svn path=/trunk/; revision=29622
2009-08-30 07:09:29 +00:00
Bill Meier acd415ca9b #include <stdio.h> no longer req'd.
svn path=/trunk/; revision=29569
2009-08-26 19:28:20 +00:00
Jaap Keuter 58dedc3872 From kahou:
Add Fibre Channel Delimiter Dissector for Fibre Channel FC2.

svn path=/trunk/; revision=29531
2009-08-23 19:16:35 +00:00
Guy Harris 93ad454c6a Update a comment - a bad packet size could also be the result of a file
not actually being an ERF file.

Don't compute the packet size until you know that rlen is valid.

svn path=/trunk/; revision=29366
2009-08-10 18:22:05 +00:00
Gerald Combs c158c4ad69 Don't try to allocate more than WTAP_MAX_PACKET_SIZE. Fixes a crash
reported in bug 3849.

svn path=/trunk/; revision=29364
2009-08-10 16:12:55 +00:00
Jörg Mayer 952cbd7902 * Tue May 26 2009 cmorve69@yahoo.es
- made it compile with --as-needed

This patch was taken from the opensuse wireshark.spec file.
No thanks go to the author and the package maintainers of
this package for not sending this upstream - it would have
made it into 1.2.0.

svn path=/trunk/; revision=29326
2009-08-07 18:47:56 +00:00
Guy Harris be2a84c231 Note that libpcap fails if it tries to read a file with a snapshot
length > 65535, so we shouldn't use a larger value.

svn path=/trunk/; revision=29194
2009-07-26 00:32:22 +00:00
Stig Bjørlykke e9066532cf From Kahou via bug 3739:
New DLT value is added for Fibre Channel FC2.

svn path=/trunk/; revision=29115
2009-07-16 10:45:14 +00:00
Anders Broman 67d6f5976e Move th /MP flag setting to LOCAL_CFLAGS set in configure.nmake
for MSVC variant 2008 only. As suggested by Bill Meier.

svn path=/trunk/; revision=29114
2009-07-16 08:27:18 +00:00
Anders Broman 91caa01090 Add /MP flag to make use of multi cores.
svn path=/trunk/; revision=29104
2009-07-15 20:55:31 +00:00
Guy Harris 9de2d18463 Don't dump out the raw link-layer type when noting that
KHciLoggerDatalinkTypeBCSP and KHciLoggerDatalinkTypeH5 aren't supported
- just explicitly say "BSCP" or "H5".

For unknown link-layer types, say "unknown or unsupported", as other
Wiretap modules do.

svn path=/trunk/; revision=28925
2009-07-02 20:10:05 +00:00
Michael Tüxen be7b89aa49 Patch from Alex Badea for Bug 3645.
This fix will be included in Wireshark 1.2.1.

svn path=/trunk/; revision=28924
2009-07-02 19:52:47 +00:00
Michael Tüxen 634a80b610 Add support for DLT_PPP_WITH_DIR. This fixes bug 3619.
Thanks for Tyson Key for reporting the issue.

svn path=/trunk/; revision=28877
2009-06-28 18:22:15 +00:00
Michael Tüxen 393214bc6b Stop loading a pcapng file with multiple section header blocks.
This fixes a bug reported by Tyson Key as a follow up of Bug 3560.
Also some cleanups and debug output improvements.

Thanks to Tyson Key for reporting the bug and providing a tracefile.
This fix will be included in Wireshark 1.2.1 and higher.

svn path=/trunk/; revision=28868
2009-06-28 11:09:24 +00:00
Michael Tüxen 7a728f6722 Accept file snaplen larger than WTAP_MAX_PACKET_SIZE,
text2pcap uses 102400.
This fixes bug 3620. Thanks to Tyson Key for reporting the bug
and providing capture files.
This fix should be included in Wireshark 1.2.1 and higher.

svn path=/trunk/; revision=28866
2009-06-27 18:50:13 +00:00
Michael Tüxen ce11d99c12 Fix copy/paste error introduced in rev. 28863.
Thanks to Guy for finding and reporting it. 

svn path=/trunk/; revision=28865
2009-06-27 18:10:10 +00:00
Michael Tüxen 1297ec0d61 Another cleanup. We are now back to Ulf's original
model of data handling.

svn path=/trunk/; revision=28864
2009-06-27 17:33:23 +00:00
Michael Tüxen dce1889fd7 Cleanup. Should be included in Wireshark 1.2.1 and higher to keep
merging future bug fixes simple.

svn path=/trunk/; revision=28863
2009-06-27 16:08:18 +00:00
Michael Tüxen a41d93603c Add support for writing pcapng files with multiple
encapsulations.
This fixes a bug reported by Sake during the
Sharkfest 09. Thanks for providing a
Netscreen tracefile with multiple link layer
types.
This patch will be included in Wireshark 1.2.1
and higher.

svn path=/trunk/; revision=28862
2009-06-27 15:20:44 +00:00
Michael Tüxen 6ce8546ecd This patch
* adds an encapsulation argument to pcap_write_phdr.
* writes the pseudo header when writing pcapng files.

This fixes a bug where you could not write pcapng files
when using encapsulations requiring pseudo headers.

svn path=/trunk/; revision=28859
2009-06-27 12:41:06 +00:00
Michael Tüxen 11a65d398b If all interfaces use the same encapsulation, use
this a the file encapsulation.

This fixes a bug where you can not save a file
in libpcap format when you captured it as a
pcapng one.

This fix will be scheduled for Wireshark 1.2.1
and higher.

svn path=/trunk/; revision=28858
2009-06-27 12:14:18 +00:00
Michael Tüxen 267df8e183 This commit
* adds an encap argument to pcap_process_pseudo_header.
* adds support for reading pseudo headers.
It fixes Bug 3560.
Thanks to Tyson Key for reporting the bug and providing
trace files. This fix will be scheduled for inclusion in
Wireshark 1.2.1 and higher.

svn path=/trunk/; revision=28857
2009-06-27 11:39:47 +00:00
Michael Tüxen f15cdff759 Disable debug output.
svn path=/trunk/; revision=28851
2009-06-26 15:25:22 +00:00
Michael Tüxen b5d3abb77b * Allocate enough memory for reading a packet.
* Initialize pseudoheader.
* Add some input validation / protection code.
* Fix some return values.
* Clean up some whitespaces.

This fixes Bug 3565. Thanks to Tyson Key how reported
the issue and provided capture files for debugging.

This fix is scheduled for inclusion in Wireshark 1.2.1
and higher.

svn path=/trunk/; revision=28850
2009-06-26 15:08:04 +00:00
Jaap Keuter 479b1ee737 From Duncan Salerno:
Ensure dct3trac packets never longer than 23 bytes.

svn path=/trunk/; revision=28838
2009-06-24 20:27:58 +00:00
Michael Tüxen 5562e6e8cf Improve heuristic for packetlogger file format detection.
svn path=/trunk/; revision=28809
2009-06-22 12:13:12 +00:00
Michael Tüxen 2f2c22c0c0 Add protection code to avoid crashed when .erf files
are wrongly identified as packetlogger ones.
Will be scheduled for 1.2.1.

svn path=/trunk/; revision=28808
2009-06-22 11:45:28 +00:00
Michael Tüxen 98a4696773 Fix for bug 3539: Address as signess issue for fcs_len.
Bugfix scheduled for 1.2.1.

svn path=/trunk/; revision=28768
2009-06-18 18:43:36 +00:00
Michael Tüxen 47fd39c73d Clean up a comment.
svn path=/trunk/; revision=28763
2009-06-17 00:46:38 +00:00
Michael Tüxen cb678fdcfd Whitespace cleanups.
svn path=/trunk/; revision=28757
2009-06-16 05:03:33 +00:00
Stig Bjørlykke fbb5b30ceb Support per packet dumping in wtap_encap_string() and wtap_encap_short_string().
svn path=/trunk/; revision=28752
2009-06-16 03:16:55 +00:00
Gerald Combs f7d80a113c From Ben Winslow via bug 3535:
Because Lucent/Ascend equipment will sometimes omit the hex dump for a packet
or send two headers followed by two hex dumps, Wireshark needs to be very
lenient when parsing a Lucent/Ascend trace.  On a busy access server, a packet
like this is pretty likely to appear within a few minutes.

svn path=/trunk/; revision=28749
2009-06-15 22:25:05 +00:00
Jörg Mayer 0d300bb6f5 Rename all of the ascend files:
That way we hopefully won't need the runlex.sh hack any
more. Also the ylwrap stuff is (hopefully) obsolete.

ascend.[hc]      -> ascendtext.[hc]
ascend-scanner.l -> ascend_scanner.l
ascend-grammar.y -> ascend.y


svn path=/trunk/; revision=28744
2009-06-15 18:56:46 +00:00
Michael Tüxen 46ecce3d3d Fix bug reported by Stig: per packet encapsulation for
pcapng is supported.

svn path=/trunk/; revision=28736
2009-06-15 12:55:42 +00:00
Michael Tüxen 1d65c4b06f When writing pcapng files use correct interface index
of 0 instead of 1.

svn path=/trunk/; revision=28696
2009-06-11 11:24:29 +00:00
Bill Meier 67c1595232 Fix Windows build warning:
cl : Command line warning D9024 : unrecognized source file type 'ascend-grammar.h', object file assumed
cl : Command line warning D9027 : source file 'ascend-grammar.h' ignored


svn path=/trunk/; revision=28635
2009-06-04 12:27:09 +00:00
Stig Bjørlykke d9b405deb9 Optimized check if file is a nstrace file.
svn path=/trunk/; revision=28614
2009-06-02 20:59:48 +00:00
Guy Harris 7d5afce08f When doing a seek-and-read, don't check the packet size, as we don't
have it (we have the size with the pseudo-header length already
removed); we've already read the packet, and thus have already checked
it.  Fixes bug 3501.

svn path=/trunk/; revision=28607
2009-06-02 19:06:05 +00:00
Graeme Lunt baf910f105 Better heuristics for detecting BER encoded file, especially when initial tag is indefinite length encoded.
Checked that the I4B traces reported in http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1972 still loads as expected.


svn path=/trunk/; revision=28595
2009-06-02 14:36:42 +00:00
Stig Bjørlykke e12f08aa8b Corrected nspm_signature_version() again.
svn path=/trunk/; revision=28588
2009-06-02 09:23:48 +00:00
Stig Bjørlykke a9c95008c7 Avoid infinite loop in nspm_signature_version().
svn path=/trunk/; revision=28585
2009-06-02 08:47:45 +00:00
Guy Harris 0c95d973d3 No newlines in the additional-error-information string, please.
svn path=/trunk/; revision=28584
2009-06-02 07:18:18 +00:00
Stig Bjørlykke 496e7909ba Try Jakub's casting with GPOINTER_TO_INT().
svn path=/trunk/; revision=28579
2009-06-01 21:47:45 +00:00
Stig Bjørlykke 29839540cf Adding casts, take 3.
svn path=/trunk/; revision=28578
2009-06-01 21:26:50 +00:00
Stig Bjørlykke c5bba6e8d8 Adding casts, take 2.
svn path=/trunk/; revision=28576
2009-06-01 19:55:57 +00:00
Stig Bjørlykke c1ef7b0135 Added/Changed some more casts to build.
svn path=/trunk/; revision=28575
2009-06-01 19:46:40 +00:00
Stig Bjørlykke ffd02e49f5 Added some casts to remove some warnings.
svn path=/trunk/; revision=28573
2009-06-01 18:50:16 +00:00
Stig Bjørlykke c9b492a422 From Ravi Kondamuru via bug 3457:
Add support to read citrix netscaler capture file format.

From me:
- Renamed packet-ns.c to packet-nstrace.c
- Rewrote to not use "goto" in netscaler.c
- Moved dissecting of coreid

svn path=/trunk/; revision=28564
2009-06-01 17:23:38 +00:00