metze/wireshark/wip.git
8 years ago[Automatic update for 2015-12-06]
Gerald Combs [Sun, 6 Dec 2015 16:10:57 +0000 (08:10 -0800)]
[Automatic update for 2015-12-06]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I70fd3f5a9f8f53ea6a086b521c8f05d33815516f
Reviewed-on: https://code.wireshark.org/review/12450
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoQt: No path for created and renamed profiles
Stig Bjørlykke [Sun, 6 Dec 2015 11:15:53 +0000 (12:15 +0100)]
Qt: No path for created and renamed profiles

The path is not valid for created and renamed profiles because the
directory is not created yet.  Use this label as a info label to
describe where the profile is created from or renamed from instead.

Use correct path for the Default profile.
Removed Bold from the current profile in status bar list.
Added tooltip for system provided profiles.

Change-Id: I61c8b1cc811dd9f9419ff9e373a8d00aa4e30446
Ping-Bug: 11704
Reviewed-on: https://code.wireshark.org/review/12447
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 years agoSCTP: It is odd that the body of dissect_heartbeat_ack_chunk' function is fully equiv...
Michael Tüxen [Sat, 5 Dec 2015 13:43:11 +0000 (14:43 +0100)]
SCTP: It is odd that the body of dissect_heartbeat_ack_chunk' function is fully equivalent to the body of 'dissect_heartbeat_chunk' function found by PVS Studio (V524)

This is just a cosmetic change, which makes sense. No funtional
change.

Change-Id: Id24d162379093207863608e70f405e66f789276c
Reviewed-on: https://code.wireshark.org/review/12440
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Tüxen
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
8 years agoType cleanups.
Guy Harris [Sat, 5 Dec 2015 20:40:58 +0000 (12:40 -0800)]
Type cleanups.

dfilter_macro_apply_recurse() returns either NULL or a pointer to
freshly-allocated memory, so it doesn't return a const pointer.
dfilter_macro_apply() calls dfilter_macro_apply_recurse(), so it doesn't
return a const pointer, either.

In dfilter_compile(), have separate variables for the filter handed in
and the macro-expanded filter, the former being const gchar * and the
latter being gchar *.

Change-Id: I191549bf0ff6c09c1278a98432a907c93d5e0e74
Reviewed-on: https://code.wireshark.org/review/12446
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoUndoing base-64 encoding is not decryption.
Guy Harris [Sat, 5 Dec 2015 17:44:19 +0000 (09:44 -0800)]
Undoing base-64 encoding is not decryption.

For now, we don't change the name of the preference, but we *do* change
the description of the preference and the name of the variable.

Change-Id: I1f80b2e7187679dca787fda5f3d06e9d30536ddc
Reviewed-on: https://code.wireshark.org/review/12444
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoRevert "Build Flex-generated files with "warnings are errors"."
Guy Harris [Sat, 5 Dec 2015 17:12:50 +0000 (17:12 +0000)]
Revert "Build Flex-generated files with "warnings are errors"."

This reverts commit b56f53884be3bab935058b2bbbb4da0b8bbbe7f6.

Sadly, we *do* get warnings at this point with older versions of Flex,
such as the one on the 32-bit OS X buildbot.

Change-Id: I9aec1a16e9f2e1bbcfaac3dffdabdd89af5815e3
Reviewed-on: https://code.wireshark.org/review/12443
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoFix for bug 11856:
Andreas Urke [Sat, 5 Dec 2015 15:40:58 +0000 (16:40 +0100)]
Fix for bug 11856:
Correct parameter-name "opt-offset" to "offset" in macro
"tvb_eui64_to_str" in epan/to_str.h such that offset is taken into account
when converting eui64 to str.

Bug: 11856
Change-Id: Id0b17c4b9186b4c41d6fe338ba7c017e88f63acf
Reviewed-on: https://code.wireshark.org/review/12441
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoAdd missing table entry.
Michael Tüxen [Sat, 5 Dec 2015 12:15:17 +0000 (13:15 +0100)]
Add missing table entry.

Add a missing table entry for Stream Reset Response parameters.

Change-Id: I45172cace57cd3f628a94fd61c4cb37a6c2e17ed
Reviewed-on: https://code.wireshark.org/review/12439
Reviewed-by: Michael Tüxen
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoRTPS: Minor improvements
Juanjo Martin [Thu, 3 Dec 2015 11:08:03 +0000 (12:08 +0100)]
RTPS: Minor improvements

1) Fixed the guidPrefix deserialization (before it was showing
counter and it should be instanceId).
2) The PID_PARTICIPANT_GUID was a total mess. Now it looks perfect.
3) Fixed some bounds in the proto_tree creations so instead of
selecting the rest of the tvb, now they select what they have to.

Did all of this keeping the dissection for version 1 untouched.

Change-Id: I93df2a29e292655ceb3f8c1395f31d8e38106dee
Reviewed-on: https://code.wireshark.org/review/12406
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoBuild Flex-generated files with "warnings are errors".
Guy Harris [Sat, 5 Dec 2015 09:49:22 +0000 (01:49 -0800)]
Build Flex-generated files with "warnings are errors".

We shouldn't be getting warnings at this point.

Change-Id: I363a48546cb8d916425f42962ae1697d52ed9a29
Reviewed-on: https://code.wireshark.org/review/12436
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agopacketbb: fix the display of IPv4 addresses
Lotte Steenbrink [Fri, 4 Dec 2015 14:32:12 +0000 (14:32 +0000)]
packetbb: fix the display of IPv4 addresses

IPv4 Addresses are currently displayed incorrectly in RFC5444 Addressblocks.
For example, what should be `Address: 10.1.3.0` is incorrectly rendered as

        Address: 0.0.0.10

This commit fixes that.

Bug: 11852
Change-Id: Id6dc954e9a06e79375058f6070fe8e0f64167d64
Reviewed-on: https://code.wireshark.org/review/12429
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoBGP: fix some issue
Matt Texier [Fri, 4 Dec 2015 16:46:34 +0000 (17:46 +0100)]
BGP: fix some issue

Fixing ESI Label extended community
Fixing PMSI label field decoding on 20 bits
Fixing inclusive multicast Ethernet tag route
Fixing Ethernet segment route

Bug: 11650
Change-Id: Ifadcc3099f681a5c9480d1ccdd50b29ef4c0069f
Reviewed-on: https://code.wireshark.org/review/12430
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoECMP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Fri, 4 Dec 2015 09:58:38 +0000 (10:58 +0100)]
ECMP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Idd57cba39e82a2538bd8a8ceb2263ec23202c25a
Reviewed-on: https://code.wireshark.org/review/12424
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoEnhancements for EtherNet/IP and CIP
D. Ulis [Tue, 1 Dec 2015 19:25:52 +0000 (14:25 -0500)]
Enhancements for EtherNet/IP and CIP

EtherNet/IP
1. EtherNet Link object parsed Physical Address attribute response incorrectly.
2. Display Unknown Commands as ENIP instead of just TCP data.

CIP
1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123".
2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree.
3. Add some detailed error data for malformed Forward Close response.

Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea
Reviewed-on: https://code.wireshark.org/review/12339
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: D. Ulis <daulis0@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoECMP: fix indent
Alexis La Goutte [Fri, 4 Dec 2015 09:40:44 +0000 (10:40 +0100)]
ECMP: fix indent

Change-Id: I80e664185a34feaebc05fc089c405e658e3b1e60
Reviewed-on: https://code.wireshark.org/review/12423
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoRemove a remnant of the old removed support for Python dissectors.
Guy Harris [Sat, 5 Dec 2015 08:26:39 +0000 (00:26 -0800)]
Remove a remnant of the old removed support for Python dissectors.

Change-Id: Ib5dcfc3b6ed08310b5aa8ddc3e08a0951f24bbb4
Reviewed-on: https://code.wireshark.org/review/12434
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoUse noyywrap rather than defining our own yywrap functions.
Guy Harris [Sat, 5 Dec 2015 03:52:51 +0000 (19:52 -0800)]
Use noyywrap rather than defining our own yywrap functions.

Tweak lemonflex-tail.inc to fix an issue this reveals.

It appears that, at least on the buildbots, the Visual Studio compiler
no longer issues warnings for the code generated with %option noyywrap.

Change-Id: Id64d56f1ae8a79d0336488a4a50518da1f511497
Reviewed-on: https://code.wireshark.org/review/12433
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoCMake+PortableApps: Include the VC runtime (second try).
Gerald Combs [Fri, 4 Dec 2015 17:02:35 +0000 (09:02 -0800)]
CMake+PortableApps: Include the VC runtime (second try).

Move the code that finds the Visual C++ redistributable DLLs to its
own module. Run it before we create our NSIS and PortableApps targets.
Add a PortableApps target that copies the redistributable

This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4.

Bug: 11800
Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df
Reviewed-on: https://code.wireshark.org/review/12431
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f)
Reviewed-on: https://code.wireshark.org/review/12432
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
8 years agoExport prefs_register_module() and prefs_register_subtree() functions
Pascal Quantin [Fri, 4 Dec 2015 13:08:04 +0000 (14:08 +0100)]
Export prefs_register_module() and prefs_register_subtree() functions

Change-Id: I09796eadb5fb8b564adfab5060715571983b1bb3
Reviewed-on: https://code.wireshark.org/review/12428
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years ago[packet-h] Add defines to make it possible to convert functions prefixed
AndersBroman [Thu, 3 Dec 2015 09:05:05 +0000 (10:05 +0100)]
[packet-h] Add defines to make it possible to convert functions prefixed
with new_ to plain function names without changing all at the same time.

Change-Id: I52682996704ff2472c9830bb62fda2a3cbef6589
Reviewed-on: https://code.wireshark.org/review/12401
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoQt: fix a potential memory leak in RTP audio stream playback
Pascal Quantin [Fri, 4 Dec 2015 10:44:29 +0000 (11:44 +0100)]
Qt: fix a potential memory leak in RTP audio stream playback

Change-Id: I6847f85d56841f99594063bfb7441d0c40e452a7
Reviewed-on: https://code.wireshark.org/review/12425
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agocodecs: fix libary name when compiling with CMake
Pascal Quantin [Fri, 4 Dec 2015 06:59:01 +0000 (07:59 +0100)]
codecs: fix libary name when compiling with CMake

Change-Id: I0ef328ac9a1fd7281267dbb7f9d1ace97ab41071
Reviewed-on: https://code.wireshark.org/review/12422
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoAdds wmem_list_find function
Matthieu Coudron [Wed, 2 Dec 2015 22:34:53 +0000 (23:34 +0100)]
Adds wmem_list_find function

Change-Id: I72162210b830a57978e108032d75d8c54f17d16b
Reviewed-on: https://code.wireshark.org/review/12387
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoMore libcodecs -> libwscodecs.
Guy Harris [Fri, 4 Dec 2015 01:47:27 +0000 (17:47 -0800)]
More libcodecs -> libwscodecs.

Change-Id: I861c625a4bf36ec8bddebec483f43cf6b3cd7c09
Reviewed-on: https://code.wireshark.org/review/12421
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoMore libcodecs -> libwscodecs.
Guy Harris [Fri, 4 Dec 2015 00:09:57 +0000 (16:09 -0800)]
More libcodecs -> libwscodecs.

Change-Id: Ieb0bb131b6d141bf85997c9a0127e0eb11ea3a3b
Reviewed-on: https://code.wireshark.org/review/12420
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoChange codecs from static to dynamic library
Pascal Quantin [Thu, 3 Dec 2015 20:32:25 +0000 (21:32 +0100)]
Change codecs from static to dynamic library

This allows to properly register codecs plugins.
See https://www.wireshark.org/lists/wireshark-dev/201511/msg00202.html for details.

Change-Id: Ibc13a19936abb7a2e81b86582a75fa424351565b
Reviewed-on: https://code.wireshark.org/review/12385
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoModify application description of Wireshark in Korean. The transliteration "네트워크...
Shinjo Park [Thu, 3 Dec 2015 22:21:42 +0000 (23:21 +0100)]
Modify application description of Wireshark in Korean. The transliteration "네트워크" and "네트웍" is mixed in single file, but the former is standard notation.

Change-Id: Ie67a449a2269daef33c627bd4cf77434eeacf22b
Reviewed-on: https://code.wireshark.org/review/12418
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoMake the gauntlet a bit clearer.
Guy Harris [Thu, 3 Dec 2015 21:20:58 +0000 (13:20 -0800)]
Make the gauntlet a bit clearer.

if(is a fixed-length TDS type)
{
XXX
}
else if(is a variable-length TDS type)
{
XXX
}

Change-Id: Icaa8047ad76abe8b955fb5a025a057ddf8757b1f
Reviewed-on: https://code.wireshark.org/review/12415
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoqt: Refresh local interface list only when interfaces added/removed
Mikael Kanstrup [Mon, 30 Nov 2015 21:25:35 +0000 (22:25 +0100)]
qt: Refresh local interface list only when interfaces added/removed

Whenever data is received on the iface monitor socket the list of
local network interfaces is refreshed. No check whether an interface
is really added/removed is done. Changes to network interface options
like promiscous mode flag generate traffic on the iface monitor socket
that not necessarily mean an interface was brought up or down resulting
in an unwanted refresh of local interfaces.

When local interfaces are refreshed selected capture interface(s) get
deselected. This in turn makes "Restart current capture" fail with a no
capture interface selected error.

Fixed by moving the refresh action from socket monitor callback to iface
monitor callback where interface up/down status is known.

Bug: 11834
Change-Id: Iffd39c3240049880b5a8311bc6484f3d1433f387
Reviewed-on: https://code.wireshark.org/review/12317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoQt: Update menus with new recent settings when changing profile
Stig Bjørlykke [Thu, 3 Dec 2015 09:22:23 +0000 (10:22 +0100)]
Qt: Update menus with new recent settings when changing profile

Update all View options to new recent settings to reflect the changes.
Also show/hide toolbars and packet panes accordingly.

Change-Id: Idb07bd5c51c01810b1f4467d2401936dc533731b
Reviewed-on: https://code.wireshark.org/review/12405
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 years agoQt: Set timestamp precision when changing profile
Stig Bjørlykke [Thu, 3 Dec 2015 09:32:25 +0000 (10:32 +0100)]
Qt: Set timestamp precision when changing profile

Change-Id: I85622a8e2689283017ba038ce61d98e22f1c1af3
Reviewed-on: https://code.wireshark.org/review/12403
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 years ago[MP2T] Reading buffer should have MP2T_SIZE+TRAILER_LEN_MAX space to give room for...
Michael Mann [Thu, 3 Dec 2015 02:08:09 +0000 (21:08 -0500)]
[MP2T] Reading buffer should have MP2T_SIZE+TRAILER_LEN_MAX space to give room for non-zero trailer.

Bug: 11820
Change-Id: I7e0a603c20ca0c524399beb3d89e14c45dc3a06e
Reviewed-on: https://code.wireshark.org/review/12393
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoQt: Disable setStretchLastSection in the packet list.
Gerald Combs [Thu, 3 Dec 2015 01:51:00 +0000 (17:51 -0800)]
Qt: Disable setStretchLastSection in the packet list.

QTreeView sets the stretchLastSection property of its header by default.
In our case this means that if the sum of our recent column widths
exceeds the width of the packet list viewport QHeaderView will shrink
the last column to fit.

Disable setStretchLastSection. We want its behavior when our columns are
too narrow so check for that in ::showEvent and temporarily enable it
there.

Bug: 11738
Change-Id: Ia4aad63e4f4bf899891bcebb7032dc5ebeb74cc7
Reviewed-on: https://code.wireshark.org/review/12392
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoTDS: Sanity check number of columns to prevent crash.
Michael Mann [Thu, 3 Dec 2015 00:33:40 +0000 (19:33 -0500)]
TDS: Sanity check number of columns to prevent crash.

Bug: 11846
Change-Id: I6eac46dc397263fe005e803730c5d3084bfb7f74
Reviewed-on: https://code.wireshark.org/review/12391
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoQt: Set main window font when changing profile
Stig Bjørlykke [Wed, 2 Dec 2015 20:25:47 +0000 (21:25 +0100)]
Qt: Set main window font when changing profile

The font is part of the preferences.

Change-Id: Ibcdf1c06e92fc43547825b5fea9560e904003081
Reviewed-on: https://code.wireshark.org/review/12386
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoQt: Check display filter when changing profile
Stig Bjørlykke [Wed, 2 Dec 2015 21:15:28 +0000 (22:15 +0100)]
Qt: Check display filter when changing profile

The Display Filter Macros may have changed and if a macro is currently
used in the display filter then cf_redissect_packets() will bail
out in an assert if trying to apply an invalid filter.

Change-Id: I842016360672d76d190454ce80ccc7604f2075b3
Reviewed-on: https://code.wireshark.org/review/12388
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoQt: fix selection of folder in UAT dialog
Pascal Quantin [Wed, 2 Dec 2015 18:39:31 +0000 (19:39 +0100)]
Qt: fix selection of folder in UAT dialog

Using getOpenFileName() even with ShowDirsOnly option does not work.
Let's use the dedicated getExistingDirectory() method instead.

Bug: 11842
Change-Id: Ie22c4c479005467dbf64d9a90a8f3b82d355d495
Reviewed-on: https://code.wireshark.org/review/12384
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoFix address hashing broken in g4f39c60
Evan Huus [Wed, 2 Dec 2015 21:52:35 +0000 (16:52 -0500)]
Fix address hashing broken in g4f39c60

We actually have to *use* the return value of the method, which the macro did
for us.

Change-Id: I240ca7e526a18054fe39c6c4ded902998dc2fef0
Reviewed-on: https://code.wireshark.org/review/12389
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
8 years agosctp_chunk_stat_dlg: fix The 'u_data->assoc' variable is assigned values twice succes...
ruengeler [Wed, 2 Dec 2015 14:42:55 +0000 (15:42 +0100)]
sctp_chunk_stat_dlg: fix The 'u_data->assoc' variable is assigned values twice successively. found by PVS Studio (V519)

Change-Id: I01ac47693279b5681c40287f12a63ef767c9ad74
Reviewed-on: https://code.wireshark.org/review/12382
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoL2TP: define the Cisco ACK control message
Nicolas S. Dade [Wed, 2 Dec 2015 08:54:51 +0000 (00:54 -0800)]
L2TP: define the Cisco ACK control message

This is a common packet when sniffing Cisco routers performing L2TP
with their proprietary AVPs.

Change-Id: I8093f7e3ceb39c9af5b6292289c55f705b53dffb
Reviewed-on: https://code.wireshark.org/review/12368
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoOSTIP: fix typo found by PVS Studio (V519)
Alexis La Goutte [Wed, 2 Dec 2015 08:19:41 +0000 (09:19 +0100)]
OSTIP: fix typo found by PVS Studio (V519)

The 'pinfo->clnp_dstref' variable is assigned values twice successively

Change-Id: I02b8ae54728f88c2173b4522d436bd2f7b1b7bc0
Reviewed-on: https://code.wireshark.org/review/12365
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoL2TP: fix typo: s/zero length bit/zero length body/
Nicolas S. Dade [Wed, 2 Dec 2015 08:36:08 +0000 (00:36 -0800)]
L2TP: fix typo: s/zero length bit/zero length body/

A "ZLB" message is a Zero Length Body message. See RFC 3931

Change-Id: I89d8f2328754e236f0704f851831fd8274f3b99e
Reviewed-on: https://code.wireshark.org/review/12366
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoui: Guard update_local_interfaces with HAVE_LIBPCAP
Stig Bjørlykke [Wed, 2 Dec 2015 12:21:05 +0000 (13:21 +0100)]
ui: Guard update_local_interfaces with HAVE_LIBPCAP

Change-Id: I276193047e37cf581fd42ccc74ff9131ee4fa055
Reviewed-on: https://code.wireshark.org/review/12377
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 years agoL2TP: show unsigned value of control connection id
Nicolas S. Dade [Wed, 2 Dec 2015 08:49:20 +0000 (00:49 -0800)]
L2TP: show unsigned value of control connection id

Everywhere else in the l2tp packet tree we show the control connection ID as
an unsigned decimal.

Change-Id: I189b9ce8c56b024a249d18fc62641c2f5283b0c1
Reviewed-on: https://code.wireshark.org/review/12367
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoui: Update interfaces when when changing profile.
Stig Bjørlykke [Wed, 2 Dec 2015 08:13:40 +0000 (09:13 +0100)]
ui: Update interfaces when when changing profile.

The interfaces preferences are different for each profile so ensure
we update the interface settings when changing profile.

This bug was introduced in version 1.8.0.

Change-Id: Icf22670875e01bab6204c300ddc7fb8aeb3dcecf
Reviewed-on: https://code.wireshark.org/review/12363
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 years agoQt: Use uniform interface display name
Stig Bjørlykke [Wed, 2 Dec 2015 06:32:48 +0000 (07:32 +0100)]
Qt: Use uniform interface display name

Use common function to generate the interface display name, both
when scanning for interfaces (scan_local_interfaces()) and when
changing Comment in the Manage Interfaces dialog.

Change-Id: I3260208856563aaf387ce397d4ae61bddcc89b4f
Reviewed-on: https://code.wireshark.org/review/12362
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years ago[SUA] Change the dissector table sua.prop.tags to use DISSECTOR_TABLE_ALLOW_DUPLICATE
AndersBroman [Wed, 2 Dec 2015 09:37:03 +0000 (10:37 +0100)]
[SUA] Change the dissector table sua.prop.tags to use DISSECTOR_TABLE_ALLOW_DUPLICATE

Change-Id: Iaabd69e5779534c1cf73b2c1ab1b957bb30c44d3
Reviewed-on: https://code.wireshark.org/review/12373
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoPCP: Use GLib 2.32 < supported hash functions
Ryan Doyle [Wed, 2 Dec 2015 07:37:19 +0000 (18:37 +1100)]
PCP: Use GLib 2.32 < supported hash functions

GLib 2.32 is required for use of g_hash_table_contains function

Change-Id: Ia2af2868ab1029d392d921d915b8898fb5ec81a4
Reviewed-on: https://code.wireshark.org/review/12361
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoPCP: Implement PMID to name mapping
Ryan Doyle [Mon, 30 Nov 2015 11:25:41 +0000 (22:25 +1100)]
PCP: Implement PMID to name mapping

Tracks the interation between PMNS_NAMES and PMNS_IDS packets to build
up a mapping from PMID to a text name and displays the name whenever the
PMID is displayed.

Change-Id: I665b293c32fee95b649fe6a6e26989db1eff38e0
Reviewed-on: https://code.wireshark.org/review/12303
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agobtatt - make size 32-bit in get_value()
Michael Mann [Wed, 2 Dec 2015 01:12:18 +0000 (20:12 -0500)]
btatt - make size 32-bit in get_value()

Bug: 11817
Change-Id: I118ff55f9a709167976a2522114d65ec03fc68c5
Reviewed-on: https://code.wireshark.org/review/12353
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoOnly check for the last nibble being 0x0f.
Guy Harris [Wed, 2 Dec 2015 01:47:27 +0000 (17:47 -0800)]
Only check for the last nibble being 0x0f.

That's what my_dgt_tbcd_unpack() did; do the same thing here.

Change-Id: Ia68c6ba652c748bd2661fd6eda736e880f414dc5
Reviewed-on: https://code.wireshark.org/review/12359
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoAdd a separate expert info for "not a valid digit".
Guy Harris [Wed, 2 Dec 2015 01:42:47 +0000 (17:42 -0800)]
Add a separate expert info for "not a valid digit".

That should be used in for errors in the BCD strings where only 0
through 9 ar valid.

Fix comments to reflect that the two checks for '?' in the output of
tvb_bcd_dig_to_wmem_packet_str() are doing different checks - one is
checking for end-of-string padding, the other is checking for anything
that's not a digit.

Change-Id: I615587b34883ed5bfdc57827451c6e00e213fa5f
Reviewed-on: https://code.wireshark.org/review/12358
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years ago"#if 0" out unused variables.
Guy Harris [Wed, 2 Dec 2015 01:35:23 +0000 (17:35 -0800)]
"#if 0" out unused variables.

Change-Id: If6663c18a809b13faa14744c3b0ee625ef03ea03
Reviewed-on: https://code.wireshark.org/review/12357
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoFix field long name.
Guy Harris [Wed, 2 Dec 2015 01:31:25 +0000 (17:31 -0800)]
Fix field long name.

(Copy-and-pasteo.)

Add some comments while we're at it.

Change-Id: If03a43203a2ee7fad54b76cbdaf9318768edc1b0
Reviewed-on: https://code.wireshark.org/review/12354
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoeCMP Dissector - Extensible Control & Management Protocol
James Lynch [Wed, 2 Dec 2015 00:03:27 +0000 (19:03 -0500)]
eCMP Dissector - Extensible Control & Management Protocol

Developed by Emerson Industrial Automation (Control Techniques Division)
eCMP is a protocol for setting up and controlling the devices in a factory
automation system. eCMP has about 30 commands; most are embedded into TCP/IP
messages, but cyclic data messages use the UDP protocol.

Bug: 10562
Change-Id: I9a421f39dfbdbc9e28d8f7cba72c22e270064641
Reviewed-on: https://code.wireshark.org/review/3157
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoMove the bitrate test against 0 to mp2t_bits_per_second().
Guy Harris [Wed, 2 Dec 2015 00:35:00 +0000 (16:35 -0800)]
Move the bitrate test against 0 to mp2t_bits_per_second().

As the comment says, that routine "[ensures] there is a valid bitrate",
and a bitrate of 0, which comes from truncating a fractional bitrate, is
not a valid bitrate (an MPEG-2 Transport Stream with a bitrate less than
1 bit per second is not going to carrry any sensible audio/video
stream).

Make the "first" argument unsigned; it can never be negative.
Restructure the code and change some data types to make it more obvious
that it can't.

Change-Id: Idd4d073dc558bb31271318e14b2f74292cd16a2b
Reviewed-on: https://code.wireshark.org/review/12352
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years ago[NBAP] Fix SIGSEGV in dissect_nbap_MACdPDU_Size
Michael Mann [Tue, 1 Dec 2015 21:53:34 +0000 (16:53 -0500)]
[NBAP] Fix SIGSEGV in dissect_nbap_MACdPDU_Size

Bug: 11815
Change-Id: I107cf90df87bdafa23bd4b81acbc25d98773b223
Reviewed-on: https://code.wireshark.org/review/12347
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoQt Frames: Use ButtonBox instead of buttons
Roland Knall [Tue, 1 Dec 2015 14:41:44 +0000 (15:41 +0100)]
Qt Frames: Use ButtonBox instead of buttons

 In these frames the Ok and Close buttons are implemented
 as standalone buttons. This leads to the scenario, that
 they break plattform-ui preferences on the one hand, as
 well as not being the same order throughout.

 This patch replaces all Ok/Close buttons with the Qt
 button box, which handles the plattform-ui internally, and
 additionally allways enforces the same order.

Change-Id: If62b90016b222322f60c0962da04c8277589a57f
Reviewed-on: https://code.wireshark.org/review/12335
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years ago[IPMI] packet-scope isn't valid for use in BASE_CUSTOM functions.
Michael Mann [Tue, 1 Dec 2015 20:37:38 +0000 (15:37 -0500)]
[IPMI]  packet-scope isn't valid for use in BASE_CUSTOM functions.

Bug: 11831
Change-Id: Ic4b963bf5a790c2f57b26a15f6226924f742fa55
Reviewed-on: https://code.wireshark.org/review/12340
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoautotools: Fix g212f2f1
João Valverde [Tue, 1 Dec 2015 21:26:35 +0000 (21:26 +0000)]
autotools: Fix g212f2f1

Change-Id: If7185885faea2319fdce4d89a7a9bf40312bcfa6
Reviewed-on: https://code.wireshark.org/review/12346
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoQt: write number of decoded bytes in the RTP player temporary buffer
Pascal Quantin [Tue, 1 Dec 2015 18:23:32 +0000 (19:23 +0100)]
Qt: write number of decoded bytes in the RTP player temporary buffer

For codecs using compression (so not G.711) the number of decoded bytes is different from payload len * sample bytes.
This result in a truncated audio buffer and inaudible audio.

Change-Id: I755c19df37820c1c56acc7bd7b67fcc104516474
Reviewed-on: https://code.wireshark.org/review/12336
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoQt: fix generation of silence samples
Pascal Quantin [Tue, 1 Dec 2015 18:40:41 +0000 (19:40 +0100)]
Qt: fix generation of silence samples

The current code generates a shrill noise at least on Windows.
Presumably memccpy does not behave as initially expected :)

Change-Id: Id23a35d1d41ef4044b6a96c093a8fa927828f8b3
Reviewed-on: https://code.wireshark.org/review/12337
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoBugfixes for EtherNet/IP and CIP
D. Ulis [Mon, 30 Nov 2015 18:10:19 +0000 (13:10 -0500)]
Bugfixes for EtherNet/IP and CIP

EtherNet/IP
1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data.
2. Typos

CIP
1. Many Time Sync attribute responses were flagged incorrectly as malformed.
2. Create service response highlighted the instance number incorrectly, and showed warnings.
3. Set Attribute List Request should exit early if it doesn't know about a particular attribute.
4. Incorrect format for Safety Network Segment: Router Format.
5. Typos

Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897
Reviewed-on: https://code.wireshark.org/review/12321
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoFix to avoid protection exception in cf_goto_frame
Paul Offord [Sun, 29 Nov 2015 22:49:46 +0000 (22:49 +0000)]
Fix to avoid protection exception in cf_goto_frame

A call to plugin_if_goto_frame when there is no capture file
loaded causes a protection exception in cf_goto_file.  This
fix avoids that problem.

Bug: 11810
Change-Id: I7e6f31690a4b0d8d4252b41d8d438979cb253050
Reviewed-on: https://code.wireshark.org/review/12306
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agosctp_byte_graph_dlg: fix The 'u_data' variable is assigned to itself found by PVS...
Alexis La Goutte [Tue, 1 Dec 2015 18:59:40 +0000 (19:59 +0100)]
sctp_byte_graph_dlg: fix The 'u_data' variable is assigned to itself found by PVS Studio (V570)

Change-Id: I6cde7c8357ad6295706c64ce6d280a867bdb9aad
Reviewed-on: https://code.wireshark.org/review/12338
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agostats_tree: re-indent else for avoid warning found by PVS Studio (V705)
Alexis La Goutte [Tue, 1 Dec 2015 14:09:27 +0000 (15:09 +0100)]
stats_tree: re-indent else for avoid warning found by PVS Studio (V705)

It is possible that 'else' block was forgotten or commented out, thus altering the program's operation logics

Change-Id: Ie246592282bd0791021159f90b4b8aeb92cff86f
Reviewed-on: https://code.wireshark.org/review/12333
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agofile: fix Potentially uninitialized variable 'err/err_info' used found by PVS Studio...
Alexis La Goutte [Tue, 1 Dec 2015 14:02:06 +0000 (15:02 +0100)]
file: fix Potentially uninitialized variable 'err/err_info' used found by PVS Studio (V614)

Change-Id: I9abc192c492c98beb4cdc32e623115849ad6d512
Reviewed-on: https://code.wireshark.org/review/12332
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoRemoved some remaining svn Id tags
Stig Bjørlykke [Tue, 1 Dec 2015 11:06:30 +0000 (12:06 +0100)]
Removed some remaining svn Id tags

Change-Id: I7ffbf59099132cde55995bde991d1c6a5dd224b0
Reviewed-on: https://code.wireshark.org/review/12330
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 years agoIncorrect information in README.plugins Section 6
Paul Offord [Mon, 30 Nov 2015 13:56:40 +0000 (13:56 +0000)]
Incorrect information in README.plugins Section 6

The examples showing how to add menu entries are based on
older versions of some of the related functions.  This change
corrects those examples.

Bug: 11819
Change-Id: Iad9beb2e87d3d1efe5f9dfa93a0e7110b8d9f53a
Reviewed-on: https://code.wireshark.org/review/12308
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoArt-Net: Fix ArtAddress dissection
Ryan Mullen [Mon, 30 Nov 2015 03:05:58 +0000 (22:05 -0500)]
Art-Net: Fix ArtAddress dissection

Parse and display NetSwitch and SubSwitch fields, treating 0x00 and 0x7f
as "special" values with meaning beyond what is usually offered by these
fields.

Change-Id: Idf94361793441f5f4b32c23e7f7f9250ed952a37
Reviewed-on: https://code.wireshark.org/review/12279
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years ago[NBAP] Prevent crash.
Michael Mann [Tue, 1 Dec 2015 04:42:33 +0000 (23:42 -0500)]
[NBAP] Prevent crash.

If no previous conversation exists, a memcpy will try to copy from NULL destination.

Bug: 11835
Change-Id: I445480bb425834c5a918f1ffa148cb83d6c9750c
Reviewed-on: https://code.wireshark.org/review/12326
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoQt: Don't expose ColorUtils::graph_colors_.
Gerald Combs [Mon, 30 Nov 2015 22:42:42 +0000 (14:42 -0800)]
Qt: Don't expose ColorUtils::graph_colors_.

Make graph_colors_ private and accessible via getters. Blind attempt at
fixing bug 11833.

Bug: 11833
Change-Id: I03b7e90c686374d2d0f046f7e5fe87e43939dc82
Reviewed-on: https://code.wireshark.org/review/12318
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years ago[MP2T] Prevent divide by zero.
Michael Mann [Tue, 1 Dec 2015 03:06:43 +0000 (22:06 -0500)]
[MP2T] Prevent divide by zero.

Bug: 11821
Change-Id: I3243c837d84ccbce7d377810a5f381e906aeb1eb
Reviewed-on: https://code.wireshark.org/review/12323
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years ago[S7COMM] Prevent divide by zero.
Michael Mann [Tue, 1 Dec 2015 02:52:35 +0000 (21:52 -0500)]
[S7COMM] Prevent divide by zero.

Bug: 11823
Change-Id: I4437efb3dc9532e3d29aacd36736d6f7b3ed38a2
Reviewed-on: https://code.wireshark.org/review/12322
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoautotools: Clean abi-check with maintainer-clean
João Valverde [Wed, 25 Nov 2015 06:28:50 +0000 (06:28 +0000)]
autotools: Clean abi-check with maintainer-clean

Change-Id: Ia2ce54592485d2995bcfd56bd127a2fedb1a7d07
Reviewed-on: https://code.wireshark.org/review/12293
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agows80211: Disable shorten-64-to-32.
Gerald Combs [Mon, 30 Nov 2015 22:11:22 +0000 (14:11 -0800)]
ws80211: Disable shorten-64-to-32.

Disable shorten-64-to-32 in ws80211_create_on_demand_interface,
which calls NLA_PUT_STRING, which passes the output of strlen to an
int parameter. NLA_PUT_STRING is defined in netlink/attr.h so there's
not much we can do to fix it directly.

Suppress -Wpragmas before suppressing warnings in gcc so that we can
use DIAG_OFF with clang-only warnings.

Change-Id: I1180950edd93c056b8fbfbed164e482024aee90a
Reviewed-on: https://code.wireshark.org/review/12314
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoSpeexDSP: Work around self assignments.
Gerald Combs [Mon, 30 Nov 2015 22:24:19 +0000 (14:24 -0800)]
SpeexDSP: Work around self assignments.

Disable -Wself-assign in speex/resample.c. Many macros (particularly
SATURATE32PSHR) simply return the first argument.

Change-Id: I3a8557833343e7b213031359e94af90d32d9f082
Reviewed-on: https://code.wireshark.org/review/12315
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agomausb: The '&' operator is applied to bool type value found by PVS Studio (V564)
Alexis La Goutte [Mon, 30 Nov 2015 20:00:24 +0000 (21:00 +0100)]
mausb: The '&' operator is applied to bool type value found by PVS Studio (V564)

You've probably forgotten to include parentheses or intended to use the '&&' operator

Change-Id: Ie9c79729f2ec67aa9579dca40b2e904a9047218f
Reviewed-on: https://code.wireshark.org/review/12313
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agomausb: Fix A part of conditional expression is always true found by PVS Studio (V560)
Alexis La Goutte [Mon, 30 Nov 2015 19:58:23 +0000 (20:58 +0100)]
mausb: Fix A part of conditional expression is always true found by PVS Studio (V560)

!del is always true (else if before)

Change-Id: I21e335eb3035ec17e990076a4895006d3138f16b
Reviewed-on: https://code.wireshark.org/review/12312
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoIMAP: fix Recurring check found by PVS Studio (V571)
Alexis La Goutte [Mon, 30 Nov 2015 19:53:03 +0000 (20:53 +0100)]
IMAP: fix Recurring check found by PVS Studio (V571)

The 'session_state->ssl_requested' condition was already verified in line 259

Change-Id: I6813176b2c235780785ff258377a7fd77a2cf24a
Reviewed-on: https://code.wireshark.org/review/12311
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoadb service/logcat : fix Consider inspecting this expression. The expression is exces...
Alexis La Goutte [Mon, 30 Nov 2015 16:26:30 +0000 (17:26 +0100)]
adb service/logcat : fix Consider inspecting this expression. The expression is excessive or contains a misprint found by PVS Studio (V590)

Change-Id: I59cf9c8b2aab347023dea323602dd6ff85ac7ab6
Reviewed-on: https://code.wireshark.org/review/12309
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoSMB2: fix problems with dissection of error response
DiablosOffens [Sun, 29 Nov 2015 11:16:15 +0000 (12:16 +0100)]
SMB2: fix problems with dissection of error response

Sometimes it isn't actually an error response but a normal packet with a non-zero status code to indicate a warning or information. This should be handled as a normal case and not break the dissection

Change-Id: I7104608d67cbc7528994bd86812ea5241f1e4460
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/12282
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agomain_window: fix no previous prototype for function 'plugin_if_mainwindow_gotoframe...
Alexis La Goutte [Mon, 30 Nov 2015 11:28:24 +0000 (12:28 +0100)]
main_window: fix no previous prototype for function 'plugin_if_mainwindow_gotoframe' [-Wmissing-prototypes]

Change-Id: I2ac9d2250e8553b4cbd4146f931b618424dffdf5
Reviewed-on: https://code.wireshark.org/review/12304
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoAdd BASE_ALLOW_ZERO for byte arrays that are validly zero sized.
Michael Mann [Sun, 29 Nov 2015 00:13:59 +0000 (00:13 +0000)]
Add BASE_ALLOW_ZERO for byte arrays that are validly zero sized.

<MISSING> implies that the field should be there and isn't.  Allow dissectors to specify when a zero-sized array for a field is perfectly valid.

Ping-Bug: 11803
Change-Id: I3fd60e3c6f832c6b4a3a8837ebc52c3e74e795ae
Reviewed-on: https://code.wireshark.org/review/12271
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agomcast_stream_dlg: fix no previous prototype for function 'mcaststream_dlg_update...
Alexis La Goutte [Mon, 30 Nov 2015 11:28:29 +0000 (12:28 +0100)]
mcast_stream_dlg: fix no previous prototype for function 'mcaststream_dlg_update' [-Wmissing-prototypes]

Change-Id: I7088dfcc0c5873732d972435638f951d5b1921f0
Reviewed-on: https://code.wireshark.org/review/12305
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoRemove some THROWs and just return when lengths are bad.
Michael Mann [Fri, 27 Nov 2015 22:35:27 +0000 (17:35 -0500)]
Remove some THROWs and just return when lengths are bad.

Change-Id: I4e01117e0cf0600be75f75336f22d011c4964113
Reviewed-on: https://code.wireshark.org/review/12298
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoCMake: Fix breakage with CMake 3
Ryan Doyle [Mon, 30 Nov 2015 08:19:03 +0000 (19:19 +1100)]
CMake: Fix breakage with CMake 3

This fix was accidentally reverted in d6da952. Tested with CMake
2.8.12.2 and 3.3.2.

Change-Id: I05312eb9ec18be88be6155edb1ced67ea2ee2bba
Reviewed-on: https://code.wireshark.org/review/12301
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoHandle Date: headers differently from other headers.
Guy Harris [Mon, 30 Nov 2015 08:31:12 +0000 (00:31 -0800)]
Handle Date: headers differently from other headers.

Handle Date: outside the "loop over magic strings" loop; that way, we
don't have to compare against "Date:" twice.

Don't use strlen() on constant strings - sizeof string - 1 lets us
calculate the length at compile time.

Change-Id: I7e4ff2f9762f96749a39609efa76430e5915d4f4
Reviewed-on: https://code.wireshark.org/review/12302
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoAdd some comments explaining what some code is doing.
Guy Harris [Mon, 30 Nov 2015 04:59:26 +0000 (20:59 -0800)]
Add some comments explaining what some code is doing.

Change-Id: Ib229fcf4d14fd3c01755f868789f430496c23ded
Reviewed-on: https://code.wireshark.org/review/12300
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoTreat invalid (negative or too-large) values in the packet header as errors.
Guy Harris [Mon, 30 Nov 2015 04:29:55 +0000 (20:29 -0800)]
Treat invalid (negative or too-large) values in the packet header as errors.

Change-Id: I86564c485aacd3fcba3f3d8d9da492e0100155e8
Reviewed-on: https://code.wireshark.org/review/12299
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 years agoFix out-of-bounds read in ascend_seek.
Michael Mann [Sat, 28 Nov 2015 21:17:22 +0000 (16:17 -0500)]
Fix out-of-bounds read in ascend_seek.

Bug: 11794
Change-Id: I74517806b119729ae6d9780bbd4bb094701ff05e
Reviewed-on: https://code.wireshark.org/review/12266
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoArt-Net: Add missing DHCP-Enabled flags where needed
Ryan Mullen [Sun, 29 Nov 2015 16:04:30 +0000 (11:04 -0500)]
Art-Net: Add missing DHCP-Enabled flags where needed

Added flag to Command field in ArtIpProg and introduced new Status field
in ArtIpProgReply.

Change-Id: I88363eb83646953ae5a01faebe88b4016db09ba0
Reviewed-on: https://code.wireshark.org/review/12287
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoAdd bounds checking to find_signature.
Michael Mann [Sun, 29 Nov 2015 00:08:11 +0000 (19:08 -0500)]
Add bounds checking to find_signature.

Bug: 11791
Change-Id: Ibaa2c16229c1b78818283ba5f954b09f3894dc60
Reviewed-on: https://code.wireshark.org/review/12270
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agocfutils.c: Fix ISO C forbids an empty translation unit [-Wpedantic]
João Valverde [Wed, 25 Nov 2015 05:46:40 +0000 (05:46 +0000)]
cfutils.c: Fix ISO C forbids an empty translation unit [-Wpedantic]

Change-Id: Iac9384e63a4e946c73832103f8d6949f0187fa38
Reviewed-on: https://code.wireshark.org/review/12147
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 years agoIPv6: Add ipv6extprotostr() to ipproto.h
João Valverde [Sun, 29 Nov 2015 15:22:36 +0000 (15:22 +0000)]
IPv6: Add ipv6extprotostr() to ipproto.h

Move ipv6_exthdr_check() to ipproto.c.

Seems a better fit, prevents future code duplication.

Change-Id: I84f247febd1499e334289e3057ec1d8ba32d5bcc
Reviewed-on: https://code.wireshark.org/review/12283
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoQt: Check capture filter only once when selecting interface(s)
Stig Bjørlykke [Sat, 28 Nov 2015 22:54:52 +0000 (23:54 +0100)]
Qt: Check capture filter only once when selecting interface(s)

Changed to only check capture filter once (for each active DLT) when
changing selected interface(s).  This optimizes filter checking and
avoids a "No interfaces selected" error when processing unselected
interfaces before selected.

Added a small optimization fetching device_name outside loop.

Bug: 11671
Change-Id: I01ed7a99a2a9ced9a86774a78bec2ba27b4bb97c
Reviewed-on: https://code.wireshark.org/review/12268
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 years agoGSM SMS: fix reassembly of UCS2 encoded SMS
Pascal Quantin [Sun, 29 Nov 2015 16:57:02 +0000 (17:57 +0100)]
GSM SMS: fix reassembly of UCS2 encoded SMS

Bug: 11809
Change-Id: I5cbf43cbc9d0f33fa527aef1be4d5105f1d795a7
Reviewed-on: https://code.wireshark.org/review/12288
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years agoDocbook: We no longer support Windows Server 2003.
Gerald Combs [Sun, 29 Nov 2015 00:31:21 +0000 (16:31 -0800)]
Docbook: We no longer support Windows Server 2003.

Try to clarify 2003 and XP support in the User's and Developer's guides.

Change-Id: Id08b21374485bf7655b83bb20b7c3d70f8871499
Reviewed-on: https://code.wireshark.org/review/12275
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoUSB: allow usb string descriptor short read
Thies Moeller [Sun, 29 Nov 2015 09:45:39 +0000 (09:45 +0000)]
USB: allow usb string descriptor short read

Some drivers do a probing access to the descriptor to fetch just the length field

Change-Id: Idd07a1e66800afcc838beb795594a4505ce13e82
Reviewed-on: https://code.wireshark.org/review/12250
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 years ago[Automatic update for 2015-11-29]
Gerald Combs [Sun, 29 Nov 2015 16:13:45 +0000 (08:13 -0800)]
[Automatic update for 2015-11-29]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Id342a0bfe0bea352813c19adae67fb41806eb7d3
Reviewed-on: https://code.wireshark.org/review/12284
Reviewed-by: Gerald Combs <gerald@wireshark.org>