metze/wireshark/wip.git
10 years agoFrom Michael Labedzki, call data dissector instead if handle is NULL.
eapache [Tue, 5 Nov 2013 13:17:55 +0000 (13:17 +0000)]
From Michael Labedzki, call data dissector instead if handle is NULL.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53087 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9383
alagoutte [Tue, 5 Nov 2013 08:40:55 +0000 (08:40 +0000)]
From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9383
Incorrect FATTR4_SECURITY_LABEL value

We got this constant wrong.
See http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion2-dot-x-19 and http://marc.info/?l=linux-nfs&m=138359828516861&w=2

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53086 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoChange "4 space tabs" indentation to use "4 spaces";
wmeier [Tue, 5 Nov 2013 02:03:18 +0000 (02:03 +0000)]
Change "4 space tabs" indentation to use "4 spaces";
Clean up alignment of various structs & etc.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53085 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDeclare many value_string_arrays not used elsewhere as static;
wmeier [Mon, 4 Nov 2013 20:57:01 +0000 (20:57 +0000)]
Declare many value_string_arrays not used elsewhere as static;
IOW: Explicitly declare as global only those value_string_arrays
     used elsewhere.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53084 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago- Reenable /LARGEADDRESSAWARE on Windows platform
jmayer [Mon, 4 Nov 2013 20:29:29 +0000 (20:29 +0000)]
- Reenable /LARGEADDRESSAWARE on Windows platform
- Add a CMAKE_BUILD_TYPE default of RelWithDebInfo (Release with debug info),
  print the choice.
  This will pick up the previously used flags LINK_FLAGS and
  CMAKE_C_FLAGS and CMAKE_CXX_FLAGS but also pick up the variables postfixed
  by _<build-type>
- Remove Optimization (-O2) and debug (-g) flags from list of default flags
  as they are now automagically set by CMAKE_C_FLAGS_RELWITHDEBINFO etc.
  NOTE: This also needs to be done for the Windows flags, I just don't have
  a Win system to test on right now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53083 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago'#if 0' numerous unused value string arrays.
wmeier [Mon, 4 Nov 2013 20:22:54 +0000 (20:22 +0000)]
'#if 0' numerous unused value string arrays.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53082 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPromote/update the entry for robionekenobi.
wmeier [Mon, 4 Nov 2013 20:09:13 +0000 (20:09 +0000)]
Promote/update the entry for robionekenobi.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53081 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPrint if_dropped
etxrab [Mon, 4 Nov 2013 19:38:20 +0000 (19:38 +0000)]
Print if_dropped

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53080 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Zoltán Lajos Kis:
etxrab [Mon, 4 Nov 2013 19:35:00 +0000 (19:35 +0000)]
From Zoltán Lajos Kis:

tidying some stuff.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53079 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)
wmeier [Mon, 4 Nov 2013 18:55:06 +0000 (18:55 +0000)]
From robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)

 Add more detail for SPI Open LPOO Structure
 Add more int_to_vals for INQ_Q_MGR reply
 Add more display detail for encoding value
 Some fix and display correction

Note: The patch used was the *original* patch submitted (plus some fixes by me).

That is: (https://bugs.wireshark.org/bugzilla/attachment.cgi?id=11962)
         plus my fixes

See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367 and comments for
details.

From me:
- Fix bug which resulted in a macro expansion fail on GCC
- Fix a -Wshadow error in packet-mq-pcf.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53078 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't show the channel information twice in the protocol root proto_item
martinm [Mon, 4 Nov 2013 15:10:58 +0000 (15:10 +0000)]
Don't show the channel information twice in the protocol root proto_item

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53077 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoEffectively remove the tree memory pool and port some of its behaviour to the
eapache [Mon, 4 Nov 2013 14:12:59 +0000 (14:12 +0000)]
Effectively remove the tree memory pool and port some of its behaviour to the
pinfo memory pool, they have exactly the same scope. Simplification and minor
performance win (one GHashTable we longer have to create/destroy on every
packet).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53076 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRevert r53073, by now the vast majority of dissector do declare the
jmayer [Mon, 4 Nov 2013 10:07:33 +0000 (10:07 +0000)]
Revert r53073, by now the vast majority of dissector do declare the
registration functions and if we want to standardize it makes more
sense to fix the remaining ones.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53075 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9373
alagoutte [Mon, 4 Nov 2013 08:59:48 +0000 (08:59 +0000)]
From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9373

ieee80211: Decode Radio Measurements (Action Frames)

The length of the fixed fields are dependent on the radio measurement
action. Before this patch, fields following the action code were
ignored, leading to wrong decoding results. This patch adds recognition
for the Radio Measurement action management frames as specified in
IEEE Std 802.11-2012.

From me:
* Rename some hf (Add ff_ in name)
* Link Margin and Transmit Power are signed
* Use always proto_tree_add_item (replace proto_tree_add_text)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53074 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove forward declarations of registration functions.
jmayer [Sun, 3 Nov 2013 22:12:48 +0000 (22:12 +0000)]
Remove forward declarations of registration functions.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53073 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPlease checkAPIs.pl script
pascal [Sun, 3 Nov 2013 19:36:36 +0000 (19:36 +0000)]
Please checkAPIs.pl script

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53072 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031 :
pascal [Sun, 3 Nov 2013 18:07:46 +0000 (18:07 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031 :
SIP contact-param parsing fails in case the last parameter includes a quoted string

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53071 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoTry to clarify the documentation for tvb_length_remaining() and tvb_reported_length_r...
cmaynard [Sun, 3 Nov 2013 18:02:17 +0000 (18:02 +0000)]
Try to clarify the documentation for tvb_length_remaining() and tvb_reported_length_remaining() based on Jörg's recommendation from bug 9263.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53070 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoNULL terminate a value_str
etxrab [Sun, 3 Nov 2013 17:04:13 +0000 (17:04 +0000)]
NULL terminate a value_str

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53069 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Zoltán Lajos Kis:
etxrab [Sun, 3 Nov 2013 16:59:11 +0000 (16:59 +0000)]
From Zoltán Lajos Kis:

dissect the rest of the messages.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53068 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSync remaining patches with latest SAMBA PIDL source per http://www.wireshark.org...
mmann [Sun, 3 Nov 2013 16:17:35 +0000 (16:17 +0000)]
Sync remaining patches with latest SAMBA PIDL source per wireshark.org/lists/wireshark-dev/201310/msg00217.html

0010-frsrpc-Regenerate-frsrpc-due-to-changes-in-the-pidl-.patch
0016-Regenerate-the-dnserver.patch

are now integrated, but modified to compile on Windows.  I suspect the PIDL generators may need to be updated to support this, otherwise regeneration will break the build on Windows again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53067 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoBluetooth: AVDTP: Add support for Content Protection type SCMS-T (and some minor...
mmann [Sun, 3 Nov 2013 15:25:52 +0000 (15:25 +0000)]
Bluetooth: AVDTP: Add support for Content Protection type SCMS-T (and some minor cleanup).  Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)

From Michal Labedzki

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53065 f5534014-38df-0310-8fa8-9805f1628bb7

10 years ago[Automatic manuf, services and enterprise-numbers update for 2013-11-03]
gerald [Sun, 3 Nov 2013 15:03:48 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-11-03]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53063 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix what appears to be an off-by-one error in the IMAP dissector, causing
eapache [Sun, 3 Nov 2013 14:22:53 +0000 (14:22 +0000)]
Fix what appears to be an off-by-one error in the IMAP dissector, causing
valgrind errors with the capture from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53062 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoHave rose_ctx_t passed into subdissectors instead of using pinfo->private_data.
mmann [Sun, 3 Nov 2013 12:57:58 +0000 (12:57 +0000)]
Have rose_ctx_t passed into subdissectors instead of using pinfo->private_data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53061 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix autoconf broken by last commit.
jmayer [Sun, 3 Nov 2013 12:39:50 +0000 (12:39 +0000)]
Fix autoconf broken by last commit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53060 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPass the name of the sed executable as an explicit argurment to
jmayer [Sun, 3 Nov 2013 12:22:39 +0000 (12:22 +0000)]
Pass the name of the sed executable as an explicit argurment to
runlex.sh (like it is done with LEX already). May fix a problem
on Windows with cmake.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53059 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Sun, 3 Nov 2013 11:19:10 +0000 (11:19 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53058 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
alagoutte [Sun, 3 Nov 2013 11:18:54 +0000 (11:18 +0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53057 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake Mac OS X buildbot happy (Missing _U_)
alagoutte [Sun, 3 Nov 2013 10:56:55 +0000 (10:56 +0000)]
Make Mac OS X buildbot happy (Missing _U_)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53056 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoHave asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors...
mmann [Sun, 3 Nov 2013 02:45:22 +0000 (02:45 +0000)]
Have asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors instead of using pinfo->private_data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53055 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPartially revert r53052 because hf_ fields aren't defined (or used)
mmann [Sat, 2 Nov 2013 21:06:07 +0000 (21:06 +0000)]
Partially revert r53052 because hf_ fields aren't defined (or used)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53054 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoReplace glib with wmem when constructing dynamic RADIUS fields. Fixes the memory
eapache [Sat, 2 Nov 2013 20:16:54 +0000 (20:16 +0000)]
Replace glib with wmem when constructing dynamic RADIUS fields. Fixes the memory
leaks reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9370

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53053 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoBluetooth: minor improvements. Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug...
mmann [Sat, 2 Nov 2013 20:10:51 +0000 (20:10 +0000)]
Bluetooth: minor improvements. Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)

1. AVDTP: Fix double decoded stream
2. AVDTP: Use items for logical block objects
3. HCI_USB use handoffed dissector handles instead of find_dissector()

From Michal Labedzki

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53052 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoBluetooth: Use dissector data instead of pinfo->private_data. Bug 7893 (https:/...
mmann [Sat, 2 Nov 2013 19:20:04 +0000 (19:20 +0000)]
Bluetooth: Use dissector data instead of pinfo->private_data.  Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)

From Michal Labedzki

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53051 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom bkpsu via bug 9374:
gerald [Sat, 2 Nov 2013 16:17:23 +0000 (16:17 +0000)]
From bkpsu via bug 9374:

Minor grammar error in the NSIS installer script messageBox for
"isRunning" section. "one is associated" should be changed to "one of
its associated"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53050 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRequire dissector_try_string to pass a data parameter to its subdissectors. There...
mmann [Sat, 2 Nov 2013 15:52:25 +0000 (15:52 +0000)]
Require dissector_try_string to pass a data parameter to its subdissectors.  There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53049 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix build (missing some _U_)
alagoutte [Sat, 2 Nov 2013 13:31:24 +0000 (13:31 +0000)]
Fix build (missing some _U_)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53048 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix warning found by fix-encodings-arg tool
alagoutte [Sat, 2 Nov 2013 13:16:19 +0000 (13:16 +0000)]
Fix warning found by fix-encodings-arg tool

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53047 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake checkAPIs Happy (Missing const for value_string)
alagoutte [Sat, 2 Nov 2013 13:12:56 +0000 (13:12 +0000)]
Make checkAPIs Happy (Missing const for value_string)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53046 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPrep a few more dissectors to receive their string data through dissector data.
mmann [Sat, 2 Nov 2013 13:05:58 +0000 (13:05 +0000)]
Prep a few more dissectors to receive their string data through dissector data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53045 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoget tcpinfo from dissector data, not pinfo->private_data
mmann [Sat, 2 Nov 2013 13:02:55 +0000 (13:02 +0000)]
get tcpinfo from dissector data, not pinfo->private_data

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53044 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Zoltán Lajos Kis:
etxrab [Sat, 2 Nov 2013 10:21:52 +0000 (10:21 +0000)]
From Zoltán Lajos Kis:

dissect multipart request and reply messages

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53043 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAllow json dissector to receive a string through dissector data and give dissector...
mmann [Sat, 2 Nov 2013 02:12:36 +0000 (02:12 +0000)]
Allow json dissector to receive a string through dissector data and give dissector data priority over pinfo->private_data (to discourage it's use)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53042 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAllow text-data dissector to receive a string through dissector data and give dissect...
mmann [Sat, 2 Nov 2013 01:36:53 +0000 (01:36 +0000)]
Allow text-data dissector to receive a string through dissector data and give dissector data priority over pinfo->private_data (to discourage it's use)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53041 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove rpc_defrag.h
mmann [Sat, 2 Nov 2013 01:15:13 +0000 (01:15 +0000)]
Remove rpc_defrag.h

Move the #defines to packet-rpc.h and pull the functions into packet-rpc.c since they aren't used by any dissectors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53040 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agolibcap is UN*X-only; libnl is Linux-only.
guy [Sat, 2 Nov 2013 01:12:30 +0000 (01:12 +0000)]
libcap is UN*X-only; libnl is Linux-only.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53039 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMark unused arguments.
guy [Sat, 2 Nov 2013 01:07:07 +0000 (01:07 +0000)]
Mark unused arguments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53038 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoYou have to cast void pointers to another type in C++; implicit
guy [Sat, 2 Nov 2013 00:50:24 +0000 (00:50 +0000)]
You have to cast void pointers to another type in C++; implicit
conversions aren't valid.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53037 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPass struct tcpinfo into all TCP subdissectors instead of through pinfo->private_data.
mmann [Sat, 2 Nov 2013 00:36:30 +0000 (00:36 +0000)]
Pass struct tcpinfo into all TCP subdissectors instead of through pinfo->private_data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53036 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAllow try_conversation_dissector() to pass data to subdissectors.
mmann [Fri, 1 Nov 2013 23:45:10 +0000 (23:45 +0000)]
Allow try_conversation_dissector() to pass data to subdissectors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53035 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRelease notes are done.
jmayer [Fri, 1 Nov 2013 23:40:11 +0000 (23:40 +0000)]
Release notes are done.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53034 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRevert SVN #53027: It gives compile warning on GCC (at least).
wmeier [Fri, 1 Nov 2013 21:39:23 +0000 (21:39 +0000)]
Revert SVN #53027: It gives compile warning on GCC (at least).
(No time right now to figure the problem out).

 CC       libdissectors_la-packet-mq-base.lo
In file included from packet-mq-base.c:32:0:
packet-mq.h:42:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_ext'
 #define DEF_VALSEXT(A)  value_string_ext GET_VALSV(A)_ext = VALUE_STRING_EXT_INIT(GET_VALSV(A))
                                                      ^
packet-mq-base.c:1301:1: note: in expansion of macro 'DEF_VALSEXT'
 DEF_VALSEXT(selector);
 ^
packet-mq.h:42:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_ext'
 #define DEF_VALSEXT(A)  value_string_ext GET_VALSV(A)_ext = VALUE_STRING_EXT_INIT(GET_VALSV(A))
                                                      ^
packet-mq-base.c:1495:1: note: in expansion of macro 'DEF_VALSEXT'
 DEF_VALSEXT(mqcmd);
 ^

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53033 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove a phrase which implies that tab widths other than 8 are OK.
wmeier [Fri, 1 Nov 2013 20:39:11 +0000 (20:39 +0000)]
Remove a phrase which implies that tab widths other than 8 are OK.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53030 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)
wmeier [Fri, 1 Nov 2013 20:13:15 +0000 (20:13 +0000)]
From robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)

Add more detail for SPI Open LPOO Structure
Add more int_to_vals for INQ_Q_MGR reply
Add more display detail for encoding value
Some fix and display correction

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53027 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Thomas Dreibholz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9368 :
morriss [Fri, 1 Nov 2013 20:06:22 +0000 (20:06 +0000)]
From Thomas Dreibholz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9368 :

Call AC_PROG_MKDIR_P so MKDIR_P is sure to be set.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53026 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoGeneral dissector cleanup.
mmann [Fri, 1 Nov 2013 18:29:29 +0000 (18:29 +0000)]
General dissector cleanup.

The original intent was to just deal with struct tcpinfo data, but after finding it was unnecessary (and somewhat limited dissection in COL_INFO), I took the cleanup a little farther. Sample traces from wiki and bug 5956 were very helpful in proving I didn't break anything.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53025 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9298 :
pascal [Fri, 1 Nov 2013 17:02:39 +0000 (17:02 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9298 :
Update manifest file so as to identify Windows 8.1 properly (see http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx for details)
Use manifest file to build tshark, rawshark and dumpcap

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53024 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoClarify which filter types can share the same name
pascal [Fri, 1 Nov 2013 16:00:58 +0000 (16:00 +0000)]
Clarify which filter types can share the same name

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53017 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9360 :
pascal [Fri, 1 Nov 2013 15:48:57 +0000 (15:48 +0000)]
From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9360 :
Fix IRC response command filter

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53016 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd generation of release notes.
jmayer [Fri, 1 Nov 2013 09:55:26 +0000 (09:55 +0000)]
Add generation of release notes.
Regenerate NEWS file

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53014 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove a comment about adding use of the sh version of the script.
jmayer [Fri, 1 Nov 2013 09:54:05 +0000 (09:54 +0000)]
Remove a comment about adding use of the sh version of the script.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53013 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix a typo that was never noticed
jmayer [Fri, 1 Nov 2013 09:53:17 +0000 (09:53 +0000)]
Fix a typo that was never noticed

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53012 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoIncrease PROTO_PRE_ALLOC_HF_FIELDS_MEM
etxrab [Thu, 31 Oct 2013 21:26:27 +0000 (21:26 +0000)]
Increase PROTO_PRE_ALLOC_HF_FIELDS_MEM

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53009 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMake declarations consistent, fix typos, remove tabs, use consistent indentation...
cmaynard [Thu, 31 Oct 2013 17:30:22 +0000 (17:30 +0000)]
Make declarations consistent, fix typos, remove tabs, use consistent indentation, wrap text at column 80, add modelines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53004 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUSB/PN532: Fix dissector to use new dissector *data instead of private_data. Bug...
mmann [Thu, 31 Oct 2013 15:02:50 +0000 (15:02 +0000)]
USB/PN532: Fix dissector to use new dissector *data instead of  private_data.  Bug 9333 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333)

From Michal Labedzki

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53003 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoBluetooth: SDP: Recognize attributes by record handle or by UUIDs in request. Bug...
mmann [Thu, 31 Oct 2013 14:35:22 +0000 (14:35 +0000)]
Bluetooth: SDP: Recognize attributes by record handle or by UUIDs in request.  Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327)

From Michal Labedzki

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53002 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agosb3_task_id_t is not used in any existing dissector and can't be passed to any other...
mmann [Thu, 31 Oct 2013 14:12:53 +0000 (14:12 +0000)]
sb3_task_id_t is not used in any existing dissector and can't be passed to any other (third-party) dissectors, so don't have it pollute pinfo->private_data.

Also, call_dissector shouldn't be under a tree.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53001 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoTest was the wrong way around
martinm [Thu, 31 Oct 2013 13:58:57 +0000 (13:58 +0000)]
Test was the wrong way around

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53000 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd licence information.
ruengeler [Thu, 31 Oct 2013 07:54:06 +0000 (07:54 +0000)]
Add licence information.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52999 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFrom Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9345
eapache [Thu, 31 Oct 2013 01:49:10 +0000 (01:49 +0000)]
From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9345

openSAFETY: Changes for better dissection of additional SADR and SN Fail
messages

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52998 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix up some macros.
gerald [Thu, 31 Oct 2013 01:08:36 +0000 (01:08 +0000)]
Fix up some macros.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52996 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd a data parameter to call_ber_oid_callback to be able to pass data to subdissector...
mmann [Thu, 31 Oct 2013 00:57:03 +0000 (00:57 +0000)]
Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new.

The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector.  For now, all calls to call_ber_oid_callback have the data parameter set to NULL.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52994 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSet the progress bar animation behavior to match other parts of the
gerald [Thu, 31 Oct 2013 00:05:59 +0000 (00:05 +0000)]
Set the progress bar animation behavior to match other parts of the
program.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52993 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoTry to make the animation a little more natural.
gerald [Thu, 31 Oct 2013 00:01:51 +0000 (00:01 +0000)]
Try to make the animation a little more natural.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52992 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMove the geometry shenanigans a bit further ahead in the startup
gerald [Wed, 30 Oct 2013 23:54:46 +0000 (23:54 +0000)]
Move the geometry shenanigans a bit further ahead in the startup
sequence. Fix some prefs logic.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52991 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix maximized geometry behavior on non-OS X systems.
gerald [Wed, 30 Oct 2013 23:23:24 +0000 (23:23 +0000)]
Fix maximized geometry behavior on non-OS X systems.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52990 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix a comparison.
gerald [Wed, 30 Oct 2013 23:14:11 +0000 (23:14 +0000)]
Fix a comparison.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52989 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd initial support for geometry settings in the main window.
gerald [Wed, 30 Oct 2013 22:39:52 +0000 (22:39 +0000)]
Add initial support for geometry settings in the main window.

In the current Qt startup sequence the main window + splash screen is
displayed before the main preferences are loaded which means we can't
immediately apply the correct geometry. For now, use an animation to
morph from the default to the saved geometry after the prefs are loaded.

Get rid of main_do_quit() (Qt) and main_window_exit() (Qt+GTK). It looks
like they were unused.

Add wsApp->isInitialized() and use it to see if we should exit() when
the main window is closed. Otherwise we won't shut the application down
and clean up properly.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52988 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoBAT has a Bouquet ID, no Service ID
martink [Wed, 30 Oct 2013 22:34:16 +0000 (22:34 +0000)]
BAT has a Bouquet ID, no Service ID

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52987 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoadd one more private data specifier
martink [Wed, 30 Oct 2013 22:18:55 +0000 (22:18 +0000)]
add one more private data specifier

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52986 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove an extraneous semicolon.
cmaynard [Wed, 30 Oct 2013 18:16:22 +0000 (18:16 +0000)]
Remove an extraneous semicolon.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52985 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAdd some documentation to hopefully help dissector writers avoid the problem
morriss [Wed, 30 Oct 2013 15:56:01 +0000 (15:56 +0000)]
Add some documentation to hopefully help dissector writers avoid the problem
in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 :

The string added to proto_tree_add_string*() must be NULL terminated.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52984 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoInitialise current_security to NULL, to avoid possibly using uninitialised
martinm [Wed, 30 Oct 2013 13:45:28 +0000 (13:45 +0000)]
Initialise current_security to NULL, to avoid possibly using uninitialised

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52983 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoGet rid of value_strings that appear to be a throwback to when ROHC appeared in this...
martinm [Wed, 30 Oct 2013 13:18:15 +0000 (13:18 +0000)]
Get rid of value_strings that appear to be a throwback to when ROHC appeared in this dissector

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52982 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoDon't call RRC dissector if should be ciphered. Take care to allow SecurityModeCompl...
martinm [Wed, 30 Oct 2013 12:58:03 +0000 (12:58 +0000)]
Don't call RRC dissector if should be ciphered.  Take care to allow SecurityModeComplete to be shown though (i.e. the next UL frame after security is configured)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52981 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoAllow string-based dissector tables to pass data between dissectors.
mmann [Wed, 30 Oct 2013 04:06:54 +0000 (04:06 +0000)]
Allow string-based dissector tables to pass data between dissectors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52980 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoReplace some proto_tree_add_string_format with proto_tree_add_item +
eapache [Wed, 30 Oct 2013 02:09:34 +0000 (02:09 +0000)]
Replace some proto_tree_add_string_format with proto_tree_add_item +
proto_tree_set_text - the string was not the important part, the formatting was.
We were passing the string directly from tvb_get_ptr, but this meant that if the
packet didn't contain a null-terminator we would run off the end. Since the
string comes straight from the packet, just let _add_item handle the length
calculations etc efficiently, and set the display later.

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

I'm a bit confused honestly why most of these are being set hidden after being
added and formatted, but at least there are no memory errors anymore.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52979 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoUpdate the ASN.1 generated dissectors that were missed as part of the patches in...
mmann [Wed, 30 Oct 2013 02:02:08 +0000 (02:02 +0000)]
Update the ASN.1 generated dissectors that were missed as part of the patches in bug 9344 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52978 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoWhen adding an entry to a dissector string table, take a copy of the pattern
eapache [Wed, 30 Oct 2013 01:42:11 +0000 (01:42 +0000)]
When adding an entry to a dissector string table, take a copy of the pattern
string (and pass g_free to g_hash_table_new_full to free it).

This means callers don't have to worry about the scope of the memory they pass
in, and fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9296

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52977 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoSet SVN properties.
morriss [Wed, 30 Oct 2013 00:43:46 +0000 (00:43 +0000)]
Set SVN properties.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52976 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoFix proto.c:4498: warning: 'compare_filter_name' defined but not used
etxrab [Tue, 29 Oct 2013 23:18:26 +0000 (23:18 +0000)]
Fix proto.c:4498: warning: 'compare_filter_name' defined but not used

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52975 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoOptimize proto_get_id_by_filter_name() by using the existing hastable for proto_filte...
etxrab [Tue, 29 Oct 2013 22:17:18 +0000 (22:17 +0000)]
Optimize proto_get_id_by_filter_name() by using the existing hastable for proto_filter_names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52972 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoMark an unused parameter as such
martinm [Tue, 29 Oct 2013 22:16:32 +0000 (22:16 +0000)]
Mark an unused parameter as such

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52971 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoif pointer==0, the section starts immediately
martink [Tue, 29 Oct 2013 21:50:21 +0000 (21:50 +0000)]
if pointer==0, the section starts immediately
don't add an empty fragment to the list

this should fix the asserts reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9325
and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8352

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52969 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoseparate function for dissecting the adaptation field
martink [Tue, 29 Oct 2013 21:40:09 +0000 (21:40 +0000)]
separate function for dissecting the adaptation field

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52967 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRevert r52905 and r52908: they're causing plenty of fuzz failures.
morriss [Tue, 29 Oct 2013 21:18:22 +0000 (21:18 +0000)]
Revert r52905 and r52908: they're causing plenty of fuzz failures.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 is tracking the fix.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52966 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove no-longer-used parameter.
morriss [Tue, 29 Oct 2013 21:16:50 +0000 (21:16 +0000)]
Remove no-longer-used parameter.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52965 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoPass T.38 data to subdissectors directly instead of using pinfo->private_data.
mmann [Tue, 29 Oct 2013 21:12:50 +0000 (21:12 +0000)]
Pass T.38 data to subdissectors directly instead of using pinfo->private_data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52964 f5534014-38df-0310-8fa8-9805f1628bb7

10 years agoRemove use of pinfo->private_data
mmann [Tue, 29 Oct 2013 20:04:50 +0000 (20:04 +0000)]
Remove use of pinfo->private_data

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52963 f5534014-38df-0310-8fa8-9805f1628bb7