Commit graph

1288 commits

Author SHA1 Message Date
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
Guy Harris
bea4b58ec5 More file-offset fixes.
svn path=/trunk/; revision=28122
2009-04-22 04:33:49 +00:00
Guy Harris
c7d09027df ssize_t is UN*X-only; don't use it.
The header length, as processed by airopeekv9_process_header(), is never
0, so use 0, not -1, as the error return.

svn path=/trunk/; revision=28121
2009-04-22 03:57:37 +00:00
Guy Harris
0293e07437 LLP64 fix.
svn path=/trunk/; revision=28120
2009-04-22 03:50:13 +00:00
Guy Harris
5c224bdd74 Signed vs. unsigned fix.
svn path=/trunk/; revision=28119
2009-04-22 03:49:45 +00:00
Guy Harris
ad33ca6c2f Clean up some 64-bit issues.
svn path=/trunk/; revision=28117
2009-04-22 03:07:37 +00:00
Gerald Combs
15f33eecbf Disable warnings-as-errors for Flex-generated output. Add a couple of gsize
casts.

svn path=/trunk/; revision=28002
2009-04-08 18:08:25 +00:00
Gerald Combs
db3e983b04 Add a check to make sure we don't try to allocate a huge buffer. If
we get an improper buffer length, throw an error instead of
aborting. Clean up the debugging code.

svn path=/trunk/; revision=27918
2009-03-31 22:51:59 +00:00
Stig Bjørlykke
0258be0b05 From Jakub Zawadzki:
More remove checking for NULL before g_free().

svn path=/trunk/; revision=27728
2009-03-15 18:08:46 +00:00
Gerald Combs
0df88c651e Flex doesn't generate LLP64-compilable output. For the time being don't
use -WX when compiling ascend-scanner.c and k12text.c.

svn path=/trunk/; revision=27703
2009-03-11 18:48:34 +00:00
Gerald Combs
51cf696142 Another iteration of 64-bit-support-by-successive-approximation.
svn path=/trunk/; revision=27690
2009-03-10 17:38:24 +00:00
Gerald Combs
0b7885e04d ng_file_read and SnifferDecompress need to be able to return negative
values, so adjust accordingly.

svn path=/trunk/; revision=27688
2009-03-10 16:33:38 +00:00
Gerald Combs
2236109a82 More 64-bit fixes.
svn path=/trunk/; revision=27685
2009-03-09 22:37:55 +00:00
Gerald Combs
40f5a17d46 Convert a bunch of ints to size_t in ngsniffer.c, and make sure file_read
can accept size_t's.

svn path=/trunk/; revision=27684
2009-03-09 22:28:05 +00:00
Gerald Combs
cc739fecb0 P64 fixes.
svn path=/trunk/; revision=27683
2009-03-09 21:18:55 +00:00
Bill Meier
df62772320 Change a a remaining eth_fopen to ws_fopen (used only under an #if debug).
svn path=/trunk/; revision=27659
2009-03-08 16:28:20 +00:00
Guy Harris
4a5e0ba2bc More P64 changes.
svn path=/trunk/; revision=27641
2009-03-07 05:18:59 +00:00
Guy Harris
6552d5d5bd More P64 changes.
svn path=/trunk/; revision=27640
2009-03-07 05:13:44 +00:00
Guy Harris
849186ae59 More P64 changes.
svn path=/trunk/; revision=27639
2009-03-07 05:13:12 +00:00
Guy Harris
07addfdcea More P64 changes.
svn path=/trunk/; revision=27638
2009-03-07 05:11:56 +00:00
Guy Harris
b2408ca1a3 Squelch warnings - none of those strings will be so long that the
difference between an int and a gsize/size_t matters.

svn path=/trunk/; revision=27637
2009-03-07 05:11:15 +00:00
Guy Harris
e6ccfc6944 More P64 stuff.
svn path=/trunk/; revision=27636
2009-03-07 04:47:06 +00:00
Guy Harris
76582cf2e2 Some LLP64 work to get rid of warnings for Win64; this is also good for
LP64.

svn path=/trunk/; revision=27635
2009-03-07 04:40:14 +00:00
Gerald Combs
57dadc4664 More Windows compiler flag cleanups. Fix a problem with my last commit
that would break compilation for older compilers. Create a "DLL_LDFLAGS"
variable and use it in DLLs and plugins. Use PLUGIN_LDFLAGS and
DLL_LDFLAGS where needed. Don't force i386 code in the TPG plugin.

svn path=/trunk/; revision=27582
2009-03-02 21:33:11 +00:00
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