Commit Graph

1386 Commits

Author SHA1 Message Date
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
Stig Bjørlykke 50916b9174 Removed an unused variable.
svn path=/trunk/; revision=30891
2009-11-09 14:22:26 +00:00
Jörg Mayer 9ee31d1d0e cmake will now honor -Werror if configured (default: on)
svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
Guy Harris ce6bcff318 Note in comments that the dct2000_file_externals_t structure is used for
more than just dumping, indicate what stuff is used for dumping, and
note that it probably shouldn't be used for that (one should not have to
have a Catapult 2000 input file in order to write a Catapult 2000 output
file).

svn path=/trunk/; revision=30719
2009-10-26 19:20:50 +00:00
Guy Harris 6d6fc060cd Update URL for LANalyzer file format.
svn path=/trunk/; revision=30717
2009-10-26 18:41:54 +00:00
Martin Mathieson 5c33e9f525 Try to fix win64 buildbot. Both fgets() and gzgets() take an int for the length.
svn path=/trunk/; revision=30709
2009-10-26 13:38:23 +00:00
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