6 years agoFrom Hauke Mehrtens via
Evan Huus [Sun, 5 May 2013 13:49:49 +0000 (13:49 -0000)]
From Hauke Mehrtens via

[PATCH 1/8]
Add a subtree for the random DTLS elements. This is what TLS already does, and
it makes more sense than prefixing their display names.

[PATCH 2/8]
Show the actual hex content of the cookie by just using proto_tree_add_item.
The cookie length has its own field, so there's no need to display it twice.

[From me]
Fix an @ in the AUTHORS file

svn path=/trunk/; revision=49172

6 years agoRemove an unnecessary header include.
Martin Mathieson [Sun, 5 May 2013 11:32:00 +0000 (11:32 -0000)]
Remove an unnecessary header include.

svn path=/trunk/; revision=49171

6 years agoRemove if (tree) so expert_info will always be called.
Michael Mann [Sun, 5 May 2013 11:02:42 +0000 (11:02 -0000)]
Remove if (tree) so expert_info will always be called.

svn path=/trunk/; revision=49170

6 years agoRevert 49166: It breaks compilation:
Jörg Mayer [Sun, 5 May 2013 09:07:09 +0000 (09:07 -0000)]
Revert 49166: It breaks compilation:

[ 82%] Building C object ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c: In function ‘color_filter_te’:
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: enum conversion when passing argument 2 of ‘gtk_widget_modify_bg’ is invalid in C++ [-Werror=c++-compat]
     gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
                 from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
                 from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
                 from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
                 from /usr/include/gtk-3.0/gtk/gtk.h:33,
                 from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
/usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘GtkStateType’ but argument is of type ‘int’
 void        gtk_widget_modify_bg          (GtkWidget            *widget,
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: passing argument 3 of ‘gtk_widget_modify_bg’ from incompatible pointer type [-Werror]
     gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
                 from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
                 from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
                 from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
                 from /usr/include/gtk-3.0/gtk/gtk.h:33,
                 from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
/usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘const struct GdkColor *’ but argument is of type ‘struct GdkRGBA *’
 void        gtk_widget_modify_bg          (GtkWidget            *widget,
cc1: all warnings being treated as errors
make[2]: *** [ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o] Error 1

Also note that
gtk_widget_modify_bg has been deprecated since version 3.0 and should not be used in newly-written code. Use gtk_widget_override_background_color() instead

Of course we are not the only ones who have problems with that replacement:
which ends with a sort of ugly solution without the deprecated function.

svn path=/trunk/; revision=49169

6 years agoUpdate to cover Qt5 builds via cmake.
Jörg Mayer [Sun, 5 May 2013 08:52:47 +0000 (08:52 -0000)]
Update to cover Qt5 builds via cmake.

svn path=/trunk/; revision=49168

6 years agoJust whitespace changes
Jörg Mayer [Sun, 5 May 2013 08:49:18 +0000 (08:49 -0000)]
Just whitespace changes

svn path=/trunk/; revision=49167

6 years agoReally change display filter combo box's background color using GTK3
Balint Reczey [Sun, 5 May 2013 05:25:35 +0000 (05:25 -0000)]
Really change display filter combo box's background color using GTK3

svn path=/trunk/; revision=49166

6 years agoYet another protocol update via
Jörg Mayer [Sat, 4 May 2013 23:37:02 +0000 (23:37 -0000)]
Yet another protocol update via

svn path=/trunk/; revision=49165

6 years agoAttempted fix for
Jörg Mayer [Sat, 4 May 2013 23:06:15 +0000 (23:06 -0000)]
Attempted fix for
When there are several versions of lua installed, try to pick the library
version that matches the include file(s) we selected.

svn path=/trunk/; revision=49164

6 years agoStub out the wmem test suite for older Glibs. This should restore
Evan Huus [Sat, 4 May 2013 12:42:28 +0000 (12:42 -0000)]
Stub out the wmem test suite for older Glibs. This should restore
compatibility with GLIB 2.14.

svn path=/trunk/; revision=49161

6 years agoFrom Joe McEachern via
Evan Huus [Sat, 4 May 2013 12:37:01 +0000 (12:37 -0000)]
From Joe McEachern via

Add tcp.analysis.spurious_retransmission. Although RFC 793 does not define
spurious TCP retransmissions, TCP spurious retransmissions are referenced in
other RFCs and research.

svn path=/trunk/; revision=49160

6 years agoFix errors found by fix-encoding-args tools
Alexis La Goutte [Sat, 4 May 2013 08:12:50 +0000 (08:12 -0000)]
Fix errors found by fix-encoding-args tools

svn path=/trunk/; revision=49158

6 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sat, 4 May 2013 08:12:36 +0000 (08:12 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=49157

6 years agoFix indents (Use Spaces) Add Modelines
Alexis La Goutte [Sat, 4 May 2013 08:12:25 +0000 (08:12 -0000)]
Fix indents (Use Spaces) Add Modelines

svn path=/trunk/; revision=49156

6 years agoAdd a dissector for the Ixia Anue encoding to CMakeList too
Alexis La Goutte [Sat, 4 May 2013 08:12:12 +0000 (08:12 -0000)]
Add a dissector for the Ixia Anue encoding to CMakeList too

svn path=/trunk/; revision=49155

6 years agoLISP control packet incorrectly identified as LISP data based when UDP source port...
Michael Mann [Sat, 4 May 2013 02:20:59 +0000 (02:20 -0000)]
LISP control packet incorrectly identified as LISP data based when UDP source port is 4341.  Bug 8627 (

Also did some minor cleanup/improvements while I was there.

svn path=/trunk/; revision=49154

6 years agomissed adding packet-ssl.h.
Michael Mann [Sat, 4 May 2013 01:37:55 +0000 (01:37 -0000)]
missed adding packet-ssl.h.

svn path=/trunk/; revision=49153

6 years agoDecrypt Fix protocol over SSL. Bug 8625 (
Michael Mann [Sat, 4 May 2013 01:27:33 +0000 (01:27 -0000)]
Decrypt Fix protocol over SSL.  Bug 8625 (

svn path=/trunk/; revision=49152

6 years agoAdd WS_DLL_PUBLIC to all functions declared here.
Guy Harris [Fri, 3 May 2013 23:37:06 +0000 (23:37 -0000)]
Add WS_DLL_PUBLIC to all functions declared here.

svn path=/trunk/; revision=49150

6 years agoRemove unnecessary lines from handoff function.
Martin Mathieson [Fri, 3 May 2013 18:28:58 +0000 (18:28 -0000)]
Remove unnecessary lines from handoff function.

svn path=/trunk/; revision=49149

6 years agoAdd a dissector for the Ixia Anue encoding of timestamps in the ethernet
Martin Mathieson [Fri, 3 May 2013 17:52:31 +0000 (17:52 -0000)]
Add a dissector for the Ixia Anue encoding of timestamps in the ethernet

svn path=/trunk/; revision=49148

6 years agoAdd 3gpp2_type16.
Anders Broman [Fri, 3 May 2013 17:34:49 +0000 (17:34 -0000)]
Add 3gpp2_type16.

svn path=/trunk/; revision=49147

6 years agoAdd doxygen comments.
Anders Broman [Fri, 3 May 2013 17:33:13 +0000 (17:33 -0000)]
Add doxygen comments.

svn path=/trunk/; revision=49146

6 years agoRemove static packet_info *gpinfo and just use the packet_info provided by the function.
Michael Mann [Fri, 3 May 2013 14:54:39 +0000 (14:54 -0000)]
Remove static packet_info *gpinfo and just use the packet_info provided by the function.

svn path=/trunk/; revision=49145

6 years agoFrom Niels de Vos via :
Jeff Morriss [Fri, 3 May 2013 13:53:16 +0000 (13:53 -0000)]
From Niels de Vos  via :

It is useful to see not only the minimal, maximum and average service time for
RPC procedures, but also the total time these took.

From me: add it to the man page.

svn path=/trunk/; revision=49144

6 years agoRemove global packet_info* current_pinfo
Michael Mann [Fri, 3 May 2013 02:43:43 +0000 (02:43 -0000)]
Remove global packet_info* current_pinfo

svn path=/trunk/; revision=49143

6 years agoAdd some casts to hush the buildbots, and fix what I assume was a copy-pasto
Evan Huus [Fri, 3 May 2013 01:37:27 +0000 (01:37 -0000)]
Add some casts to hush the buildbots, and fix what I assume was a copy-pasto
to ensure that the return value of strlen is actually used as the length of the

svn path=/trunk/; revision=49142

6 years agoRemove unnecessary global variables
Michael Mann [Fri, 3 May 2013 00:39:14 +0000 (00:39 -0000)]
Remove unnecessary global variables

svn path=/trunk/; revision=49141

6 years agoFinish improving NTLM and PLAIN authentication. Bug 8600 (https://bugs.wireshark...
Michael Mann [Fri, 3 May 2013 00:04:36 +0000 (00:04 -0000)]
Finish improving NTLM and PLAIN authentication.  Bug 8600 (

From Uli Heilmeier

svn path=/trunk/; revision=49140

6 years agoAdd a link to the Survey of Commonly Available C System Header Files. It
Gerald Combs [Thu, 2 May 2013 15:17:46 +0000 (15:17 -0000)]
Add a link to the Survey of Commonly Available C System Header Files. It
looks like we might be able to get rid of a few header checks.

svn path=/trunk/; revision=49139

6 years agoAs suggested by Evan:
Jeff Morriss [Thu, 2 May 2013 14:55:33 +0000 (14:55 -0000)]
As suggested by Evan:

Point users to as an alternative to the
current Python support.

While we're in there, make it harder to enable Python: change it from
"--with-python" to "--with-broken-python" just to prevent people from enabling
unless they really mean it (are going to work on fixing it).

svn path=/trunk/; revision=49138

6 years agoDissect SSID List element.
Michael Mann [Thu, 2 May 2013 13:08:31 +0000 (13:08 -0000)]
Dissect SSID List element.

From Jouni Malinen, bug 8613 (

svn path=/trunk/; revision=49137

6 years agoRemove useless global variables
Michael Mann [Thu, 2 May 2013 13:03:45 +0000 (13:03 -0000)]
Remove useless global variables

svn path=/trunk/; revision=49136

6 years agoRemove global variable g_pinfo.
Michael Mann [Thu, 2 May 2013 12:59:07 +0000 (12:59 -0000)]
Remove global variable g_pinfo.

svn path=/trunk/; revision=49135

6 years agoFix Bug 8615 concerning the active "Start" button when remote interfaces are added.
Irene Rüngeler [Thu, 2 May 2013 11:47:09 +0000 (11:47 -0000)]
Fix Bug 8615 concerning the active "Start" button when remote interfaces are added.

svn path=/trunk/; revision=49134

6 years agoFrom Sandeep Dahiya:
Anders Broman [Thu, 2 May 2013 05:16:09 +0000 (05:16 -0000)]
From Sandeep Dahiya:
Extend the value_string that show the platform from where the packet was captured.

svn path=/trunk/; revision=49133

6 years agoAdd a subtree for P2P Client Info Descriptor. Part of bug 8613 (https://bugs.wiresha...
Michael Mann [Thu, 2 May 2013 02:09:08 +0000 (02:09 -0000)]
Add a subtree for P2P Client Info Descriptor.  Part of bug 8613 (

From Jouni Malinen

svn path=/trunk/; revision=49132

6 years agoIEEE802.11 improvements:
Michael Mann [Thu, 2 May 2013 01:59:34 +0000 (01:59 -0000)]
IEEE802.11 improvements:
1. ANQP Venue Name is a UTF-8 string
2. Dissect Hotspot 2.0 indication and ANQP elements
3. Dissect TFS Request/Response
4. Dissect WNM-Notification Request frames

svn path=/trunk/; revision=49131

6 years agoFix P2P Group Info validation code for Device Name length field. Bug 8613 (https...
Michael Mann [Thu, 2 May 2013 01:51:02 +0000 (01:51 -0000)]
Fix P2P Group Info validation code for Device Name length field.  Bug 8613 (

From Jouni Malinen

svn path=/trunk/; revision=49130

6 years agoAdd BSS Max Idle Period, WNM-Sleep Mode.
Michael Mann [Thu, 2 May 2013 01:15:25 +0000 (01:15 -0000)]
Add BSS Max Idle Period, WNM-Sleep Mode.
Fix and enhance TCLAS dissection.

From Jouni Malinen, bug 8613 (

svn path=/trunk/; revision=49129

6 years agoProtect a "divide by zero" operation. Bug 7359 (
Michael Mann [Wed, 1 May 2013 23:59:16 +0000 (23:59 -0000)]
Protect a "divide by zero" operation.  Bug 7359 (  This seems to have been generated through a corrupted UAT file switching between 1.8 and 1.10, but it's a good check to have regardless.

svn path=/trunk/; revision=49128

6 years agoAdd global profiles.
Gerald Combs [Wed, 1 May 2013 23:17:30 +0000 (23:17 -0000)]
Add global profiles.

svn path=/trunk/; revision=49127

6 years agoChange the right title this time.
Gerald Combs [Wed, 1 May 2013 22:22:10 +0000 (22:22 -0000)]
Change the right title this time.

svn path=/trunk/; revision=49126

6 years agoUse "Global" to match the other entries.
Gerald Combs [Wed, 1 May 2013 22:14:48 +0000 (22:14 -0000)]
Use "Global" to match the other entries.

svn path=/trunk/; revision=49125

6 years agoProfiles → Global Profiles.
Gerald Combs [Wed, 1 May 2013 22:13:51 +0000 (22:13 -0000)]
Profiles → Global Profiles.

svn path=/trunk/; revision=49124

6 years agoInstall and uninstall our global profiles.
Gerald Combs [Wed, 1 May 2013 22:06:49 +0000 (22:06 -0000)]
Install and uninstall our global profiles.

svn path=/trunk/; revision=49123

6 years agoInstall the new global profiles and add them to the distribution.
Gerald Combs [Wed, 1 May 2013 21:53:57 +0000 (21:53 -0000)]
Install the new global profiles and add them to the distribution.

svn path=/trunk/; revision=49122

6 years agoMake the python scripts work on systems where python is a link
Jörg Mayer [Wed, 1 May 2013 21:50:44 +0000 (21:50 -0000)]
Make the python scripts work on systems where python is a link
to python3: explicitely call the python2 binary.

svn path=/trunk/; revision=49121

6 years agoFix warning.
Guy Harris [Wed, 1 May 2013 21:15:47 +0000 (21:15 -0000)]
Fix warning.

svn path=/trunk/; revision=49118

6 years agoRemove some global variables in favor of private_data member of asn1_ctx_t. Bug...
Michael Mann [Wed, 1 May 2013 20:54:31 +0000 (20:54 -0000)]
Remove some global variables in favor of private_data member of asn1_ctx_t.  Bug 7060 (  This should (mostly) passify the bug, but it appears like this could be done with a lot more ASN.1 dissectors.

svn path=/trunk/; revision=49117

6 years agoAdd a "profiles" directory. Add a Bluetooth global profile with the
Gerald Combs [Wed, 1 May 2013 20:31:50 +0000 (20:31 -0000)]
Add a "profiles" directory. Add a Bluetooth global profile with the
current default+Bluetooth colors and a Classic global profile with the
old 1.8 colors. Remove the Bluetooth rules from the default profile.

svn path=/trunk/; revision=49116

6 years agoWhitespace fixes: Indented lines should not start with
Jörg Mayer [Wed, 1 May 2013 19:51:46 +0000 (19:51 -0000)]
Whitespace fixes: Indented lines should not start with
spaces followed by tabs.

svn path=/trunk/; revision=49115

6 years agoFix :
Jeff Morriss [Wed, 1 May 2013 19:42:28 +0000 (19:42 -0000)]
Fix :

hsrp2.md5_auth_data is added to the tree with a length of 16 so declare it as
FT_BYTES instead of FT_UINT32 (using the latter causes an assertion in
trunk-1.8 and an expert info in trunk and trunk-1.10).

svn path=/trunk/; revision=49114

6 years agoDiederik de Groot <>
Jörg Mayer [Wed, 1 May 2013 19:16:02 +0000 (19:16 -0000)]
Diederik de Groot <>


Further enhancements to packet-skinny.c, change cast. filters
to skinny. filters.
While I'm not sure whether that this is really correct, we don't
have any sample capture to verify whether the old solution really
worked. At least that way doesn't complain
any more ;-)

Me: Tiny whitespace fixes.

svn path=/trunk/; revision=49113

6 years agoFix :
Jeff Morriss [Wed, 1 May 2013 14:19:10 +0000 (14:19 -0000)]
Fix :

Allow port 0 in RSA Key List.

(This has been broken since r36875.)

svn path=/trunk/; revision=49111

6 years agoRemove cmake/modules/FindPYTHON.cmake from the source distribution.
Jeff Morriss [Wed, 1 May 2013 13:22:25 +0000 (13:22 -0000)]
Remove cmake/modules/FindPYTHON.cmake from the source distribution.

svn path=/trunk/; revision=49109

6 years agoSort the list of packages to make it easier to check results.
Jörg Mayer [Wed, 1 May 2013 10:40:12 +0000 (10:40 -0000)]
Sort the list of packages to make it easier to check results.

svn path=/trunk/; revision=49107

6 years agoPrint the version of the include files that will be used.
Jörg Mayer [Wed, 1 May 2013 10:34:15 +0000 (10:34 -0000)]
Print the version of the include files that will be used.

svn path=/trunk/; revision=49106

6 years ago- Fix logic for finding packages with differing Find-name
Jörg Mayer [Wed, 1 May 2013 09:20:59 +0000 (09:20 -0000)]
- Fix logic for finding packages with differing Find-name
  and returned variable-names:
  Old: Provide the var name and adapt the find-name
  New: Provide the find-name and adapt the var name
  This allows for different packages with the same var name.
  This chage effects Qt4 and PythonInterp.
- Replace self created FindPYTHON with cmake provided

svn path=/trunk/; revision=49105

6 years agoMake C12.22 work over UDP.
Anders Broman [Wed, 1 May 2013 08:34:40 +0000 (08:34 -0000)]
Make C12.22 work over UDP.

svn path=/trunk/; revision=49104

6 years agoRemove singly-linked list from the wmem TODO list. Now that it has append
Evan Huus [Wed, 1 May 2013 01:09:57 +0000 (01:09 -0000)]
Remove singly-linked list from the wmem TODO list. Now that it has append
all of the really important stuff is there, and emem doesn't provide it at all
so it's not blocking migration.

svn path=/trunk/; revision=49103

6 years agoOur scripts do ont work with python3, so only pick up a python2
Jörg Mayer [Wed, 1 May 2013 00:53:59 +0000 (00:53 -0000)]
Our scripts do ont work with python3, so only pick up a python2

Reported on #wireshark by McEnroe

svn path=/trunk/; revision=49102

6 years agoFollow-up to r49055 as noted on
Evan Huus [Tue, 30 Apr 2013 23:19:47 +0000 (23:19 -0000)]
Follow-up to r49055 as noted on

The BER integer dissection routines take an hf_id, but that can be -1.
Only fetch the type (to check signedness) if hf_id >= 0, as otherwise this
causes a dissector bug. Default to signed if given no hf_id - I don't know
whether this should be unsigned or not, but the old behaviour was that
everything was signed so it's not a regression at least.

svn path=/trunk/; revision=49101

6 years agoAdd Diederik de Groot to the AUTHORS list
Jörg Mayer [Tue, 30 Apr 2013 22:06:33 +0000 (22:06 -0000)]
Add Diederik de Groot to the AUTHORS list

svn path=/trunk/; revision=49100

6 years agoDiederik de Groot <>
Jörg Mayer [Tue, 30 Apr 2013 21:53:39 +0000 (21:53 -0000)]
Diederik de Groot <>

Update Skinny Dissection Code (CM7.1 + / SPCP Message)

- Remove some trailing whitespace
- Numerically sort deviceTypes and replace older values with new ones
- Reenable the return FALSE statement in the heuristics - it works for me.

svn path=/trunk/; revision=49099

6 years agoAdd 'dtds' and 'fix' directories to the checklicense whitelist, they don't
Evan Huus [Tue, 30 Apr 2013 01:34:19 +0000 (01:34 -0000)]
Add 'dtds' and 'fix' directories to the checklicense whitelist, they don't
appear to be things we have licensing power over (IANAL).

svn path=/trunk/; revision=49095

6 years agoIn part from Raúl Pérez Clavero via
Evan Huus [Tue, 30 Apr 2013 01:23:10 +0000 (01:23 -0000)]
In part from Raúl Pérez Clavero via

Implement wmem_slist_append().

svn path=/trunk/; revision=49094

6 years agoConvert 'Old GFID' and 'New GFID' to FT_GUID type.
Michael Mann [Tue, 30 Apr 2013 00:55:18 +0000 (00:55 -0000)]
Convert 'Old GFID' and 'New GFID' to FT_GUID type.

From Niels de Vos, Bug 8612 (

svn path=/trunk/; revision=49093

6 years agoA few more doxygen fix-ups.
Evan Huus [Tue, 30 Apr 2013 00:55:03 +0000 (00:55 -0000)]
A few more doxygen fix-ups.

svn path=/trunk/; revision=49092

6 years agoMove the contents of wsar_html/core to wsar_html. Create tag files for
Gerald Combs [Tue, 30 Apr 2013 00:27:02 +0000 (00:27 -0000)]
Move the contents of wsar_html/core to wsar_html. Create tag files for
core, epan, and ui, and link them to each other to varying degrees. This
seems to be the best way to organize our documentation. The alternative
is to switch to a single doxygen.cfg and manually add files to different
groups or sections.

Add a wireshark.dox file which contains markup for the main page. Add
.dox and .txt to svnadd. Clean up our tag files. Force wsar_html to
rebuild each time.

svn path=/trunk/; revision=49091

6 years agoState that we don't support U3 any more.
Gerald Combs [Mon, 29 Apr 2013 23:08:31 +0000 (23:08 -0000)]
State that we don't support U3 any more.

svn path=/trunk/; revision=49090

6 years agoDarken and saturate the "trouble" backgrounds a bit.
Gerald Combs [Mon, 29 Apr 2013 17:13:24 +0000 (17:13 -0000)]
Darken and saturate the "trouble" backgrounds a bit.

svn path=/trunk/; revision=49084

6 years agoSpecify to CppCheck that Wireshark code is C89, not the default C11.
Evan Huus [Sun, 28 Apr 2013 23:30:29 +0000 (23:30 -0000)]
Specify to CppCheck that Wireshark code is C89, not the default C11.

svn path=/trunk/; revision=49083

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-04-28]
Gerald Combs [Sun, 28 Apr 2013 14:03:34 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-04-28]

svn path=/trunk/; revision=49079

6 years agoFix suspected copy-and-pasteo.
Guy Harris [Sun, 28 Apr 2013 01:09:00 +0000 (01:09 -0000)]
Fix suspected copy-and-pasteo.

svn path=/trunk/; revision=49078

6 years agoAdd CppCheck to the list of things to run before submitting code for review.
Evan Huus [Sat, 27 Apr 2013 23:11:06 +0000 (23:11 -0000)]
Add CppCheck to the list of things to run before submitting code for review.

svn path=/trunk/; revision=49077

6 years agoSilence a false-positive warning from older GCCs:
Evan Huus [Sat, 27 Apr 2013 15:00:52 +0000 (15:00 -0000)]
Silence a false-positive warning from older GCCs:
    'acetype4' may be used uninitialized in this function

svn path=/trunk/; revision=49076

6 years agoWhen fuzzing with valgrind and running without -T, run with -v so that the
Evan Huus [Sat, 27 Apr 2013 14:03:45 +0000 (14:03 -0000)]
When fuzzing with valgrind and running without -T, run with -v so that the
argument string is non-empty. Perhaps this will fix the fuzz-bot which fails
to run with the empty argument string...

svn path=/trunk/; revision=49075

6 years agoFrom Cal Turney via
Evan Huus [Sat, 27 Apr 2013 13:59:46 +0000 (13:59 -0000)]
From Cal Turney via

Numerous improvements to NFS ACL/ACE dissection. For a complete list see
comment #11 of the bug.

From me:
- fix an infinite loop caught by fuzzing
- fix an out-of-bounds memory access caught by valgrind
- add missing {0,NULL} terminator to value_string array

svn path=/trunk/; revision=49074

6 years agoremove unnecessary if (tree) checks
Martin Kaiser [Sat, 27 Apr 2013 13:06:28 +0000 (13:06 -0000)]
remove unnecessary if (tree) checks
I hope this prevents bugs like the one fixed in r48917

svn path=/trunk/; revision=49073

6 years agofree the linkname allocated by g_strdup()
Martin Kaiser [Sat, 27 Apr 2013 12:35:30 +0000 (12:35 -0000)]
free the linkname allocated by g_strdup()
set linkname to unknown for interfaces without a linkname (e.g.  pipes)
remove "this should not happen" warnings

svn path=/trunk/; revision=49072

6 years agowhen a named pipe is added to the interfaces list, it has no linktype
Martin Kaiser [Sat, 27 Apr 2013 09:55:46 +0000 (09:55 -0000)]
when a named pipe is added to the interfaces list, it has no linktype
this triggered the g_assert(linktype) in create_and_fill_model()

the assert is not necessary as both gtk_list_store_set() and g_free()
can handle NULL parameters

remove the assert and add set linktype to "unknown" if the interface
has no linktype

svn path=/trunk/; revision=49071

6 years agoFix a comment (the "it worked but didn't pop up a window" conclusion
Guy Harris [Sat, 27 Apr 2013 03:51:40 +0000 (03:51 -0000)]
Fix a comment (the "it worked but didn't pop up a window" conclusion
came from a bad test).

svn path=/trunk/; revision=49070

6 years agoUpdate comments.
Guy Harris [Sat, 27 Apr 2013 02:57:16 +0000 (02:57 -0000)]
Update comments.

svn path=/trunk/; revision=49069

6 years agoWmem string-buffer improvements:
Evan Huus [Fri, 26 Apr 2013 21:30:24 +0000 (21:30 -0000)]
Wmem string-buffer improvements:
- better tests
- fix a bug caught by the better tests
- implement append_c and append_unichar, with tests

Wmem string-buffers now have feature parity with their emem equivalents, so
remove them from the TODO list.

svn path=/trunk/; revision=49060

6 years agoUpdate the capture start, stop, and restart icons and development badge
Gerald Combs [Fri, 26 Apr 2013 21:10:35 +0000 (21:10 -0000)]
Update the capture start, stop, and restart icons and development badge
with enhanced versions from Elliott.

Switch the interface configuration icon to the "gear" version. This
matches the gear in the capture icon.

svn path=/trunk/; revision=49059

6 years agoSet svn:mime-type
Jeff Morriss [Fri, 26 Apr 2013 20:30:04 +0000 (20:30 -0000)]
Set svn:mime-type

svn path=/trunk/; revision=49057

6 years agoTry to determine the repository URL automatically.
Gerald Combs [Fri, 26 Apr 2013 19:50:43 +0000 (19:50 -0000)]
Try to determine the repository URL automatically.

svn path=/trunk/; revision=49056

6 years agoFrom me: only sign-extend BER integers if the field is actually signed
Evan Huus [Fri, 26 Apr 2013 19:23:36 +0000 (19:23 -0000)]
From me: only sign-extend BER integers if the field is actually signed

From Guy: override two fields in the GOOSE ASN.1 dissector to be unsigned

Together these fix

svn path=/trunk/; revision=49055

6 years agoFix a whole bunch of doxygen warnings, mostly typos or renamed parameters.
Evan Huus [Fri, 26 Apr 2013 18:28:21 +0000 (18:28 -0000)]
Fix a whole bunch of doxygen warnings, mostly typos or renamed parameters.

svn path=/trunk/; revision=49053

6 years agoBuildbot (via Twisted) sets a restrictive umask. Unset it before we run
Gerald Combs [Fri, 26 Apr 2013 18:23:05 +0000 (18:23 -0000)]
Buildbot (via Twisted) sets a restrictive umask. Unset it before we run

svn path=/trunk/; revision=49052

6 years agoAdd some Doxygen checks.
Gerald Combs [Fri, 26 Apr 2013 17:49:00 +0000 (17:49 -0000)]
Add some Doxygen checks.

svn path=/trunk/; revision=49051

6 years agoSet svn:eol-style and svn:keywords
Jeff Morriss [Fri, 26 Apr 2013 15:28:30 +0000 (15:28 -0000)]
Set svn:eol-style and svn:keywords

svn path=/trunk/; revision=49049

6 years agoFix up indentation
Jeff Morriss [Fri, 26 Apr 2013 13:53:53 +0000 (13:53 -0000)]
Fix up indentation

svn path=/trunk/; revision=49048

6 years agoWork around a bug in a Microsoft security fix.
Guy Harris [Fri, 26 Apr 2013 04:42:20 +0000 (04:42 -0000)]
Work around a bug in a Microsoft security fix.

svn path=/trunk/; revision=49046

6 years agoGet rid of leftover debugging variable.
Guy Harris [Fri, 26 Apr 2013 01:01:32 +0000 (01:01 -0000)]
Get rid of leftover debugging variable.

svn path=/trunk/; revision=49045

6 years agoCheck, for each of the standard handles, whether they need to be
Guy Harris [Fri, 26 Apr 2013 00:50:21 +0000 (00:50 -0000)]
Check, for each of the standard handles, whether they need to be
redirected to a console.  Only if at least one of them needs to be
redirected to we create a console, and don't redirect them if they don't
need to be redirected.

This makes redirection of the standard output of, for example,
"wireshark -D" work; we don't redirect it out from under the shell.

svn path=/trunk/; revision=49044

6 years agoUpdate the main, epan, and ui Doxygen configuration files. Change the
Gerald Combs [Fri, 26 Apr 2013 00:07:42 +0000 (00:07 -0000)]
Update the main, epan, and ui Doxygen configuration files. Change the
output directory to wsar_html (Wireshark API Reference HTML) to match
the Docbook naming convention. In each move the
doxygen_global.cfg to the top of the file so that our local definitions
don't get clobbered. Add makefile targets for wsar_html and wsar-zip.

svn path=/trunk/; revision=49043

6 years agoAdd Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...
Jörg Mayer [Thu, 25 Apr 2013 23:04:19 +0000 (23:04 -0000)]
Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...

svn path=/trunk/; revision=49042

6 years agoAnnotate wmem functions for better compiler warnings and optimization.
Evan Huus [Thu, 25 Apr 2013 22:54:36 +0000 (22:54 -0000)]
Annotate wmem functions for better compiler warnings and optimization.

svn path=/trunk/; revision=49041