Commit graph

49254 commits

Author SHA1 Message Date
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
Evan Huus
69da562c83 Don't try and construct an OID string if the len is zero. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246

svn path=/trunk/; revision=52455
2013-10-08 21:12:06 +00:00
Jörg Mayer
0863791253 Try to set PATH on Windows to all required dlls/libs to allow
running the executables from the build tree without installation.
It doesn't really work yet but the troubleshooting has to wait
until either I've gotten some sleep or someone else fixes it.

svn path=/trunk/; revision=52454
2013-10-08 20:41:57 +00:00
Gerald Combs
69473b4645 Use a plain package name even if we're building with GTK3. Hopefully
we're beyond the "experimental" stage now.

svn path=/trunk/; revision=52453
2013-10-08 20:21:36 +00:00
Gerald Combs
b505bb7db6 Add notes about Qt, wmem, and bug 9242.
svn path=/trunk/; revision=52452
2013-10-08 18:25:10 +00:00
Anders Broman
5b3f870236 Add 3GPP AVP 533 - 537
svn path=/trunk/; revision=52451
2013-10-08 18:17:45 +00:00
Martin Mathieson
795dbb7032 Separate state struct into separate config and running_state structs. Also, mod startOffset when working out if short cycle onDuration should be started
svn path=/trunk/; revision=52450
2013-10-08 17:13:34 +00:00
Evan Huus
2553de177d From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9245
Fix test suite so that it doesn't attempt to use color if ncurses is not
installed.  This came up when I attempted to use the test suite under Windows
with cygwin installed but not ncurses.  The result is not entirely broken but
the error messages saying that "tput is not a valid command" make the menus and
results difficult to read.

svn path=/trunk/; revision=52449
2013-10-08 15:09:59 +00:00
Evan Huus
54c558fdfc Reorganize handling of incomplete fragments slightly. The logic hasn't changed
much, but I think this way's a little clearer, and it made it much easier to
figure out where the memory leak was.

Fixes the leaks from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9243

svn path=/trunk/; revision=52448
2013-10-08 15:05:45 +00:00
Martin Kaiser
8a9e9de7bf mpeg pes private data is 16 bytes long, see iso 13818-1
svn path=/trunk/; revision=52447
2013-10-08 11:23:22 +00:00
Anders Broman
c75a0a639b Add information about the IANA assigned UDP port.
svn path=/trunk/; revision=52446
2013-10-08 06:10:26 +00:00
Evan Huus
56d8797c9e Don't try and fetch the repeat value of slot 0, since it makes us underflow the
array we're accessing.

Fixes the uninitialized value errors in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9243

svn path=/trunk/; revision=52445
2013-10-08 01:09:51 +00:00
Martin Mathieson
7c507318b8 Starting to debug DRX support
svn path=/trunk/; revision=52443
2013-10-07 21:57:07 +00:00
Gerald Combs
9f45bac313 Try to fix building the GTK flavor OS X app.
svn path=/trunk/; revision=52442
2013-10-07 19:37:22 +00:00
Jeff Morriss
df1b8d3d96 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 :
Debian still uses XPMs for their menu system[1] so distribute wsicon32.xpm in
the source tarball again (reverting part of r48565).  This is the icon that
debian/wireshark.menu refers to.

[1] http://lintian.debian.org/tags/menu-icon-not-in-xpm-format.html

svn path=/trunk/; revision=52441
2013-10-07 19:06:39 +00:00
Anders Broman
67e98ca737 From Erik Hugne:
tYN flag in named messages

Named messages are both used for connectionless
messaging and connection setup requests. A SYN
flag is now represented by the previously reserved
bit 18 in word 0 to differentiate named messages from
connection requests.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9241

svn path=/trunk/; revision=52440
2013-10-07 18:32:48 +00:00
Anders Broman
88130d4828 From Erik Hugne:
tipc: update discovery protocol header according to spec

Dissection of word 1 in the TIPC ndisc protocol header
is wrong. The field called "Broadcast ack no" should
be "Node Signature" (16 bits wide).
"Requested Links" is also wrong. This should actually be
5 bits reserved, followed by a 8 bit "Minor protocol version"
field

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9241

svn path=/trunk/; revision=52439
2013-10-07 18:29:57 +00:00
Evan Huus
ced66131ab From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9232

Use wmem_strbuf instead of manual string management in btsdp. Fixes fuzz
failure.

From me: minor tweak to make the patch apply to current trunk.

svn path=/trunk/; revision=52438
2013-10-07 16:34:00 +00:00
Martin Kaiser
daba11a478 dissect mpeg registration descriptor
svn path=/trunk/; revision=52437
2013-10-07 15:22:08 +00:00
Pascal Quantin
f9da278d6c MBIM data is transferred over CDC-Data interface class. Remove useless code.
svn path=/trunk/; revision=52436
2013-10-07 12:16:30 +00:00
Pascal Quantin
65f5c9a609 Dissect MBIM traffic over USB bulk
svn path=/trunk/; revision=52435
2013-10-07 10:15:04 +00:00
Pascal Quantin
f02d2f8705 Update function name in debug info
svn path=/trunk/; revision=52434
2013-10-07 08:14:15 +00:00
Anders Broman
1394b21b88 Try to fix Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 "Fix build for VS 2012 (MSVC_VARIANT==MSVC2012EE)"
svn path=/trunk/; revision=52433
2013-10-07 04:49:44 +00:00
Jörg Mayer
6013cbd4f5 Try to get gtk3 detection working via pkg-config
(not yet working).

svn path=/trunk/; revision=52432
2013-10-07 00:25:43 +00:00
Jörg Mayer
05908dea85 NEED_STRPTIME_H needs to be detected properly for windows.
Set it manually for now.

svn path=/trunk/; revision=52431
2013-10-07 00:21:23 +00:00
Evan Huus
0777f96c63 Another path and ordering tweak.
svn path=/trunk/; revision=52430
2013-10-06 23:39:16 +00:00
Jörg Mayer
84aebfb9dd Small update wrt the Windows build.
svn path=/trunk/; revision=52429
2013-10-06 23:35:39 +00:00
Evan Huus
087c885c66 More tweaking of test suite path variables, trying to make everything play
nicely on Windows and Linux both.

svn path=/trunk/; revision=52428
2013-10-06 23:29:59 +00:00
Jörg Mayer
0c25744c67 The code (at least) in dumpcap assumes that PCAP_CREATE is not
available on Windows - but we detect it in winpcap.

With this change dumpcap compiles and links


svn path=/trunk/; revision=52427
2013-10-06 22:17:24 +00:00
Jörg Mayer
f625f54e3f Remove an uncommented line: The file is now part of wsutil
svn path=/trunk/; revision=52426
2013-10-06 22:15:38 +00:00
Jörg Mayer
2e59bc7c89 Use the correct syntax for the shell
svn path=/trunk/; revision=52425
2013-10-06 22:14:37 +00:00
Jörg Mayer
f016e8c0a4 Libwireshark now links on windows with cmake
svn path=/trunk/; revision=52424
2013-10-06 21:25:44 +00:00
Pascal Quantin
e5d29e2bd4 Add support for relative OID to PER dissector
svn path=/trunk/; revision=52423
2013-10-06 21:23:39 +00:00
Jörg Mayer
30f8fb14df Undo r52382 for this file: We use a different solution on Windows
svn path=/trunk/; revision=52422
2013-10-06 21:07:58 +00:00
Jörg Mayer
32efaf8ac9 Add $Id$
svn path=/trunk/; revision=52421
2013-10-06 21:05:47 +00:00