metze/wireshark/wip.git
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

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

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

10 years agoShow security config settings in each PDCP PDU. Don't call IP dissector for ciphered...
martinm [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

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

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

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

10 years agoAdjust when dissect_diameter_avp loop is called to avoid access violations.
mmann [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

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

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

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

10 years agoFrom Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9347 :
morriss [Tue, 29 Oct 2013 14:48:08 +0000 (14:48 +0000)]
From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9347 :

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
warning/error.

The errors were corrected.

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

10 years agoFrom didier gautheron: remove redundant or use faster col_xxx functions
wmeier [Tue, 29 Oct 2013 14:09:20 +0000 (14:09 +0000)]
From didier gautheron: remove redundant or use faster col_xxx functions

- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for  replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
    + before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set

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

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

10 years agoAdd a cast to try to fix OSX buildbot
martinm [Tue, 29 Oct 2013 14:08:19 +0000 (14:08 +0000)]
Add a cast to try to fix OSX buildbot

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

10 years agoPass security command details (integrity and ciphering algorithms) to PDCP (which...
martinm [Tue, 29 Oct 2013 13:49:14 +0000 (13:49 +0000)]
Pass security command details (integrity and ciphering algorithms) to PDCP (which doesn't yet do much with them)

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

10 years agoMake the packet analysis for SCTP independent from GTK and QT.
ruengeler [Tue, 29 Oct 2013 12:11:23 +0000 (12:11 +0000)]
Make the packet analysis for SCTP independent from GTK and QT.

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

10 years agosimplify file_error()
martink [Tue, 29 Oct 2013 11:04:03 +0000 (11:04 +0000)]
simplify file_error()

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

10 years agoallow err_info==NULL in file_error()
martink [Tue, 29 Oct 2013 09:15:02 +0000 (09:15 +0000)]
allow err_info==NULL in file_error()

this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9309
reported by Peter Wu

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

10 years agoFrom Peter Wu
martink [Tue, 29 Oct 2013 08:34:35 +0000 (08:34 +0000)]
From Peter Wu

write editcap debug infos to stderr
print some of those messages only in verbose mode

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

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

10 years agoRevert part of 52896 and (for now) all of 52935. As Jeff pointed out,
gerald [Tue, 29 Oct 2013 04:05:27 +0000 (04:05 +0000)]
Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.

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

10 years agoMake it so out-of-tree builds (autofoo and cmake) have access to the various
morriss [Tue, 29 Oct 2013 02:28:16 +0000 (02:28 +0000)]
Make it so out-of-tree builds (autofoo and cmake) have access to the various
data files (diameter/*, COPYING, manuf) when running *shark from the
build directory.

Do this by passing in the top-level source directory as a compile-time
definition (unfortunately this has to be in the top-level Makefile too because
some programs link directly with epan/filesystem.c).

The plugins dir is no longer below the datafile directory but rather the
progfile directory (if we have one).  Handle the special case of AUTHORS-SHORT
(a data file but a generated one) by checking the file name before building
the path.

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

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

10 years agoSupport building and installing both Qt and GTK+.
guy [Tue, 29 Oct 2013 01:49:59 +0000 (01:49 +0000)]
Support building and installing both Qt and GTK+.

When forcing CFLAGS and CXXFLAGS, add -g and -O2; newer versions of
autoconf do so for GCC-compatible compilers (clang is GCC-compatible in
that sense), but only do so when those variables aren't forced.

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

10 years agoHave GTPv2 pass its "instance ID" to "private extension" subdissectors rather than...
mmann [Tue, 29 Oct 2013 00:25:57 +0000 (00:25 +0000)]
Have GTPv2 pass its "instance ID" to "private extension" subdissectors rather than use pinfo->private_data.  There are no "private extension" subdissectors in the Wireshark source, so I assume it's all done by third-party plugins.  They must now update their dissectors to get the "instance ID" from the dissector data parameter.

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

10 years agoFix scroll bar ranges.
gerald [Mon, 28 Oct 2013 23:57:57 +0000 (23:57 +0000)]
Fix scroll bar ranges.

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

10 years agoAdd c-ares. Untested, but it *should* work.
gerald [Mon, 28 Oct 2013 22:38:23 +0000 (22:38 +0000)]
Add c-ares. Untested, but it *should* work.

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

10 years agoRemove some (but not all) U3 remnants.
gerald [Mon, 28 Oct 2013 22:11:51 +0000 (22:11 +0000)]
Remove some (but not all) U3 remnants.

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

10 years agoTABs -> spaces
martink [Mon, 28 Oct 2013 21:49:56 +0000 (21:49 +0000)]
TABs -> spaces
add editor modelines

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

10 years agoAdd Tinkerforge to the list of new protocols
pascal [Mon, 28 Oct 2013 21:19:21 +0000 (21:19 +0000)]
Add Tinkerforge to the list of new protocols

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

10 years agoFIX compiler warning:
wmeier [Mon, 28 Oct 2013 20:37:58 +0000 (20:37 +0000)]
FIX compiler warning:
  packet-gtp.c: In function 'dissect_gtp_common':
  packet-gtp.c:7838: warning: unused variable 'pd_save'

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

10 years agoFrom Ishraq Ibne Ashraf: Tinkerforge protocol dissector
wmeier [Mon, 28 Oct 2013 20:07:58 +0000 (20:07 +0000)]
From Ishraq Ibne Ashraf: Tinkerforge protocol dissector

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

From me:

1. Move certain global vars to local storage in dissect_tfp_common()

2. Declare all remaining global vars as static;

3. Fix some bugs:
    - base58_encode() needed to be called before call to col_add_fstr()
    - display of UID string in tree was being truncated to 4 characters

4. Cleanup whitespace: use consistent indentation (tabs); remove trailing whitespace;

5. Add editor modelines

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

10 years agoAdd an extra parameter to gtp_match_response() so pinfo->private_data doesn't need...
mmann [Mon, 28 Oct 2013 20:00:04 +0000 (20:00 +0000)]
Add an extra parameter to gtp_match_response() so pinfo->private_data doesn't need to be used.

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

10 years agoAdd some verbosity.
gerald [Mon, 28 Oct 2013 19:09:58 +0000 (19:09 +0000)]
Add some verbosity.

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

10 years agoFix the compilation.
tuexen [Mon, 28 Oct 2013 18:59:33 +0000 (18:59 +0000)]
Fix the compilation.
I guess this is what is meant. Only compile tested...

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

10 years agoAdd an if(tree) and tweek col_add_fstr().
etxrab [Mon, 28 Oct 2013 18:10:16 +0000 (18:10 +0000)]
Add an if(tree) and tweek col_add_fstr().

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

10 years agoFrom Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9341 :
morriss [Mon, 28 Oct 2013 18:01:09 +0000 (18:01 +0000)]
From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9341 :

SVN rev 50525 tried to fix out-of-source-tree builds, but did so by
writing the .rcc.cpp files to the source tree. This was noticed when
running `make distcheck`. This patch reverts that behavior, and creates
the image/ directory to fix out-of-tree builds.

In other words, fix things so "make distcheck" with Qt works in out-of-tree
builds too.

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

10 years agomake Pointer filterable
martink [Mon, 28 Oct 2013 17:16:43 +0000 (17:16 +0000)]
make Pointer filterable

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

10 years agopacked_analysis_data_t -> packet_analysis_data_t
martink [Mon, 28 Oct 2013 17:13:13 +0000 (17:13 +0000)]
packed_analysis_data_t -> packet_analysis_data_t

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

10 years agocorrect typos
martink [Mon, 28 Oct 2013 17:10:09 +0000 (17:10 +0000)]
correct typos

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

10 years agoremove unnecessary return; lines
martink [Mon, 28 Oct 2013 17:08:55 +0000 (17:08 +0000)]
remove unnecessary return; lines

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

10 years agoadd tags file to .gitignore
martink [Mon, 28 Oct 2013 17:07:14 +0000 (17:07 +0000)]
add tags file to .gitignore

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

10 years agoinitialize tree variables
martink [Mon, 28 Oct 2013 16:59:57 +0000 (16:59 +0000)]
initialize tree variables

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

10 years agoPass diam_sub_dis_t directly to the subdissectors instead of using pinfo->private_data.
mmann [Mon, 28 Oct 2013 15:59:26 +0000 (15:59 +0000)]
Pass diam_sub_dis_t directly to the subdissectors instead of using pinfo->private_data.

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

10 years agoRemove accidentally-added private dissectors from Makefile
martinm [Mon, 28 Oct 2013 14:26:13 +0000 (14:26 +0000)]
Remove accidentally-added private dissectors from Makefile

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

10 years agoComment changes only
martinm [Mon, 28 Oct 2013 14:09:39 +0000 (14:09 +0000)]
Comment changes only

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

10 years agoPass tcap_private into the dissectors that need it rather than use private_data....
mmann [Mon, 28 Oct 2013 13:36:49 +0000 (13:36 +0000)]
Pass tcap_private into the dissectors that need it rather than use private_data.  Not sure if value_ptr is the "proper" place to pass tcap_private "internally" within the TCAP dissector, but it gets away from (potential) private_data (ab)use.

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

10 years agoRevert SVN #52914;
wmeier [Mon, 28 Oct 2013 04:07:52 +0000 (04:07 +0000)]
Revert SVN #52914;
OSX-10.6-x64 buildbot still givs an error
(At least we now know which line of code gives the error).

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

10 years agoFrom Shekhar Chandra: support for version 3.0 of netscaler packet wire format.
wmeier [Mon, 28 Oct 2013 03:16:31 +0000 (03:16 +0000)]
From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280

(Revised patch: let's see if this version compiles w/o error
                on all the buildbots)

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

10 years agoMore size and position tweaks.
gerald [Mon, 28 Oct 2013 01:39:20 +0000 (01:39 +0000)]
More size and position tweaks.

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

10 years agoUse _add_item not _add_uint as pointed out by checkAPI
eapache [Mon, 28 Oct 2013 00:43:18 +0000 (00:43 +0000)]
Use _add_item not _add_uint as pointed out by checkAPI

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

10 years agoFix up some formatting.
morriss [Mon, 28 Oct 2013 00:25:20 +0000 (00:25 +0000)]
Fix up some formatting.

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

10 years agoRemove "Cisco MDS-specific" fields from packet_info. 2 of the 3 fields were used...
mmann [Sun, 27 Oct 2013 23:18:19 +0000 (23:18 +0000)]
Remove "Cisco MDS-specific" fields from packet_info.  2 of the 3 fields were used strictly for columns that are considered "deprecated" and I think the third could be put in that category as well.

I assume the column enumerations haven't already been removed because of legacy "indexing issues", but if I'm wrong, we should definitely remove the columns altogether.  Could also see renaming columns to DEPRECATED_[X].

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

10 years agoDissect Kafka "fetch" requests and responses.
eapache [Sun, 27 Oct 2013 23:08:01 +0000 (23:08 +0000)]
Dissect Kafka "fetch" requests and responses.

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

10 years agoAs pointed by Evan: don't leak memory when the string pointer is NULL.
morriss [Sun, 27 Oct 2013 22:40:55 +0000 (22:40 +0000)]
As pointed by Evan: don't leak memory when the string pointer is NULL.

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

10 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
pascal [Sun, 27 Oct 2013 22:40:45 +0000 (22:40 +0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
NFC: Add PN532 HCI dissector

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

10 years agoTry to improve the appearance of the sequence diagram.
gerald [Sun, 27 Oct 2013 22:23:27 +0000 (22:23 +0000)]
Try to improve the appearance of the sequence diagram.

Use integer coordinates for the arrows and text. Add smooth_font_size()
to qt_ui_utils which will hopefully adjust the size on Windows to
something more readable.

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

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 :
morriss [Sun, 27 Oct 2013 21:56:58 +0000 (21:56 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 :

Actually handle non-NULL-terminated FT_STRINGs properly.

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

10 years agoInitialise a couple of variables to avoid bogus may-be-used-uninitialised warnings...
martinm [Sun, 27 Oct 2013 21:52:35 +0000 (21:52 +0000)]
Initialise a couple of variables to avoid bogus may-be-used-uninitialised warnings with my version of gcc

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

10 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
pascal [Sun, 27 Oct 2013 21:32:32 +0000 (21:32 +0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
USB: Decode HID interface subclasses and protocols

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

10 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
pascal [Sun, 27 Oct 2013 21:14:22 +0000 (21:14 +0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
USB: CDC: Decode ACM, CM and Union Functional Descriptors

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

10 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
pascal [Sun, 27 Oct 2013 20:59:43 +0000 (20:59 +0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 :
USB: Decode CDC subclasses and protocols

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

10 years agoMark unused parameters.
eapache [Sun, 27 Oct 2013 20:58:00 +0000 (20:58 +0000)]
Mark unused parameters.

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

10 years agoRemove iplen and iphdrlen from struct _packet_info.
mmann [Sun, 27 Oct 2013 20:38:42 +0000 (20:38 +0000)]
Remove iplen and iphdrlen from struct _packet_info.
Dissectors should just use (reported) tvb length and taps have other ways to get the data.

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

10 years agoFix relative path now that u3 folder has been removed
pascal [Sun, 27 Oct 2013 19:45:30 +0000 (19:45 +0000)]
Fix relative path now that u3 folder has been removed

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

10 years agoDo not reset pinfo->curr_layer_num in packet-frame.c
pascal [Sun, 27 Oct 2013 19:33:55 +0000 (19:33 +0000)]
Do not reset pinfo->curr_layer_num in packet-frame.c
Before this change, curr_layer_num could be off by 1 depending on whether we
generated items for Frame protocol or not, leading to a failure to get the
UDP heuristic dissector identified during first pass

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

10 years agoRemove U3 code and packaging.
gerald [Sun, 27 Oct 2013 17:15:39 +0000 (17:15 +0000)]
Remove U3 code and packaging.

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

10 years agoAdd Gettext to PACKAGELIST. Homebrew puts it in a nonstandard location.
gerald [Sun, 27 Oct 2013 17:14:12 +0000 (17:14 +0000)]
Add Gettext to PACKAGELIST. Homebrew puts it in a nonstandard location.

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