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

svn path=/trunk/; revision=53081

6 years agoPrint if_dropped
Anders Broman [Mon, 4 Nov 2013 19:38:20 +0000 (19:38 -0000)]
Print if_dropped

svn path=/trunk/; revision=53080

6 years agoFrom Zoltán Lajos Kis:
Anders Broman [Mon, 4 Nov 2013 19:35:00 +0000 (19:35 -0000)]
From Zoltán Lajos Kis:

tidying some stuff.

svn path=/trunk/; revision=53079

6 years agoFrom robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)
Bill Meier [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: (
         plus my fixes

See: and comments for

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

svn path=/trunk/; revision=53078

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

svn path=/trunk/; revision=53077

6 years agoEffectively remove the tree memory pool and port some of its behaviour to the
Evan Huus [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

svn path=/trunk/; revision=53076

6 years agoRevert r53073, by now the vast majority of dissector do declare the
Jörg Mayer [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.

svn path=/trunk/; revision=53075

6 years agoFrom Peter Wu via
Alexis La Goutte [Mon, 4 Nov 2013 08:59:48 +0000 (08:59 -0000)]
From Peter Wu via

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)

svn path=/trunk/; revision=53074

6 years agoRemove forward declarations of registration functions.
Jörg Mayer [Sun, 3 Nov 2013 22:12:48 +0000 (22:12 -0000)]
Remove forward declarations of registration functions.

svn path=/trunk/; revision=53073

6 years agoPlease script
Pascal Quantin [Sun, 3 Nov 2013 19:36:36 +0000 (19:36 -0000)]
Please script

svn path=/trunk/; revision=53072

6 years agoFix :
Pascal Quantin [Sun, 3 Nov 2013 18:07:46 +0000 (18:07 -0000)]
Fix :
SIP contact-param parsing fails in case the last parameter includes a quoted string

svn path=/trunk/; revision=53071

6 years agoTry to clarify the documentation for tvb_length_remaining() and tvb_reported_length_r...
Chris Maynard [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.

svn path=/trunk/; revision=53070

6 years agoNULL terminate a value_str
Anders Broman [Sun, 3 Nov 2013 17:04:13 +0000 (17:04 -0000)]
NULL terminate a value_str

svn path=/trunk/; revision=53069

6 years agoFrom Zoltán Lajos Kis:
Anders Broman [Sun, 3 Nov 2013 16:59:11 +0000 (16:59 -0000)]
From Zoltán Lajos Kis:

dissect the rest of the messages.

svn path=/trunk/; revision=53068

6 years agoSync remaining patches with latest SAMBA PIDL source per
Michael Mann [Sun, 3 Nov 2013 16:17:35 +0000 (16:17 -0000)]
Sync remaining patches with latest SAMBA PIDL source per


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.

svn path=/trunk/; revision=53067

6 years agoBluetooth: AVDTP: Add support for Content Protection type SCMS-T (and some minor...
Michael Mann [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 (

From Michal Labedzki

svn path=/trunk/; revision=53065

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

svn path=/trunk/; revision=53063

6 years agoFix what appears to be an off-by-one error in the IMAP dissector, causing
Evan Huus [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

svn path=/trunk/; revision=53062

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

svn path=/trunk/; revision=53061

6 years agoFix autoconf broken by last commit.
Jörg Mayer [Sun, 3 Nov 2013 12:39:50 +0000 (12:39 -0000)]
Fix autoconf broken by last commit.

svn path=/trunk/; revision=53060

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

svn path=/trunk/; revision=53059

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

svn path=/trunk/; revision=53058

6 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sun, 3 Nov 2013 11:18:54 +0000 (11:18 -0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

svn path=/trunk/; revision=53057

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

svn path=/trunk/; revision=53056

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

svn path=/trunk/; revision=53055

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

svn path=/trunk/; revision=53054

6 years agoReplace glib with wmem when constructing dynamic RADIUS fields. Fixes the memory
Evan Huus [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

svn path=/trunk/; revision=53053

6 years agoBluetooth: minor improvements. Bug 7893 (
Michael Mann [Sat, 2 Nov 2013 20:10:51 +0000 (20:10 -0000)]
Bluetooth: minor improvements. Bug 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

svn path=/trunk/; revision=53052

6 years agoBluetooth: Use dissector data instead of pinfo->private_data. Bug 7893 (https:/...
Michael Mann [Sat, 2 Nov 2013 19:20:04 +0000 (19:20 -0000)]
Bluetooth: Use dissector data instead of pinfo->private_data.  Bug 7893 (

From Michal Labedzki

svn path=/trunk/; revision=53051

6 years agoFrom bkpsu via bug 9374:
Gerald Combs [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"

svn path=/trunk/; revision=53050

6 years agoRequire dissector_try_string to pass a data parameter to its subdissectors. There...
Michael Mann [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.

svn path=/trunk/; revision=53049

6 years agoFix build (missing some _U_)
Alexis La Goutte [Sat, 2 Nov 2013 13:31:24 +0000 (13:31 -0000)]
Fix build (missing some _U_)

svn path=/trunk/; revision=53048

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

svn path=/trunk/; revision=53047

6 years agoMake checkAPIs Happy (Missing const for value_string)
Alexis La Goutte [Sat, 2 Nov 2013 13:12:56 +0000 (13:12 -0000)]
Make checkAPIs Happy (Missing const for value_string)

svn path=/trunk/; revision=53046

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

svn path=/trunk/; revision=53045

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

svn path=/trunk/; revision=53044

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

dissect multipart request and reply messages

svn path=/trunk/; revision=53043

6 years agoAllow json dissector to receive a string through dissector data and give dissector...
Michael Mann [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)

svn path=/trunk/; revision=53042

6 years agoAllow text-data dissector to receive a string through dissector data and give dissect...
Michael Mann [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)

svn path=/trunk/; revision=53041

6 years agoRemove rpc_defrag.h
Michael Mann [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.

svn path=/trunk/; revision=53040

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

svn path=/trunk/; revision=53039

6 years agoMark unused arguments.
Guy Harris [Sat, 2 Nov 2013 01:07:07 +0000 (01:07 -0000)]
Mark unused arguments.

svn path=/trunk/; revision=53038

6 years agoYou have to cast void pointers to another type in C++; implicit
Guy Harris [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.

svn path=/trunk/; revision=53037

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

svn path=/trunk/; revision=53036

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

svn path=/trunk/; revision=53035

6 years agoRelease notes are done.
Jörg Mayer [Fri, 1 Nov 2013 23:40:11 +0000 (23:40 -0000)]
Release notes are done.

svn path=/trunk/; revision=53034

6 years agoRevert SVN #53027: It gives compile warning on GCC (at least).
Bill Meier [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'
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'

svn path=/trunk/; revision=53033

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

svn path=/trunk/; revision=53030

6 years agoFrom robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)
Bill Meier [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


svn path=/trunk/; revision=53027

6 years agoFrom Thomas Dreibholz via :
Jeff Morriss [Fri, 1 Nov 2013 20:06:22 +0000 (20:06 -0000)]
From Thomas Dreibholz via :

Call AC_PROG_MKDIR_P so MKDIR_P is sure to be set.

svn path=/trunk/; revision=53026

6 years agoGeneral dissector cleanup.
Michael Mann [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.

svn path=/trunk/; revision=53025

6 years agoFix :
Pascal Quantin [Fri, 1 Nov 2013 17:02:39 +0000 (17:02 -0000)]
Fix :
Update manifest file so as to identify Windows 8.1 properly (see for details)
Use manifest file to build tshark, rawshark and dumpcap

svn path=/trunk/; revision=53024

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

svn path=/trunk/; revision=53017

6 years agoFrom Peter Wu via :
Pascal Quantin [Fri, 1 Nov 2013 15:48:57 +0000 (15:48 -0000)]
From Peter Wu via :
Fix IRC response command filter

svn path=/trunk/; revision=53016

6 years agoAdd generation of release notes.
Jörg Mayer [Fri, 1 Nov 2013 09:55:26 +0000 (09:55 -0000)]
Add generation of release notes.
Regenerate NEWS file

svn path=/trunk/; revision=53014

6 years agoRemove a comment about adding use of the sh version of the script.
Jörg Mayer [Fri, 1 Nov 2013 09:54:05 +0000 (09:54 -0000)]
Remove a comment about adding use of the sh version of the script.

svn path=/trunk/; revision=53013

6 years agoFix a typo that was never noticed
Jörg Mayer [Fri, 1 Nov 2013 09:53:17 +0000 (09:53 -0000)]
Fix a typo that was never noticed

svn path=/trunk/; revision=53012

Anders Broman [Thu, 31 Oct 2013 21:26:27 +0000 (21:26 -0000)]

svn path=/trunk/; revision=53009

6 years agoMake declarations consistent, fix typos, remove tabs, use consistent indentation...
Chris Maynard [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.

svn path=/trunk/; revision=53004

6 years agoUSB/PN532: Fix dissector to use new dissector *data instead of private_data. Bug...
Michael Mann [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 (

From Michal Labedzki

svn path=/trunk/; revision=53003

6 years agoBluetooth: SDP: Recognize attributes by record handle or by UUIDs in request. Bug...
Michael Mann [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 (

From Michal Labedzki

svn path=/trunk/; revision=53002

6 years agosb3_task_id_t is not used in any existing dissector and can't be passed to any other...
Michael Mann [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.

svn path=/trunk/; revision=53001

6 years agoTest was the wrong way around
Martin Mathieson [Thu, 31 Oct 2013 13:58:57 +0000 (13:58 -0000)]
Test was the wrong way around

svn path=/trunk/; revision=53000

6 years agoAdd licence information.
Irene Rüngeler [Thu, 31 Oct 2013 07:54:06 +0000 (07:54 -0000)]
Add licence information.

svn path=/trunk/; revision=52999

6 years agoFrom Roland Knall via
Evan Huus [Thu, 31 Oct 2013 01:49:10 +0000 (01:49 -0000)]
From Roland Knall via

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

svn path=/trunk/; revision=52998

6 years agoFix up some macros.
Gerald Combs [Thu, 31 Oct 2013 01:08:36 +0000 (01:08 -0000)]
Fix up some macros.

svn path=/trunk/; revision=52996

6 years agoAdd a data parameter to call_ber_oid_callback to be able to pass data to subdissector...
Michael Mann [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.

svn path=/trunk/; revision=52994

6 years agoSet the progress bar animation behavior to match other parts of the
Gerald Combs [Thu, 31 Oct 2013 00:05:59 +0000 (00:05 -0000)]
Set the progress bar animation behavior to match other parts of the

svn path=/trunk/; revision=52993

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

svn path=/trunk/; revision=52992

6 years agoMove the geometry shenanigans a bit further ahead in the startup
Gerald Combs [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.

svn path=/trunk/; revision=52991

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

svn path=/trunk/; revision=52990

6 years agoFix a comparison.
Gerald Combs [Wed, 30 Oct 2013 23:14:11 +0000 (23:14 -0000)]
Fix a comparison.

svn path=/trunk/; revision=52989

6 years agoAdd initial support for geometry settings in the main window.
Gerald Combs [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.

svn path=/trunk/; revision=52988

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

svn path=/trunk/; revision=52987

6 years agoadd one more private data specifier
Martin Kaiser [Wed, 30 Oct 2013 22:18:55 +0000 (22:18 -0000)]
add one more private data specifier

svn path=/trunk/; revision=52986

6 years agoRemove an extraneous semicolon.
Chris Maynard [Wed, 30 Oct 2013 18:16:22 +0000 (18:16 -0000)]
Remove an extraneous semicolon.

svn path=/trunk/; revision=52985

6 years agoAdd some documentation to hopefully help dissector writers avoid the problem
Jeff Morriss [Wed, 30 Oct 2013 15:56:01 +0000 (15:56 -0000)]
Add some documentation to hopefully help dissector writers avoid the problem
in :

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

svn path=/trunk/; revision=52984

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

svn path=/trunk/; revision=52983

6 years agoGet rid of value_strings that appear to be a throwback to when ROHC appeared in this...
Martin Mathieson [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

svn path=/trunk/; revision=52982

6 years agoDon't call RRC dissector if should be ciphered. Take care to allow SecurityModeCompl...
Martin Mathieson [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)

svn path=/trunk/; revision=52981

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

svn path=/trunk/; revision=52980

6 years agoReplace some proto_tree_add_string_format with proto_tree_add_item +
Evan Huus [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.


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.

svn path=/trunk/; revision=52979

6 years agoUpdate the ASN.1 generated dissectors that were missed as part of the patches in...
Michael Mann [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 (

svn path=/trunk/; revision=52978

6 years agoWhen adding an entry to a dissector string table, take a copy of the pattern
Evan Huus [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

svn path=/trunk/; revision=52977

6 years agoSet SVN properties.
Jeff Morriss [Wed, 30 Oct 2013 00:43:46 +0000 (00:43 -0000)]
Set SVN properties.

svn path=/trunk/; revision=52976

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

svn path=/trunk/; revision=52975

6 years agoOptimize proto_get_id_by_filter_name() by using the existing hastable for proto_filte...
Anders Broman [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.

svn path=/trunk/; revision=52972

6 years agoMark an unused parameter as such
Martin Mathieson [Tue, 29 Oct 2013 22:16:32 +0000 (22:16 -0000)]
Mark an unused parameter as such

svn path=/trunk/; revision=52971

6 years agoif pointer==0, the section starts immediately
Martin Kaiser [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

svn path=/trunk/; revision=52969

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

svn path=/trunk/; revision=52967

6 years agoRevert r52905 and r52908: they're causing plenty of fuzz failures.
Jeff Morriss [Tue, 29 Oct 2013 21:18:22 +0000 (21:18 -0000)]
Revert r52905 and r52908: they're causing plenty of fuzz failures. is tracking the fix.

svn path=/trunk/; revision=52966

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

svn path=/trunk/; revision=52965

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

svn path=/trunk/; revision=52964

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

svn path=/trunk/; revision=52963

6 years agoAdd casts to results of g_hash_table_lookup() calls
Martin Mathieson [Tue, 29 Oct 2013 17:57:56 +0000 (17:57 -0000)]
Add casts to results of g_hash_table_lookup() calls

svn path=/trunk/; revision=52955

6 years agoShow security config settings in each PDCP PDU. Don't call IP dissector for ciphered...
Martin Mathieson [Tue, 29 Oct 2013 17:46:50 +0000 (17:46 -0000)]
Show security config settings in each PDCP PDU.  Don't call IP dissector for ciphered userplane frames. SRB messages are more complicated - need to keep track of SecurityModeRequest and SecurityModeResponse as they are not ciphered

svn path=/trunk/; revision=52953

6 years agoAdd some items to the list of things still to be done.
Jeff Morriss [Tue, 29 Oct 2013 15:28:49 +0000 (15:28 -0000)]
Add some items to the list of things still to be done.

svn path=/trunk/; revision=52952

6 years agoAdjust when dissect_diameter_avp loop is called to avoid access violations.
Michael Mann [Tue, 29 Oct 2013 15:18:05 +0000 (15:18 -0000)]
Adjust when dissect_diameter_avp loop is called to avoid access violations.

from Lukasz Markowski

svn path=/trunk/; revision=52951

6 years agoWhitespace fixes: Replace some tabs by spaces & etc
Bill Meier [Tue, 29 Oct 2013 15:00:32 +0000 (15:00 -0000)]
Whitespace fixes: Replace some tabs by spaces & etc

svn path=/trunk/; revision=52950

6 years agoFrom Marko Hrastovec via :
Jeff Morriss [Tue, 29 Oct 2013 14:48:08 +0000 (14:48 -0000)]
From Marko Hrastovec via :

Asterix dissector had two #if 0 ... #endif blocks because it obviously did not
compile on some systems.

Blocks were created because of mistyped variable names and variable not used

The errors were corrected.

svn path=/trunk/; revision=52949