Commit Graph

1252 Commits

Author SHA1 Message Date
Martin Mathieson 887b68c64e Some context names now do include '-', so allow it.
svn path=/trunk/; revision=27562
2009-02-27 11:18:15 +00:00
Jaap Keuter b47e7619e6 From Mark C. Brown:
Added support for HPVM (Integrity Virtual Machines) guest AVIO (Accelerated Virtual IO) driver IGSSN.
Cleaned up the trace record checks.  
Made the default ethernet if the nettl subsystem is not recognized.

svn path=/trunk/; revision=27549
2009-02-25 23:19:56 +00:00
Bill Meier 388e05ed7a Add a cast to fix a VC6 compie warning
svn path=/trunk/; revision=27494
2009-02-21 21:44:03 +00:00
Stephen Fisher 18f3436e85 Add support for reading Apple's Bluetooth PacketLogger capture files to
wiretap.  Modify various other locations to accommodate the fact that
PacketLogger files do not specify the direction of packets. 


svn path=/trunk/; revision=27463
2009-02-16 07:24:04 +00:00
Anders Broman a8c964cd44 From Rolf Fiedler:
Add DPNSS link layer dissector, support EyeSDN Trace files with DPNSS.
(Removed a couple of c++ style comments).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3224

svn path=/trunk/; revision=27312
2009-01-27 21:13:26 +00:00
Bill Meier 8e885dd1df Update comment re the use of the flex statement '%option noline'
svn path=/trunk/; revision=27231
2009-01-14 20:50:39 +00:00
Martin Mathieson 89c72aba05 Fix a bug where a space character wasn't being written back to save files.
svn path=/trunk/; revision=27198
2009-01-08 16:29:15 +00:00
Tomas Kukosa 6d5e6889f9 get rid of few signed/unsigned mishmash warnings to have it with MSVC6 compilable
svn path=/trunk/; revision=27195
2009-01-08 13:28:30 +00:00
Bill Meier 9714809165 Fix what certainly looks like a bug: change a SEEK_SET to SEEK_CUR
svn path=/trunk/; revision=27181
2009-01-07 20:06:24 +00:00
Jaap Keuter 322d89cf15 From Duncan Salerno:
Added LAPDm protocol dissector, GSM Um layer, and wiretap support for dct3trace
captures, generated by gammu (many available at http://wiki.thc.org/gsm).

svn path=/trunk/; revision=27176
2009-01-07 07:21:31 +00:00
Bill Meier d7ae2fb2bb Addt'l fix for bug #1937: Fill in frame pseudo_header as req'd.
Also: comment out support for MTP_L2 and SSCOP (encapsulation types
WTAP_ENCAP_MTP2 & WTAP_ENCAP_ATM_PDUS) since I don't know how to
fill in the pseudo_headers required by packet-mtp2 and packet-atm.

svn path=/trunk/; revision=27172
2009-01-06 21:25:11 +00:00
Bill Meier 11042d0dd1 Fix a typo in a comment
svn path=/trunk/; revision=27164
2009-01-06 13:31:28 +00:00
Bill Meier 1e76a31b7a Use encap=WTAP_ENCAP_UNKNOWN if encap can't be determined from the file frame.
(The original code before SVN 27158 was correct).

svn path=/trunk/; revision=27159
2009-01-05 20:05:39 +00:00
Bill Meier 901627bfd8 Rework code somewhat; Fixes bug 1937 & various other issues.
Fixed: 
  Crash when reading a K12text file with one frame;
  Crash after selecting the last frame and then a previous frame
    after file open.
  Select of frame n (>1) immediately after file open incorrectly
    displayed the packet details & data from frame n+1.
  File ! Merge (for K12text files) did not work correctly.

Fixes:
  Essentially: clear all lexer state (look-ahead buffer, etc)
   for every file read. Also: Don't use global for keeping
   track of the current file position.
  Also: Handle *nix-style line endings as well as DOS-style.

svn path=/trunk/; revision=27158
2009-01-05 19:45:58 +00:00
Bill Meier 489eceddaf Fix some indentation
svn path=/trunk/; revision=27156
2009-01-04 16:45:34 +00:00
Bill Meier f281fabf7f Oops: Revert SVN #27152: There weren't actually any memory leaks ...
svn path=/trunk/; revision=27155
2009-01-04 16:28:48 +00:00
Bill Meier e8cc3f500a Fix a few minor memory leaks...
svn path=/trunk/; revision=27152
2009-01-04 15:44:28 +00:00
Bill Meier a392d821db Minor rewording of a few comments; fix a few typos.
svn path=/trunk/; revision=27151
2009-01-04 14:21:54 +00:00
Guy Harris f6f84ae1dc Name changes to match libpcap name change of the corresponding DLT_
value.

svn path=/trunk/; revision=27113
2008-12-24 20:18:01 +00:00
Guy Harris d2cbbe0a2a Handle the new DLT_USB_LINUX_MMAP link-layer type.
svn path=/trunk/; revision=27099
2008-12-23 19:50:21 +00:00
Guy Harris 29a7854093 Move wtap_pcap_encap_to_wtap_encap() and wtap_wtap_encap_to_pcap_encap()
back to libwiretap for now, as it's inherently tied to reading libpcap
files; at some point we might want to have pcap-reading (and
pcap-ng-reading?) code in a separate library, for use by, for example,
dumpcap (and rawshark?).

svn path=/trunk/; revision=27076
2008-12-22 00:06:12 +00:00
Gerald Combs 3bb0df12f5 From babi: Fix three overflows (bugs 3150 and 3151).
From me: Use a #define for the RTP analysis field name lengths.

svn path=/trunk/; revision=27064
2008-12-20 00:07:21 +00:00
Guy Harris 916e8fc1bb Clarify that, in the Linux USB capture format, the header is always
followed by 8 bytes of "struct usb_device_setup_hdr", even if there's no
setup information, but it should be interpreted only if setup_flag is 0.
(That's what those mysterious 8 bytes are.)

svn path=/trunk/; revision=27043
2008-12-17 23:24:51 +00:00
Stig Bjørlykke 078e09692a Added support for open TNEF files directly.
No we can decode those winmail.dat files.

svn path=/trunk/; revision=26864
2008-11-27 16:40:45 +00:00
Jaap Keuter fe42d6af0a From yami:
The code in wiretap/wtap.c is not right. Because g_array_append_val should accept a value
of type 'struct encap_type_info' rather than a pointer to this type.

svn path=/trunk/; revision=26816
2008-11-20 20:16:07 +00:00
Anders Broman 95451b54f8 From Max Filippov:
patch to support IEE802.15.4 non-ASK PHY.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906

svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
Gerald Combs 62d20ccfb6 For libpcap captures with the DLT DLT_BLUETOOTH_HCI_H4, make sure we
initialize the P2P direction. This keeps Valgrind from complaining.

svn path=/trunk/; revision=26765
2008-11-13 00:36:52 +00:00
Stephen Fisher b380da2559 Patch from bug #2986: "Fixes and enhancements in pcapng reader"
svn path=/trunk/; revision=26556
2008-10-26 08:20:26 +00:00
Bill Meier 8afa208ffb Windows build: #include winsock2.h only when needed.
#include winsock2.h pulls in about 90 distinct .h files
and about 140 total .h files. 
Currently winsock2.h is (mostly unnecessarily) included
for each dissector via packet.h/wtap.h.
This patch removes #include winsock2.h from wtap.h and 
then includes winsock2.h (or windows.h) in the 
few specific places required. 
With this patch, my Windows Wireshark build takes 
about 30% less time.


svn path=/trunk/; revision=26535
2008-10-24 00:42:09 +00:00
Stig Bjørlykke 80b62e6728 Fixed a datatype to avoid a warning.
svn path=/trunk/; revision=26479
2008-10-16 13:36:37 +00:00
Martin Mathieson fb430597b7 Allow really long lines.
svn path=/trunk/; revision=26429
2008-10-13 16:24:42 +00:00
Jeff Morriss e801ff285c Fix for: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2926 :
provide a default case (returning an error) to prevent wiretap from asserting
out because we didn't set the packet encapsulation.

svn path=/trunk/; revision=26327
2008-10-01 13:57:41 +00:00
Anders Broman 637761d295 From Francesco Fusco:
Endace ERFII (extension header) support.

svn path=/trunk/; revision=26287
2008-09-29 16:20:24 +00:00
Gerald Combs 80e94e3ec3 Move wtap_pcap_encap_to_wtap_encap and wtap_wtap_encap_to_pcap_encap to
libwsutil.

svn path=/trunk/; revision=26233
2008-09-19 16:26:37 +00:00
Jeff Morriss 98fd7b71df Link libwireshark and wiretap against libwsutil. That was the original intent
of adding libwsutil but somehow I missed it/got it wrong.  This should solve
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677#c18

Also remove the _DEPENDENCIES lines in epan and wiretap (as was done in the
top-level Makefile in rev 25930) so that automake will automatically figure out
the dependencies for us.

Since the those 2 libraries now link against libwsutil, don't make every
executable link against the library.  (If this works I think we can
significantly trim the list of libraries the executables link against and just
let the libraries pull in what they need--which is, apparently, the point of
the --as-needed flag: http://www.gentoo.org/proj/en/qa/asneeded.xml ).

svn path=/trunk/; revision=26218
2008-09-16 19:24:25 +00:00
Jaap Keuter b95f7e92ae Fix for bug 2875:
Fix a final eth_fopen -> ws_fopen
When configuring with --without-zlib these functions need to have some parameters tagged _U_

svn path=/trunk/; revision=26212
2008-09-15 21:50:50 +00:00
Guy Harris ba292329e0 Suggest why we might have at least 3 different network subtypes for 802.11.
svn path=/trunk/; revision=26175
2008-09-11 03:37:16 +00:00
Guy Harris 6dba0c117b A network type of 2 appears to be similar to a network type of 1
(including 0's rather than an FCS in the packet).

svn path=/trunk/; revision=26174
2008-09-10 21:55:02 +00:00
Anders Broman 5d962c8c7d From Neil Piercy:
VC6 Build problem: wiretap/k12text.c includes unistd.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2851

svn path=/trunk/; revision=26161
2008-09-07 13:43:49 +00:00
Guy Harris 9d1b5335ac g_ascii_strdown() and g_ascii_strup(), unlike g_strdown() and g_strup(),
do *not* modify the string handed to them - they g_mallocate a new
string and return it.

Create routines that *do* ASCII-only case mapping in place, and use them
instead.

Clean up indentation.

svn path=/trunk/; revision=26131
2008-09-03 19:14:52 +00:00
Gerald Combs 85fb7e2305 _MSC_VERs 1400 and greater require manifests. Check against
MSC_VER_REQUIRED when we run mt.exe instead of checking for each
individual MSVC_VARIANT. This fixes the current buildbot test failures
on Windows, which resulted from a missing check for MSVC2008. This
also keeps us from having to mess with a bunch of makefiles when we add
support for new Visual C++ versions.

svn path=/trunk/; revision=26052
2008-08-21 18:12:47 +00:00
Gerald Combs 93e34803b5 Replace "guint" with "size_t" in a couple of places.
svn path=/trunk/; revision=26021
2008-08-14 18:47:38 +00:00
Anders Broman c1e67bc6d0 From Márton Németh:
Clean up the Linux USB pseudoheader dissection.

svn path=/trunk/; revision=25990
2008-08-12 20:24:50 +00:00
Anders Broman 3eadb385c3 From Alexey Neyman:
Implement dissector for IPMB (DLT_IPMB_LINUX, 209).

svn path=/trunk/; revision=25986
2008-08-12 04:44:35 +00:00
Luis Ontanon 42c3239a1a luis.ontanon@gmail.com => luis@ontanon.org
svn path=/trunk/; revision=25937
2008-08-05 21:03:46 +00:00
Gerald Combs 7d8e29f501 From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.
From me:

Instead of adding adns_config.h, place it a custom adns package in
wireshark-win32-libs. Update tools/win32-setup.sh accordingly.

Split the MSVC2008EE variant into MSVC2008 and MSVC2008EE, similar to
MSVC2005 and MSVC2005EE. We have to worry about vcredist_x86.exe in
both cases.

Add Pascal to AUTHORS.

Update the Developer's Guide.

svn path=/trunk/; revision=25921
2008-08-04 23:05:32 +00:00
Bill Meier df002f6b82 Remove -g abort from checkAPIs (for now) since existing issues not yet resolved.
svn path=/trunk/; revision=25759
2008-07-17 16:35:56 +00:00
Jaap Keuter 2665b689c1 From Stephen Donnelly:
ERF files can contain records of type TYPE_PAD. These records are not related
to captured packets, have a zero timestamp value and no associated packet data.
Normally TYPE_PAD records are stripped out during capture, but in rare cases
unstripped files may exist.
Previously wiretap/erf.c generated an 'unknown record encapsulation' error when
encountering TYPE_PAD records.
With this patch Wireshark skips over any TYPE_PAD records within ERF traces
files without reporting an error. TYPE_PAD records are not counted, displayed
or decoded.

svn path=/trunk/; revision=25733
2008-07-14 05:46:09 +00:00
Jeff Morriss ccd5751c19 packet-k12.c expects pseudo_header->k12.extra_info to be guchar so make it a unsigned
svn path=/trunk/; revision=25705
2008-07-11 16:37:21 +00:00
Jeff Morriss 9bd70e0d1d Don't cast a char[] into a guint32/64: the array may not be aligned correctly. This fixes a warning on Solaris/SPARC.
svn path=/trunk/; revision=25692
2008-07-09 20:16:24 +00:00