Pascal Quantin
dea61da3f6
Fix an infinite loop detected during fuzz testing
...
svn path=/trunk/; revision=52510
2013-10-10 20:19:27 +00:00
Guy Harris
ce17930dae
HAVE_LUA is for Lua, not some particular version thereof.
...
Reorder to match config.h.in (which is autogenerated).
svn path=/trunk/; revision=52509
2013-10-10 20:14:12 +00:00
Guy Harris
aeec217e18
Get rid of apparently-undefined and apparently-unused #defines.
...
svn path=/trunk/; revision=52508
2013-10-10 20:10:18 +00:00
Chris Maynard
37a7e3382c
Revert the changes made to resolve https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res).
...
#BACKPORT(1.10)
svn path=/trunk/; revision=52506
2013-10-10 19:48:37 +00:00
Anders Broman
d8231f1222
Try to make the build bot happy.
...
svn path=/trunk/; revision=52505
2013-10-10 19:30:29 +00:00
Anders Broman
d038be780b
Flag the addresses used in the trace which has been resolved and only add those to the list used to create the NRB.
...
svn path=/trunk/; revision=52504
2013-10-10 19:17:48 +00:00
Evan Huus
f29544f9df
Add a call to tvb_ensure_bytes_exist before we allocate memory based on our
...
offset+size, prevents attempts to allocate outrageous memory, fixing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9260
svn path=/trunk/; revision=52503
2013-10-10 17:44:55 +00:00
Gerald Combs
7a1a387d51
Fixes for the utility-launcher script.
...
If we don't find Wireshark.app in WIRESHARK_APP_DIR or
/Applications/Wireshark.app, look for it using its bundle ID. Add a
description of this process to the Read Me First files. Look for
executables in the right subdirectory depending on our UI flavor.
Make sure we don't add GTK+-specific items to the app bundle if we're
using Qt.
svn path=/trunk/; revision=52502
2013-10-10 17:30:56 +00:00
Jörg Mayer
689618cd85
Build qtshark by default, use qt5 by default. To turn
...
off building qtshark do "cmake ... -DBUILD_qtshark=OFF ..."
or change your local copy of CMakeOptions.txt
Small update to README.cmake (when running nmake I recommend
using /X- to avoid some (viewing) corruptions.
svn path=/trunk/; revision=52501
2013-10-10 17:28:50 +00:00
Chris Maynard
b80fad54e5
Fix a couple of typos.
...
svn path=/trunk/; revision=52500
2013-10-10 17:23:12 +00:00
Jörg Mayer
607e3297d3
Explain about setpath.bat
...
svn path=/trunk/; revision=52499
2013-10-10 17:16:21 +00:00
Jörg Mayer
7c25a38963
lib is required for linking, the dlls are in bin
...
And with this change, I'm finally able to run the executables in the
top builddir.
svn path=/trunk/; revision=52498
2013-10-10 17:13:02 +00:00
Evan Huus
a50dee3286
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246
...
Fix memory leaks and bad memory accesses in c1222 dissector.
From me: use realloc in a handoff function since it may get called multiple
times, and we only need the latest.
svn path=/trunk/; revision=52497
2013-10-10 16:18:49 +00:00
Evan Huus
1370003bee
From Marko Hrastovec via
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9239
Add dissection of Asterix category 008.
svn path=/trunk/; revision=52496
2013-10-10 16:07:20 +00:00
Chris Maynard
59c91b3c52
Safer to compare return value of tvb_reported_length_remaining() > 0 than != 0.
...
Convert tabs to spaces.
svn path=/trunk/; revision=52495
2013-10-10 16:04:41 +00:00
Cal Turney
943356c9f4
"Expert Info (Error/Malformed) trying to fetch an unsigned integer with length 0" errors when an attempt is made to display the File Attributes within the FID subtree of SMB requests and responses. In addition, not all the options and masks were marked with PROTO_ITEM_SET_GENERATED(item) when appropriate to do so;
...
Fix1: The proto_tree_add_item() was changed to proto_tree_add_uint.
Fix2: "If (len==0) PROTO_ITEM_SET_GENERATED(item);" was added to dissect_nt_create_options_bits(), dissect_nt_share_access_bits(), dissect_smb_access_mask_bits(), dissect_nt_create_bits(), and dissect_file_ext_attr_bits().
svn path=/trunk/; revision=52494
2013-10-10 15:53:45 +00:00
Jeff Morriss
bcf51e8131
Fix the core dump reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9258 :
...
After calling wtap_close(), set the wth to NULL so we don't try to close it
again later. (The core only happens when tshark isn't keeping up with dumpcap's
file rotation.)
Wireshark still has a problem but it's a different one.
svn path=/trunk/; revision=52493
2013-10-10 14:53:19 +00:00
Jörg Mayer
36e0adfcc1
Generate setpath.bat to set the paths necessary for running
...
the generated binaries inside the build dir.
svn path=/trunk/; revision=52492
2013-10-10 13:37:15 +00:00
Jörg Mayer
526f7cf367
The path approach can't work this way: Trying to set an environment
...
variable of our parent process isn't going to work. Plan B is to write
this stuff into a file and manually run it once.
Hard code the QT5 search path on Windows for now.
svn path=/trunk/; revision=52489
2013-10-10 09:10:53 +00:00
Balint Reczey
7af36bb2db
Revert "Fix using fop from CMake"
...
This reverts commit r52484
svn path=/trunk/; revision=52488
2013-10-10 08:41:14 +00:00
Pascal Quantin
a77e3754c9
Slightly change heuristics
...
svn path=/trunk/; revision=52487
2013-10-10 08:15:55 +00:00
Pascal Quantin
ee0fc35c09
Add fragmentation support
...
svn path=/trunk/; revision=52486
2013-10-10 07:30:57 +00:00
Jörg Mayer
c3d138dca5
As the Qt build will not use portaudio, we don't need to
...
put portaudio flags into config.pri
svn path=/trunk/; revision=52485
2013-10-10 07:13:36 +00:00
Balint Reczey
6602789a48
Fix using fop from CMake
...
svn path=/trunk/; revision=52484
2013-10-10 05:02:50 +00:00
Guy Harris
aa57e00210
Fix signed vs. unsigned comparison warnings.
...
svn path=/trunk/; revision=52483
2013-10-09 22:30:59 +00:00
Martin Mathieson
60d0a97524
Don't update DRX state when preference is turned off
...
svn path=/trunk/; revision=52482
2013-10-09 22:10:15 +00:00
Pascal Quantin
f2f95a49c5
Update a comment
...
svn path=/trunk/; revision=52481
2013-10-09 21:59:41 +00:00
Anders Broman
61d0ac9dcf
Change the default UDP port to 0.
...
svn path=/trunk/; revision=52480
2013-10-09 21:36:03 +00:00
Gerald Combs
6a8ceca13a
Sometimes we need to @rpathify libraries from more than one directory.
...
Instead of trying to match libraries from $LIBPREFIX, exclude libraries
that aren't in well-known system paths and which haven't previously been
@rpathified.
svn path=/trunk/; revision=52479
2013-10-09 20:49:12 +00:00
Anders Broman
51d6f57fd7
Check if first char is printable.
...
svn path=/trunk/; revision=52478
2013-10-09 20:31:23 +00:00
Anders Broman
f678c0fd49
Try to fix
...
packet-rtpproxy.c:217: warning: comparison between signed and unsigned
svn path=/trunk/; revision=52477
2013-10-09 20:30:18 +00:00
Anders Broman
6ca246c95d
Make RTPProxy a newstyle dissector.
...
svn path=/trunk/; revision=52476
2013-10-09 20:14:12 +00:00
Anders Broman
ca78b8f9dc
g_list_prepend() is faster.
...
svn path=/trunk/; revision=52475
2013-10-09 20:12:08 +00:00
Michael Mann
ba3e8e070a
Make column "filter name" prefixed with _ws. to be the same as other "*shark application filters" created in r52462.
...
svn path=/trunk/; revision=52474
2013-10-09 19:43:02 +00:00
Gerald Combs
576a16004b
When we display an error message in the interface list make sure it's
...
word-wrapped.
svn path=/trunk/; revision=52473
2013-10-09 17:58:39 +00:00
Guy Harris
de733af331
0xffffffffffff doesn't necessarily fit in an int, so use
...
G_GINT64_CONSTANT(). Make it unsigned while we're at it.
Clean up indentation.
svn path=/trunk/; revision=52472
2013-10-09 17:34:49 +00:00
Evan Huus
2693e1243e
Add some license headers after emailing the respective authors to confirm.
...
svn path=/trunk/; revision=52471
2013-10-09 17:30:50 +00:00
Evan Huus
4860e101c8
Slight simplification, inline a function only ever called once.
...
svn path=/trunk/; revision=52470
2013-10-09 17:24:16 +00:00
Evan Huus
7058b87833
From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9238
...
Add test for ANSI C12.22 decryption.
svn path=/trunk/; revision=52469
2013-10-09 17:21:30 +00:00
Anders Broman
32bc65aa8c
Try to make more efficient heuristick checks.
...
svn path=/trunk/; revision=52468
2013-10-09 16:20:54 +00:00
Cal Turney
16085e8616
If the capture is frame sliced at or beyond the TCP 20-byte fixed length portion of the TCP header and tcp_analyze_seq is enabled, TCP analysis is not conducted: As much of the options field as possible should be dissected and TCP analysis should be performed.
...
Patch was tested with snaplens of:
49 and 52: (TCP fixed header incomplete) TCP analysis NOT performed.
54: (Fixed header complete but entire options wfield was sliced off) TCP analysis ran and was OK.
64: (Fixed header complete but a portion of the options field was missing) Options were dissected to the extent possible. TCP analysis ran and was OK.
66: (Fixed header and options complete) TCP analysis ran and was OK.
70: (Fixed header and options complete plus 4 bytes) TCP analysis ran and was OK.
svn path=/trunk/; revision=52467
2013-10-09 16:13:18 +00:00
Pascal Quantin
6a67588654
From Peter Van Eynde via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9252 :
...
Fix WCCP fix hash buckets assignment info decoding
svn path=/trunk/; revision=52464
2013-10-09 16:07:24 +00:00
Michael Mann
65a8127832
Improve on r52458 and bugfix a few places where offset wasn't incrementing. Helps fix bug 9248 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9248 ) and should be good enough to backport.
...
svn path=/trunk/; revision=52463
2013-10-09 15:19:04 +00:00
Michael Mann
9ccefb0ecd
Prefix all "Wireshark application specific" display filters with a "_ws." to distinguish them from dissector filters.
...
This was committed now to get it into the 1.11 release so users can start getting used to the changed filter names.
svn path=/trunk/; revision=52462
2013-10-09 12:56:19 +00:00
Pascal Quantin
a56818ad87
Add an option (off by default) to force decoding of unknown USB control data as MBIM
...
svn path=/trunk/; revision=52461
2013-10-09 09:53:48 +00:00
Gerald Combs
de8242ef36
Fix a comment.
...
svn path=/trunk/; revision=52460
2013-10-09 00:03:14 +00:00
Gerald Combs
f54c08ed35
Add some QT_DIR checks.
...
svn path=/trunk/; revision=52459
2013-10-08 23:45:26 +00:00
Evan Huus
74501b2874
Hacky fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9248
...
Just break out of the loop if offset doesn't go up.
There's almost certainly a better fix - the dissector is weird, and I'm not sure
if all the _length_remaining() checks are important or legacy, and what affect
they have on this issue.
At the very least this will pacify the fuzzbots until somebody has time to
figure it out properly.
svn path=/trunk/; revision=52458
2013-10-08 23:16:53 +00:00
Evan Huus
d95d8d7851
Replace a strbuf with a much simpler strdup_printf since it was in fact only
...
modified in one place. Much reduces memory usage, and makes it clear that
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9248 is an infinite loop not
a memory problem.
svn path=/trunk/; revision=52457
2013-10-08 23:05:29 +00:00
Gerald Combs
b3c844fa64
Add an initial Qt configuration and makefile targets.
...
svn path=/trunk/; revision=52456
2013-10-08 23:03:56 +00:00