Commit Graph

1164 Commits

Author SHA1 Message Date
Sake Blok 5c7b76b8a0 From Stephen Donnelly (bug 2359):
- add support for ERF files created with a snaplength
- tighten heuristics (rlen>=16, time_delta < 1 week)


svn path=/trunk/; revision=24929
2008-04-12 10:21:51 +00:00
Jaap Keuter f6bf2c9451 From Mark C. Brown:
Added support for HPVM (Integrity Virtual Machines) guest AVIO (Accelerated Virtual IO) 
driver IGSSN and 2nd generation 10 Gigabit Ethernet adapter AD386A driver ICXGBE.

svn path=/trunk/; revision=24926
2008-04-12 09:23:35 +00:00
Stephen Fisher 726a1caaf1 - Remove GLIB1 code
- Change ugly GLIB version checking statements to GLIB_CHECK_VERSION
- Remove ws_strsplit files because we no longer need to borrow GLIB2's
  g_strsplit code for the no longer supported GLIB1 builds


svn path=/trunk/; revision=24829
2008-04-07 05:22:54 +00:00
Martin Mathieson 2f5189f014 Allocate size of data pointed to (64 bits) rather than size of pointer to data...
svn path=/trunk/; revision=24765
2008-04-04 04:44:59 +00:00
Gerald Combs 68d23708bc From Stephen Donnelly via bug 2235:
This plugin implements a dissector for Infiniband. It is released 
under the GPL v2.

Rather than using say libpcap to capture raw (unframed) IP packets 
from near the top of an IPoIB stack, this plugin dissects link level
Infiniband frames.

Infiniband trace files can be read from Endace ERF format trace 
files, or from libpcap DLT_ERF files containing ERF TYPE_INFINIBAND 
records. There is currently no native DLT_INFINIBAND in libpcap.

Each record contains a hardware timestamp, capture metadata such as 
port Id, and a complete link level Infiniband frame starting from
the Local Route Header.

svn path=/trunk/; revision=24628
2008-03-14 17:47:53 +00:00
Gerald Combs 335927f46f From Hannes Kalber:
This patch adds some new ENCAP and FILE types for wiretap. It also adds new
entries to pcap_to_wtap_map[] to provide a mapping of the new types to some
pcap DLTs.

svn path=/trunk/; revision=24622
2008-03-14 00:01:51 +00:00
Anders Broman f9ad87dd7c From Owen Kirby :
IEEE 802.15.4 dissector and DLT_ type.

svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00
Jeff Morriss bc580e1aa0 All our programs link against glib so don't there's no need to link our libraries against it too. This should allow us to build Wireshark (with dynamic libs) with static glib (read: it should fix the OS X buildbot building with glib-1.2).
svn path=/trunk/; revision=24518
2008-03-01 12:14:38 +00:00
Jeff Morriss 810979a0b4 Add support for DLT_IPMB (199). The dissector for these packets is in http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1970 (pending review)
svn path=/trunk/; revision=24463
2008-02-25 21:55:41 +00:00
Jeff Morriss 0e62e093c1 From Peter via http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2291 : libwiretap uses glib so add it to LIBADD.
svn path=/trunk/; revision=24432
2008-02-22 20:42:35 +00:00
Stephen Fisher 831d85448a Really fix pcapng timestamp reading and writing this time.
svn path=/trunk/; revision=24398
2008-02-20 04:41:31 +00:00
Bill Meier 5b8da491d7 Add $Id$
svn path=/trunk/; revision=24382
2008-02-18 22:39:03 +00:00
Stig Bjørlykke 7f32e1b7d3 Cast secs and nsecs correct.
Fixed some indentation.

svn path=/trunk/; revision=24353
2008-02-16 11:52:56 +00:00
Stephen Fisher ee56c90fd0 Change if_tsaccur to if_tsresol and change timestamp reading/writing
routines to correctly follow the clarified PcapNg standard document.


svn path=/trunk/; revision=24349
2008-02-16 08:07:07 +00:00
Stig Bjørlykke e3c7039015 Add a cast.
svn path=/trunk/; revision=24307
2008-02-12 00:24:49 +00:00
Guy Harris c1e833bdef Do the time calculations with 64-bit integers, rather than in floating
point, so we don't have issues with numbers not being exactly
representable; that makes it less likely that the change described below
will change a time stamp if it's not fixing the time stamp (i.e., if
time_day is 0).

The Sniffer manual "Expert Sniffer(R) Network Analyzer Operations,
Release 5.50" says that a frame2_rec has a time stamp with an 8-bit
time_high field and an 8-bit time_day field.  Interpreting the time
stamp that way fixes the time stamps in at least some captures; see, for
example, bug 2251.

Fix/update some comments (for example, the Sniffer documentation is no
longer at that URL).

svn path=/trunk/; revision=24296
2008-02-10 18:29:05 +00:00
Bill Meier bad9f18d33 Fix (Sun) compiler warnings as reported by David Kirkby: Part 1
svn path=/trunk/; revision=24295
2008-02-09 23:35:28 +00:00
Stig Bjørlykke c6af1bfdd4 Removed some "statement not reached" warnings.
svn path=/trunk/; revision=24282
2008-02-07 12:14:40 +00:00
Stig Bjørlykke 609bb57097 Corrected some types.
svn path=/trunk/; revision=24280
2008-02-07 11:42:11 +00:00
Stig Bjørlykke 468475c996 Added btsnoop.h
svn path=/trunk/; revision=24269
2008-02-04 15:54:53 +00:00
Stig Bjørlykke ef625890aa From Shane Kearns (bug 2237):
Added support for Symbian OS btsnoop.

The bluetooth HCI layer in Symbian OS can be configured to log all packets to a
file.  The log format, "btsnoop" is based on the RFC1761 "snoop" format - but
differences in the header make it incompatible.

The btsnoop format supports logging of these formats:
"H1" (raw HCI packets without framing)
"H4" (HCI UART packets including packet type header)
"H5" (HCI 3 wire UART packets including framing)
"BCSP" (HCI bluecore serial protocol including framing)

"H1" and "H4" are section numbers in the original v1 bluetooth specifications,
but still used colloquially - wireshark's existing support for Linux bluez HCI
logs uses the "H4" name.

In practice, the "H1" format is used for H5,BCSP and USB HCI logs, as the HCI
packet logs are mainly useful for debugging higher layers, bluetooth profiles
and bluetooth applications.

From me:
Deleted some unused prototypes.
Mark an unused parameter.

svn path=/trunk/; revision=24263
2008-02-03 21:11:53 +00:00
Stig Bjørlykke 47d744b59d More rewrite of prohibited APIs (sprintf, strcpy, strcat).
svn path=/trunk/; revision=24258
2008-02-03 15:38:20 +00:00
Ulf Lamping 79fbb2a272 g_warning -> pcapng_debug and "switch it off" as default, so normal users won't be annoyed by debug messages
svn path=/trunk/; revision=24198
2008-01-26 14:08:51 +00:00
Jeff Morriss 75849c12f1 s/%ll/%" G_GINT64_MODIFIER "/g
svn path=/trunk/; revision=24181
2008-01-24 21:57:13 +00:00
Stig Bjørlykke d5d2e97b47 Fixed some more malloc -> g_malloc, free -> g_free, strdup -> g_strdup.
svn path=/trunk/; revision=24180
2008-01-24 19:30:43 +00:00
Stephen Fisher a3c2114fba Use WTAP_MAX_PACKET_SIZE in place of 65535 in sanity check for snap len
(although they are the same value right now)


svn path=/trunk/; revision=24159
2008-01-22 01:05:32 +00:00
Ulf Lamping 7c59586e56 as we have BSWAP64() now, at least read 64bit section_length (but currently unused)
svn path=/trunk/; revision=24149
2008-01-21 01:54:28 +00:00
Stephen Fisher 1cf84f3d27 Introduce BSWAP64() and use it in the pcapng code
svn path=/trunk/; revision=24142
2008-01-20 02:31:34 +00:00
Ulf Lamping 65a4daed1a Make it compile on Win32 ;-)
svn path=/trunk/; revision=24141
2008-01-19 12:34:43 +00:00
Stig Bjørlykke 75804cec1a Make it compile on OSX.
svn path=/trunk/; revision=24140
2008-01-19 12:22:44 +00:00
Ulf Lamping 39114205fe various enhancements:
- read simple packet block
- read various options
- jump over unknown block types
- more sanity checks

svn path=/trunk/; revision=24139
2008-01-19 12:09:00 +00:00
Ulf Lamping 31be5fa705 decode IDB options (if_tsaccur and if_fcslen)
svn path=/trunk/; revision=24133
2008-01-18 10:29:23 +00:00
Stephen Fisher 9a1c52db82 Add link to pcap-ng format specification and use #defines for hex values of
block types.


svn path=/trunk/; revision=24128
2008-01-18 00:59:30 +00:00
Jeff Morriss ed88c589b0 Add support for DLT_SCCP (SCCP without MTP2, MTP3, or any pseudo-header).
svn path=/trunk/; revision=24119
2008-01-17 17:55:38 +00:00
Stephen Fisher 1caef26fa4 Fix seek reading by adding the size of the block length at the end of the
block to the data offset.


svn path=/trunk/; revision=24083
2008-01-14 05:31:38 +00:00
Ulf Lamping 105a6009bd some minor updates
svn path=/trunk/; revision=24082
2008-01-13 22:26:11 +00:00
Stephen Fisher a98ff5a017 Add svn:eol-style native and svn:keywords Id
svn path=/trunk/; revision=24081
2008-01-13 21:10:09 +00:00
Stephen Fisher c352fb3832 Make pcapng.c compile on Unix (with gcc)
svn path=/trunk/; revision=24080
2008-01-13 20:48:36 +00:00
Ulf Lamping 4f565d1a4d add very experimental support for pcapng "PCAP Next Generation Dump File Format" - this is incomplete and buggy, be careful!
svn path=/trunk/; revision=24079
2008-01-13 20:05:07 +00:00
Guy Harris 3fb946dbec Get rid of extra blank lines at the end of the file.
svn path=/trunk/; revision=24054
2008-01-10 08:50:16 +00:00
Guy Harris 605e462b45 Use WTAP_ENCAP_ERF as the file encapsulation, as that's what we'd
otherwise use as the per-packet encapsulation.

The close routine does nothing; get rid of it - you don't *need* a close
routine (by default, the subtype_close pointer is null, which means that
nothing per-file-type is done when the file is closed).

Make the code to handle the length fields in the ERF header common,
rather than copying it to each group of record types.

svn path=/trunk/; revision=24053
2008-01-10 08:49:11 +00:00
Jeff Morriss f75249281d From Florent Drouin:
fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1727 (pppd format file
incorrectly detected as being an ERF file) by:

The file_seek() call has been replaced by a call to file_read(), so, when the
end of the file is reached and the current record is truncated, we have got an
error.
This solves the problem of bad file format detection.

Additionaly, the ERF heuristic has been improved.

svn path=/trunk/; revision=24051
2008-01-09 22:58:34 +00:00
Tomas Kukosa 831eaa39cb more buffer functions
svn path=/trunk/; revision=23956
2007-12-28 07:38:06 +00:00
Tomas Kukosa 1e229a76c7 export more buffer functions from wiretap
svn path=/trunk/; revision=23952
2007-12-27 13:35:44 +00:00
Jörg Mayer e7374fc016 _SOURCE has magic meaning and isn't to be used by non-wizards.
Aka: Newer autofoo tools broke because of the _SOURCE ending.

svn path=/trunk/; revision=23904
2007-12-17 23:35:02 +00:00
Stig Bjørlykke fa34d46851 From Fulko Hew:
1/ patches to support the libpcap/SITA format 'WTAP_ENCAP_SITA'.
2/ patches to the LAPB dissector to accept MLP (Multi-link protocol)
   (although MLP dissection has _not_ been added (yet)).
3/ New protocol dissectors for:
   a) SITA's WAN layer 0 status header,
   b) An airline protocol ALC,
   c) An airline (and other industry) protocol UTS.

These patches are submitted as a set since the new protocol dissectors are not
useful without the libpcap/SITA related changes, and there is no point in
having those changes without the additional dissectors.

This fixes bug/enhancement 2016.

svn path=/trunk/; revision=23885
2007-12-16 14:21:37 +00:00
Stig Bjørlykke 672659c0c2 From Marton Nemeth:
Error message when capturing too short WTAP_ENCAP_USB_LINUX type packets
contains a copy-paste typo.

From me:
Fix some addresses in AUTHORS.

svn path=/trunk/; revision=23882
2007-12-16 13:01:13 +00:00
Guy Harris a818a686ca wtap_process_pcap_packet() is gone; remove it from the list of exported
functions.

svn path=/trunk/; revision=23806
2007-12-08 03:57:04 +00:00
Guy Harris 9ea3c33ad5 Add .. to the directory in which to look for headers, just as is done
with automake/autoconf, so we pick up config.h.

svn path=/trunk/; revision=23805
2007-12-08 03:22:58 +00:00
Guy Harris 0ca5f6ace4 Get rid of wtap_process_pcap_packet(); it's no longer used. Get rid of
no-longer-needed wiretap/wtap-capture.h.

Clean up wiretap/libwiretap.vcproj (note: this isn't going to scale, if
it has to contain a list of all the files, as most committers will be
editing only Makefile.common files).

svn path=/trunk/; revision=23803
2007-12-08 00:10:33 +00:00