e12f08aa8b
Corrected nspm_signature_version() again.
...
svn path=/trunk/; revision=28588
2009-06-02 09:23:48 +00:00
a9c95008c7
Avoid infinite loop in nspm_signature_version().
...
svn path=/trunk/; revision=28585
2009-06-02 08:47:45 +00:00
0c95d973d3
No newlines in the additional-error-information string, please.
...
svn path=/trunk/; revision=28584
2009-06-02 07:18:18 +00:00
496e7909ba
Try Jakub's casting with GPOINTER_TO_INT().
...
svn path=/trunk/; revision=28579
2009-06-01 21:47:45 +00:00
29839540cf
Adding casts, take 3.
...
svn path=/trunk/; revision=28578
2009-06-01 21:26:50 +00:00
c5bba6e8d8
Adding casts, take 2.
...
svn path=/trunk/; revision=28576
2009-06-01 19:55:57 +00:00
c1ef7b0135
Added/Changed some more casts to build.
...
svn path=/trunk/; revision=28575
2009-06-01 19:46:40 +00:00
ffd02e49f5
Added some casts to remove some warnings.
...
svn path=/trunk/; revision=28573
2009-06-01 18:50:16 +00:00
c9b492a422
From Ravi Kondamuru via bug 3457:
...
Add support to read citrix netscaler capture file format.
From me:
- Renamed packet-ns.c to packet-nstrace.c
- Rewrote to not use "goto" in netscaler.c
- Moved dissecting of coreid
svn path=/trunk/; revision=28564
2009-06-01 17:23:38 +00:00
c4680240d9
Change my e-mail address
...
svn path=/trunk/; revision=28537
2009-05-31 05:55:15 +00:00
18887f7b72
Resume work on CMake for Wireshark. Finally found and fixed a
...
few mistakes that I made earlier.
Current status: dumpcap still doesn't build
Next step: Add a ylwrap like workaround for flex misbehaviour.
svn path=/trunk/; revision=28518
2009-05-29 10:57:47 +00:00
dbc67fc367
Fix for bug 3469:
...
In Juniper NetScreen snoop output files, the encapsulation type of
traffic on ADSL interfaces can be ethernet or PPP. Check whether the
first 6 bytes of the data are the same as the destination mac-address
in the packet header. If they are, assume ethernet. If not, assume PPP.
svn path=/trunk/; revision=28471
2009-05-25 19:59:17 +00:00
f39d677ef9
Added missing daintree-sna.h to Makefile.
...
svn path=/trunk/; revision=28469
2009-05-25 06:57:12 +00:00
5fa6b90f6b
From Fred Fierling (bug 3486):
...
Added support for Daintree's Sensor Network Analyzer capture files.
svn path=/trunk/; revision=28463
2009-05-24 22:49:36 +00:00
83aa6f473f
From Aaron Turner: Use wtap_wtap_encap_to_pcap_encap() instead of
...
fixed mapping for ethernet only.
svn path=/trunk/; revision=28443
2009-05-22 07:33:58 +00:00
3c6b6dc1a3
From Kovarththanan Rajaratnam via bug 2680:
...
Currently Wireshark doesn't support saving
WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR files as btsnoop files.
svn path=/trunk/; revision=28442
2009-05-22 00:05:19 +00:00
a37191cb07
From Kovarththanan Rajaratnam via bug 2676:
...
If a PCAP file containing WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR packets is saved,
it gets corrupted because the direction pseudo header isn't included.
svn path=/trunk/; revision=28441
2009-05-21 23:16:49 +00:00
21fcdad106
One more debug output.
...
svn path=/trunk/; revision=28274
2009-05-05 05:58:21 +00:00
cd369fcbf8
Use a dynamic glib array instead of a static C array for
...
storing the interface specific data.
svn path=/trunk/; revision=28264
2009-05-03 17:43:41 +00:00
9366841f60
Add support for multiple IDBs. They can used different encapsulations.
...
svn path=/trunk/; revision=28262
2009-05-03 15:47:41 +00:00
2d894fdd24
Improve handling of if_tsresol option.
...
svn path=/trunk/; revision=28261
2009-05-03 15:09:23 +00:00
6d0211be52
Use WTAP_FILE_TSPREC_NSEC as tsprecision. This makes it independent from the
...
interfaces. Convert other times appropriately.
svn path=/trunk/; revision=28257
2009-05-03 11:46:40 +00:00
9447c434e9
Remove code that should have been removed by my last commit.
...
svn path=/trunk/; revision=28256
2009-05-03 10:38:41 +00:00
b9d34749e6
Use WTAP_ENCAP_PER_PACKET. This is an intermediate step towards supporting
...
multiple IDBs.
svn path=/trunk/; revision=28255
2009-05-03 09:56:53 +00:00
3b23d3dbd5
Whitespace change.
...
svn path=/trunk/; revision=28252
2009-05-02 18:24:44 +00:00
accb3a9207
Fix the handling of non PB/EPB blocks after the initial SDB/IDB.
...
svn path=/trunk/; revision=28251
2009-05-02 17:10:01 +00:00
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
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
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
fa8bb35715
Use named constant.
...
svn path=/trunk/; revision=28176
2009-04-27 11:52:14 +00:00
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
c68e344284
Clean up some comments I forgot to remove.
...
svn path=/trunk/; revision=28154
2009-04-26 07:46:03 +00:00
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
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
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
fa6acc7d55
vms.c: undo an incorrect const committed in SVN #28144 .
...
svn path=/trunk/; revision=28146
2009-04-24 12:52:02 +00:00
72ef03e60a
[Trivial] Constify a few things
...
svn path=/trunk/; revision=28144
2009-04-24 12:16:01 +00:00
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
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
bea4b58ec5
More file-offset fixes.
...
svn path=/trunk/; revision=28122
2009-04-22 04:33:49 +00:00
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
0293e07437
LLP64 fix.
...
svn path=/trunk/; revision=28120
2009-04-22 03:50:13 +00:00
5c224bdd74
Signed vs. unsigned fix.
...
svn path=/trunk/; revision=28119
2009-04-22 03:49:45 +00:00
ad33ca6c2f
Clean up some 64-bit issues.
...
svn path=/trunk/; revision=28117
2009-04-22 03:07:37 +00:00
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
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
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
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
51cf696142
Another iteration of 64-bit-support-by-successive-approximation.
...
svn path=/trunk/; revision=27690
2009-03-10 17:38:24 +00:00
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
2236109a82
More 64-bit fixes.
...
svn path=/trunk/; revision=27685
2009-03-09 22:37:55 +00:00
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
cc739fecb0
P64 fixes.
...
svn path=/trunk/; revision=27683
2009-03-09 21:18:55 +00:00
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
4a5e0ba2bc
More P64 changes.
...
svn path=/trunk/; revision=27641
2009-03-07 05:18:59 +00:00
6552d5d5bd
More P64 changes.
...
svn path=/trunk/; revision=27640
2009-03-07 05:13:44 +00:00
849186ae59
More P64 changes.
...
svn path=/trunk/; revision=27639
2009-03-07 05:13:12 +00:00
07addfdcea
More P64 changes.
...
svn path=/trunk/; revision=27638
2009-03-07 05:11:56 +00:00
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
e6ccfc6944
More P64 stuff.
...
svn path=/trunk/; revision=27636
2009-03-07 04:47:06 +00:00
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
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
887b68c64e
Some context names now do include '-', so allow it.
...
svn path=/trunk/; revision=27562
2009-02-27 11:18:15 +00:00
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
388e05ed7a
Add a cast to fix a VC6 compie warning
...
svn path=/trunk/; revision=27494
2009-02-21 21:44:03 +00:00
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
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
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
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
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
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
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
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
11042d0dd1
Fix a typo in a comment
...
svn path=/trunk/; revision=27164
2009-01-06 13:31:28 +00:00
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
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
489eceddaf
Fix some indentation
...
svn path=/trunk/; revision=27156
2009-01-04 16:45:34 +00:00
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
e8cc3f500a
Fix a few minor memory leaks...
...
svn path=/trunk/; revision=27152
2009-01-04 15:44:28 +00:00
a392d821db
Minor rewording of a few comments; fix a few typos.
...
svn path=/trunk/; revision=27151
2009-01-04 14:21:54 +00:00
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
d2cbbe0a2a
Handle the new DLT_USB_LINUX_MMAP link-layer type.
...
svn path=/trunk/; revision=27099
2008-12-23 19:50:21 +00:00
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
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
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
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
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
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
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
b380da2559
Patch from bug #2986 : "Fixes and enhancements in pcapng reader"
...
svn path=/trunk/; revision=26556
2008-10-26 08:20:26 +00:00
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
80b62e6728
Fixed a datatype to avoid a warning.
...
svn path=/trunk/; revision=26479
2008-10-16 13:36:37 +00:00
fb430597b7
Allow really long lines.
...
svn path=/trunk/; revision=26429
2008-10-13 16:24:42 +00:00
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
637761d295
From Francesco Fusco:
...
Endace ERFII (extension header) support.
svn path=/trunk/; revision=26287
2008-09-29 16:20:24 +00:00
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
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
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
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
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
Stig Bjørlykke