Commit graph

1190 commits

Author SHA1 Message Date
Guy Harris
3ff150d6d6 wtap_read() and wtap_seek_read(), and thus the functions that it calls,
are expected to return a g_mallocated error string; that's why they fill
in a gchar **, not a const gchar **.  g_strdup() the argument to
KERROR(), so it's g_mallocated.

svn path=/trunk/; revision=25398
2008-05-30 02:34:45 +00:00
Guy Harris
c0f20c9e07 Fix references to tcpdump-workers@tcpdump.org to refer to the new
address, tcpdump-workers@lists.tcpdump.org.

svn path=/trunk/; revision=25396
2008-05-30 01:47:57 +00:00
Guy Harris
e0ea5fe220 Fix the types of k12text_read() and k12text_seek_read() to match what
the types of read and seek_read routines in Wiretap are supposed to be,
and get rid of the casts of pointers to those functions (type problems
should be fixed, not papered over with casts, whenver possible).

svn path=/trunk/; revision=25393
2008-05-29 23:40:12 +00:00
Guy Harris
9ab8f5a907 Have iseries_parse_hex_string() take a "const char *" as its first
argument, as

	1) it doesn't modify the string that argument points to

and

	2) it's a buffer of "char".

Use g_ascii_xdigit_value() and put the values of the two bytes together
ourselves; strtoul() is a bit of overkill for two-hex-digit pairs. 
While we're at it, check for invalid hex digits, and for bytes where
only one hex digit is present.

svn path=/trunk/; revision=25392
2008-05-29 23:30:51 +00:00
Jeff Morriss
3251c05742 Always set pkt_encap, not just when we have the start date. This bug, around
since rev 17756, meant that attempts to read iSeries files would fail in the
"Make sure it [pkt_encap] is not WTAP_ENCAP_PER_PACKET" assertion in
wtap_read().

Also set file_encap to WTAP_ENCAP_ETHERNET (instead of WTAP_ENCAP_PER_PACKET)
since it seems that all the packets in iSeries files are Ethernet (or at least
this module currently only supports Ethernet).

svn path=/trunk/; revision=25388
2008-05-28 15:01:16 +00:00
Martin Mathieson
c6dc7911df Fix subtle bugs introduced by recent change to safer APIs.
I was counting the length without the terminating NULL, and didn't want one to be written to the string and copied into the file.








svn path=/trunk/; revision=25383
2008-05-27 10:24:25 +00:00
Guy Harris
47e7477f22 file_util.c isn't part of Wiretap any more.
svn path=/trunk/; revision=25357
2008-05-23 00:54:59 +00:00
Jeff Morriss
a5cee04fad Move the file utility functions from wiretap to libwsutil so that
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.

While doing that, rename the eth_* functions to ws_*.

svn path=/trunk/; revision=25354
2008-05-22 15:46:27 +00:00
Jeff Morriss
3803a5ed0d Use the correct name for libwsutil
svn path=/trunk/; revision=25332
2008-05-20 21:58:11 +00:00
Jeff Morriss
58459d3fba Create a new "Wireshark utility" library and move the mpeg-audio stuff from
wiretap to this new libwsutil.  This solves
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark
no longer depend on libwiretap.

svn path=/trunk/; revision=25330
2008-05-20 21:51:01 +00:00
Jeff Morriss
73c7570102 Undo rev 24518 and (re)fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2291 .
svn path=/trunk/; revision=25327
2008-05-20 14:30:01 +00:00
Martin Mathieson
ec60070b2c Enable FP R7 support.
This commit adds a header file needed by my PDCP dissector.
(not yet ready to be added).

svn path=/trunk/; revision=25326
2008-05-20 10:08:28 +00:00
Tomas Kukosa
cfc4122876 do not use * wildcard which is not supported by Windows commandline
svn path=/trunk/; revision=25299
2008-05-14 10:25:18 +00:00
Anders Broman
b48924f9d5 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25288
2008-05-13 19:05:35 +00:00
Anders Broman
bf75c5fed2 From: Luis Ontanon
Fix errors from checkapi.

svn path=/trunk/; revision=25287
2008-05-13 19:05:03 +00:00
Martin Mathieson
7e40100fb3 From Anders: Checkapi enabled for wiretap and more functions converted.
svn path=/trunk/; revision=25257
2008-05-08 09:37:11 +00:00
Martin Mathieson
723f40845e Use g_strlcpy() rather than strcpy(), strncpy().
svn path=/trunk/; revision=25256
2008-05-08 09:17:04 +00:00
Anders Broman
6d91aae2e1 strncpy -> g_strlcpy
svn path=/trunk/; revision=25254
2008-05-08 05:16:33 +00:00
Anders Broman
3d39efc2c3 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25248
2008-05-07 05:26:40 +00:00
Anders Broman
e7cc1ee2aa Add checkapi target.
svn path=/trunk/; revision=25245
2008-05-06 06:18:26 +00:00
Bill Meier
0d4b874b44 Bug 2493: Fix (Part 2):
To prevent Windows compiler errors when using flex 2.5.35.
 Fixes "missing unistd.h" and yywrap "mismatched parameter" warnings
 [Upcoming Part 3: ignore 'signed /unsigned mismatch' errors]

svn path=/trunk/; revision=25173
2008-04-25 17:40:29 +00:00
Guy Harris
b821b38b10 Expand and clean up the descriptions of the new WTAP_ENCAP values.
svn path=/trunk/; revision=25163
2008-04-24 00:14:18 +00:00
Guy Harris
5738a44654 Clean up indentation. There is no guarantee that tabs will appear
every 4 spaces or every 8 spaces, so just use spaces.

svn path=/trunk/; revision=25162
2008-04-24 00:08:19 +00:00
Jaap Keuter
632a3b791c The constants are there, now they need real names.
svn path=/trunk/; revision=25159
2008-04-23 21:35:36 +00:00
Anders Broman
155cb22957 From Hannes Kälber:
new WTAP_ENCAP files(X2E Xoraya serial frame and X2E Xoraya frame )
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2418

svn path=/trunk/; revision=25154
2008-04-23 20:23:09 +00:00
Stig Bjørlykke
7925fd5f2a From Rolf Fiedler (bug 2408):
This extends the EyeSDN wiretap module to be able to support:
- DSS1/Q.931
- PPP
- LAPB/X.25
- ATM raw cells
- SS7 MTP2

svn path=/trunk/; revision=25123
2008-04-20 11:53:31 +00:00
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