Commit Graph

1425 Commits

Author SHA1 Message Date
Martin Mathieson bb78c91111 Get rid of capture.catapult_dct2000, move start time of capture into file_externals instead.
Thanks Guy for helping to simplify this file!

svn path=/trunk/; revision=30708
2009-10-26 12:17:11 +00:00
Guy Harris 524d9c2b8b Global variables considered harmful - we don't want to rule out two
threads reading from two different wtap_t's in different threads.

file_externals_table considered unnecessary - a wtap_t has a member
specifically intended to point to private data.

Clean up indentation.

svn path=/trunk/; revision=30707
2009-10-26 09:36:53 +00:00
Martin Mathieson 64e4ee759d Formatting changes only.
svn path=/trunk/; revision=30704
2009-10-26 07:57:38 +00:00
Anders Broman d52f502b66 Fix:
Error: Found prohibited APIs in catapult_dct2000.c: sprintf,strcpy

svn path=/trunk/; revision=30701
2009-10-26 05:50:05 +00:00
Martin Mathieson 6dfb4d1f71 Add support for showing/filtering/resaving logged LTE strings.
svn path=/trunk/; revision=30700
2009-10-26 00:04:27 +00:00
Stig Bjørlykke 1f5b4f5864 Fixed data type for a buffer.
svn path=/trunk/; revision=30609
2009-10-18 21:29:44 +00:00
Stig Bjørlykke de88ead3bc Fixed data type for asciibuf.
svn path=/trunk/; revision=30608
2009-10-18 21:29:17 +00:00
Stig Bjørlykke 2b54a78378 Removed non-ASCII characters.
svn path=/trunk/; revision=30590
2009-10-18 08:02:28 +00:00
Stig Bjørlykke b7d116667f From Marton Nemeth:
Add the ability to open JPEG/JFIF files directly.

From me:
Some code cleanup + add new file to cmake.

svn path=/trunk/; revision=30588
2009-10-17 20:56:06 +00:00
Stig Bjørlykke 98fd179d82 (minor) Indent fix.
svn path=/trunk/; revision=30228
2009-10-01 10:52:01 +00:00
Stig Bjørlykke 1d87c60187 Removed an unneeded assignment.
svn path=/trunk/; revision=30215
2009-09-30 13:42:58 +00:00
Stig Bjørlykke 4bdf8638b5 Read nsecs as a signed value.
svn path=/trunk/; revision=30189
2009-09-29 07:44:40 +00:00
Guy Harris 7be78a2d55 Treat 13 as if it came from OpenBSD except on BSD/OS, so that if there
are any BSD/OS users still out there using Wireshark to read RFC 1483
ATM captures from BSD/OS, they can still do so, but all other users get
to read OpenBSD DLT_ENC captures, not just users *on* OpenBSD.

That also lets us simplify some hacks to deal with a link-layer type of
13 on Nokia IPSO captures.

svn path=/trunk/; revision=30159
2009-09-25 21:55:39 +00:00
Anders Broman 9ac672ca81 Update *.vcproj to visual studio 8
svn path=/trunk/; revision=30111
2009-09-24 05:11:47 +00:00
Stig Bjørlykke 2ed762be0e Build wiretap with cmake on OSX.
svn path=/trunk/; revision=30096
2009-09-23 17:53:55 +00:00
Jörg Mayer cf326e0304 More fixes for OSX - might work now :-)
svn path=/trunk/; revision=30093
2009-09-23 15:56:44 +00:00
Guy Harris aa33901ae3 We pass the file handle to snoop_read_shomiti_wireless_pseudoheader();
use that.

svn path=/trunk/; revision=29960
2009-09-17 03:00:20 +00:00
Guy Harris e1a486db4b We need an err_info argument to snoop_read_shomiti_wireless_pseudoheader,
as it might fill that in.

svn path=/trunk/; revision=29959
2009-09-17 02:59:26 +00:00
Guy Harris a5152449ab Do *NOT* skip the rest of the header by reading into a fixed-size buffer
on the stack! There is no guarantee that the header length won't cause a
buffer overflow - there could be a bug in some version of Surveyor
generating a bad file, there could be a future version of Surveyor that
has a really big pseudo-header, the file could've been written by
something other than Surveyor that has a bug in it, there could be a
file that's corrupted in transit, or there could be a deliberately
malformed packet trying to cause *Shark to execute arbitrary code.

Also, explicitly check for a too-short header length and fail with
WTAP_ERR_BAD_RECORD in that case.

Add some comments asking some questions about the header.

(The previous change was for bug 3856:

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

not bug 3865.)

svn path=/trunk/; revision=29958
2009-09-17 02:42:31 +00:00
Jeff Morriss e95fe37933 From Clay Jones via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3865 :
The Shomiti Wireless head was modified in a recent release such that wireshark
can no longer read Shomiti wireless capture files.

This new format is backwards compatible with the old format.

svn path=/trunk/; revision=29956
2009-09-17 02:12:08 +00:00
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
Stephen Fisher c4680240d9 Change my e-mail address
svn path=/trunk/; revision=28537
2009-05-31 05:55:15 +00:00
Jörg Mayer 18887f7b72 Resume work on CMake for Wireshark. Finally found and fixed a
few mistakes that I made earlier.

Current status: dumpcap still doesn't build
Next step: Add a ylwrap like workaround for flex misbehaviour.

svn path=/trunk/; revision=28518
2009-05-29 10:57:47 +00:00
Sake Blok dbc67fc367 Fix for bug 3469:
In Juniper NetScreen snoop output files, the encapsulation type of
traffic on ADSL interfaces can be ethernet or PPP. Check whether the
first 6 bytes of the data are the same as the destination mac-address
in the packet header. If they are, assume ethernet. If not, assume PPP.



svn path=/trunk/; revision=28471
2009-05-25 19:59:17 +00:00
Stig Bjørlykke f39d677ef9 Added missing daintree-sna.h to Makefile.
svn path=/trunk/; revision=28469
2009-05-25 06:57:12 +00:00
Stig Bjørlykke 5fa6b90f6b From Fred Fierling (bug 3486):
Added support for Daintree's Sensor Network Analyzer capture files.

svn path=/trunk/; revision=28463
2009-05-24 22:49:36 +00:00
Michael Tüxen 83aa6f473f From Aaron Turner: Use wtap_wtap_encap_to_pcap_encap() instead of
fixed mapping for ethernet only.

svn path=/trunk/; revision=28443
2009-05-22 07:33:58 +00:00
Gerald Combs 3c6b6dc1a3 From Kovarththanan Rajaratnam via bug 2680:
Currently Wireshark doesn't support saving
WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR files as btsnoop files.

svn path=/trunk/; revision=28442
2009-05-22 00:05:19 +00:00
Gerald Combs a37191cb07 From Kovarththanan Rajaratnam via bug 2676:
If a PCAP file containing WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR packets is saved,
it gets corrupted because the direction pseudo header isn't included.

svn path=/trunk/; revision=28441
2009-05-21 23:16:49 +00:00
Michael Tüxen 21fcdad106 One more debug output.
svn path=/trunk/; revision=28274
2009-05-05 05:58:21 +00:00
Michael Tüxen cd369fcbf8 Use a dynamic glib array instead of a static C array for
storing the interface specific data.

svn path=/trunk/; revision=28264
2009-05-03 17:43:41 +00:00
Michael Tüxen 9366841f60 Add support for multiple IDBs. They can used different encapsulations.
svn path=/trunk/; revision=28262
2009-05-03 15:47:41 +00:00
Michael Tüxen 2d894fdd24 Improve handling of if_tsresol option.
svn path=/trunk/; revision=28261
2009-05-03 15:09:23 +00:00
Michael Tüxen 6d0211be52 Use WTAP_FILE_TSPREC_NSEC as tsprecision. This makes it independent from the
interfaces. Convert other times appropriately.

svn path=/trunk/; revision=28257
2009-05-03 11:46:40 +00:00
Michael Tüxen 9447c434e9 Remove code that should have been removed by my last commit.
svn path=/trunk/; revision=28256
2009-05-03 10:38:41 +00:00
Michael Tüxen b9d34749e6 Use WTAP_ENCAP_PER_PACKET. This is an intermediate step towards supporting
multiple IDBs.

svn path=/trunk/; revision=28255
2009-05-03 09:56:53 +00:00
Michael Tüxen 3b23d3dbd5 Whitespace change.
svn path=/trunk/; revision=28252
2009-05-02 18:24:44 +00:00
Michael Tüxen accb3a9207 Fix the handling of non PB/EPB blocks after the initial SDB/IDB.
svn path=/trunk/; revision=28251
2009-05-02 17:10:01 +00:00
Guy Harris e637af376a pcap_to_wtap_map is not used outside wiretap/pcap-common.c, so make it
static.

svn path=/trunk/; revision=28186
2009-04-27 22:07:11 +00:00
Guy Harris 7876fb4ead Nettl format != libpcap format && nettl format != pcap-NG format.
Remove the stuff for nettl from the LINKTYPE_ <-> WTAP_ENCAP_ mapping
table.

svn path=/trunk/; revision=28185
2009-04-27 21:28:53 +00:00
Guy Harris a60cae6935 Move pseudo-header routines from libpcap.c to pcap-common.c, for use
with pcap-NG files.

svn path=/trunk/; revision=28184
2009-04-27 19:39:06 +00:00
Michael Tüxen fa8bb35715 Use named constant.
svn path=/trunk/; revision=28176
2009-04-27 11:52:14 +00:00
Guy Harris 18a3b0659c Have the libpcap and pcap-NG code share the LINKTYPE_-to-WTAP_ENCAP_
mapping table - they should be using the same values.  Share the mapping
routines as well.

svn path=/trunk/; revision=28173
2009-04-27 09:28:28 +00:00
Michael Tüxen c68e344284 Clean up some comments I forgot to remove.
svn path=/trunk/; revision=28154
2009-04-26 07:46:03 +00:00
Guy Harris a043d8482f Don't do pointer casting - some version of GCC complain about that.
svn path=/trunk/; revision=28153
2009-04-26 02:59:16 +00:00
Guy Harris f71921252e There's no guarantee that "ll" is the right modifier to use for
gint64/guint64 with GLib's formatting routines; use G_GINT64_MODIFIER
instead.

svn path=/trunk/; revision=28152
2009-04-25 21:06:09 +00:00
Michael Tüxen 94fc2641e7 - add support for interface statistic block
- distinguish between packet block and enhanced packet block
- fix a bug regarding the handling of unknown blocks

svn path=/trunk/; revision=28151
2009-04-25 19:11:35 +00:00
Bill Meier fa6acc7d55 vms.c: undo an incorrect const committed in SVN #28144.
svn path=/trunk/; revision=28146
2009-04-24 12:52:02 +00:00
Bill Meier 72ef03e60a [Trivial] Constify a few things
svn path=/trunk/; revision=28144
2009-04-24 12:16:01 +00:00
Stig Bjørlykke 98f592713c Improved reading Apple's PacketLogger files:
- Send last byte of header (type) and data to a packetlogger dissector
- Rewrite type to ACI channel in the dissector
- Direction is indirectly given from the PL type
- Dissect PacketLogger NewC and Info as text

svn path=/trunk/; revision=28141
2009-04-24 08:14:36 +00:00
Stig Bjørlykke 3fd6fbb69e Added PacketLogger to dump_open_table_base to be able to open pklg files
(and avoid crash).

svn path=/trunk/; revision=28137
2009-04-23 09:13:56 +00:00