metze/wireshark/wip.git
4 years agoNote that variadic macros *can* be sued.
Guy Harris [Sat, 2 Jan 2016 23:14:24 +0000 (15:14 -0800)]
Note that variadic macros *can* be sued.

Change-Id: I15bfda76256e5d1084ad7c64006f93afaf071a9e
Reviewed-on: https://code.wireshark.org/review/13010
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoBuild: On Windows, ensure we have found Cygwin bash
Graham Bloice [Sat, 2 Jan 2016 21:41:00 +0000 (21:41 +0000)]
Build: On Windows, ensure we have found Cygwin bash

git can be installed (or the path manually set) so that the msys
unix utilities supplied with git (expecially bash) are on the path
and then picked up by CMake.  These utilities are not compatible with
the build and will fail.

This change checks the output of the --version option to the found
executable and ensures "cygwin" is found in the result.  If not found
a FATAL_ERROR message is issued and the CMake generation is stopped.

Change-Id: I0eca014ae194862abbc8dee56d347526691e72cb
Reviewed-on: https://code.wireshark.org/review/13008
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
4 years agoMoved variable declaration top, to be C89 compliant
Thomas Wiens [Sat, 2 Jan 2016 11:51:20 +0000 (12:51 +0100)]
Moved variable declaration top, to be C89 compliant

Change-Id: I83b96f8cdabbb3ae67172659492f5992c95fbe73
Reviewed-on: https://code.wireshark.org/review/13004
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoGet rid of an unnecessary level of indirection.
Guy Harris [Sat, 2 Jan 2016 01:09:14 +0000 (17:09 -0800)]
Get rid of an unnecessary level of indirection.

Instead of an array of pointers to preference values, have an array
of preference values.

Clean up some white space while we're at it.

Change-Id: Iaa2cf6bcc2a271a5c2645ddbb2dbddba311b413d
Reviewed-on: https://code.wireshark.org/review/13002
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUse #defines for the values for the facility_encoding preference.
Guy Harris [Sat, 2 Jan 2016 00:31:51 +0000 (16:31 -0800)]
Use #defines for the values for the facility_encoding preference.

Change-Id: I496782308e2f2e9605f2256d7a482d50b086e49c
Reviewed-on: https://code.wireshark.org/review/13001
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUpdate PNG_VERSION to the only version that actually exists.
Joerg Mayer [Sat, 2 Jan 2016 00:09:33 +0000 (01:09 +0100)]
Update PNG_VERSION to the only version that actually exists.
At least with Qt5.5.1 there is no duplicate clang_64 in the qt path.

Change-Id: I2ac66f246b3c9dbe2155ee8394d31e7d560faaf9
Reviewed-on: https://code.wireshark.org/review/13000
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
4 years agoifdef out the decryption code and preferences if LIBGCRYPT isn't defined.
Guy Harris [Fri, 1 Jan 2016 20:46:22 +0000 (12:46 -0800)]
ifdef out the decryption code and preferences if LIBGCRYPT isn't defined.

Change-Id: Idf4f1e461d3bc6e85f2760488ad566a4cd70c5ea
Reviewed-on: https://code.wireshark.org/review/12999
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDNP3: dissector cleanup
Graham Bloice [Fri, 1 Jan 2016 17:46:23 +0000 (17:46 +0000)]
DNP3: dissector cleanup

Cleaned up handling of the qualifier field.  Sub-parts are now
identified as the prefix and range rather than index and code.

This has changed the field names;
  dnp3.al.objq.index -> dnp3.al.objq.prefix
  dnp3.al.objq.code  -> dnp3.al.objq.range

and the associated packet tree details text strings.

Change-Id: I42d51b71233303eaf8b37982dd15b5090918630b
Reviewed-on: https://code.wireshark.org/review/12998
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
4 years agoOnly use nibble logic to determine MPLS payload
Michael Mann [Thu, 31 Dec 2015 20:16:23 +0000 (15:16 -0500)]
Only use nibble logic to determine MPLS payload

Bug: 11949
Change-Id: I625d80ce01918bd050889d21236aaa4cde4af8d0
Reviewed-on: https://code.wireshark.org/review/12961
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoMake color filters part of dissection
Michael Mann [Wed, 30 Dec 2015 20:28:07 +0000 (15:28 -0500)]
Make color filters part of dissection

Color filters can be seen as a function that takes a tree and display
filters as input and a (possibly empty) coloring rule as output.
This coloring rule is then added to the frame tree and used by the GUI
for coloring the packets list.

From an architectural POV, "coloring" is part of the UI component, but
since it influences the tree, it is something for the dissection
component.

Bug: 5703
Bug: 6099
Change-Id: I73d132ec1dca7262bcb1b55c8481ca564c6161d1
Reviewed-on: https://code.wireshark.org/review/12507
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoGTK: add a missing cast in dissector_tables_dlg.c
Pascal Quantin [Fri, 1 Jan 2016 13:51:09 +0000 (14:51 +0100)]
GTK: add a missing cast in dissector_tables_dlg.c

Change-Id: I1f763a6046fc06b221742e70edd39055586e45d0
Reviewed-on: https://code.wireshark.org/review/12990
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>
4 years agoWelcome in 2016, part 2
Stig Bjørlykke [Fri, 1 Jan 2016 14:22:47 +0000 (15:22 +0100)]
Welcome in 2016, part 2

Change-Id: I75f87b78ecec0859d0ebecee39ec257374f86541
Reviewed-on: https://code.wireshark.org/review/12993
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoWelcome in 2016
Pascal Quantin [Fri, 1 Jan 2016 13:37:21 +0000 (14:37 +0100)]
Welcome in 2016

Change-Id: I727dcd07093de7cb9381804fbcf4c0e1a99a3d6c
Reviewed-on: https://code.wireshark.org/review/12989
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoClean up response matching type preference.
Guy Harris [Fri, 1 Jan 2016 05:15:19 +0000 (21:15 -0800)]
Clean up response matching type preference.

Add #defines for all the value types and use them.

Make the preference static, as it's not used outside this module.

Change-Id: I3ed715701f77d5ea6cc45c8f978d6e2da7b38671
Reviewed-on: https://code.wireshark.org/review/12988
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoClean up response matching type preference.
Guy Harris [Fri, 1 Jan 2016 05:09:15 +0000 (21:09 -0800)]
Clean up response matching type preference.

Add #defines for all the value types and use them.

Make the preference static, as it's not used outside this module.

Change-Id: Ibd04274b4160d18a55b10f47ce866ac97a76309e
Reviewed-on: https://code.wireshark.org/review/12987
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoGet rid of trailing whitespace.
Guy Harris [Fri, 1 Jan 2016 04:17:39 +0000 (20:17 -0800)]
Get rid of trailing whitespace.

Change-Id: If6347938525194c08465b9b383edf8fb7eaf1e49
Reviewed-on: https://code.wireshark.org/review/12986
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoNo need for toolkit-dependent color initialization.
Guy Harris [Fri, 1 Jan 2016 04:14:08 +0000 (20:14 -0800)]
No need for toolkit-dependent color initialization.

We're not allocating colors ourselves in GTK+ (and haven't been doing so
since at least 1.12), and all color_t values are valid colors, so
we don't need any toolkit-specific processing to fill in a color_t.

While we're at it, catch read errors when reading color filter files.

Change-Id: Ieb520d141cf15e371a31a01459d466c95ba2209b
Reviewed-on: https://code.wireshark.org/review/12985
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoGet rid of the "pixel" member of a color_t.
Guy Harris [Fri, 1 Jan 2016 02:04:37 +0000 (18:04 -0800)]
Get rid of the "pixel" member of a color_t.

Now that we're letting GTK+/GDK allocate colors behind the scenes, if it
allocates them at all, there's no reason to save the allocated color in
the toolkit-independent color value.

Change-Id: I99df32bd6b07924f41f3d855d2ddecb3dc8d5201
Reviewed-on: https://code.wireshark.org/review/12983
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRemove more unused stuff.
Guy Harris [Fri, 1 Jan 2016 01:13:54 +0000 (17:13 -0800)]
Remove more unused stuff.

Change-Id: I65f8497605cf8534227c85dd2094eeab3e77b4b9
Reviewed-on: https://code.wireshark.org/review/12982
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoNo, you don't have to allocate colors.
Guy Harris [Fri, 1 Jan 2016 01:12:15 +0000 (17:12 -0800)]
No, you don't have to allocate colors.

That code's been unused since at least 1.12, so apparently it's not
needed.  To the extent that it needs to be allocated at all - which is
the case only if a colormap is being used - it's apparently all done
under the covers.

Change-Id: Ib25bfba618b0af4a60ce991a974de1e3f2f89158
Reviewed-on: https://code.wireshark.org/review/12981
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoCPack: WiX updates.
Gerald Combs [Thu, 31 Dec 2015 22:56:45 +0000 (14:56 -0800)]
CPack: WiX updates.

WiX prefers rich text license files. Add an RTF version of the GPLv2. It
was created by converting the "standalone HTML" version of the license at

  http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html

to RTF using Pandoc 1.11.

Start splitting CPackConfig.txt into Win32 and non-Win32 sections. Add
a WiX section.

Change-Id: Ifcb233053c8a2158f087b69c69de7df869af65aa
Reviewed-on: https://code.wireshark.org/review/12980
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agouat: Fix warnings [-Wcast-qual]
João Valverde [Wed, 30 Dec 2015 07:45:35 +0000 (07:45 +0000)]
uat: Fix warnings [-Wcast-qual]

uat_fld_tostr_cb_t callback *out_ptr argument is g_mallocated and
is to be freed by the caller so drop constness requirement to fix
the corresponding g_free warnings.

Change-Id: I1be25fa3e2f54fb32058ac0b5c1631b193b07701
Reviewed-on: https://code.wireshark.org/review/12943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't allocate something until we know we need it.
Guy Harris [Thu, 31 Dec 2015 22:54:01 +0000 (14:54 -0800)]
Don't allocate something until we know we need it.

From change I1be25fa3e2f54fb32058ac0b5c1631b193b07701.

Change-Id: Iad01cd4c5920afcdc1f8329937f4141cf8bc0ab4
Reviewed-on: https://code.wireshark.org/review/12979
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness.
Guy Harris [Thu, 31 Dec 2015 22:40:38 +0000 (14:40 -0800)]
Don't cast away constness.

Save a non-const pointer and use it when freeing.

Fix some indentation while we're at it.

Change-Id: Iad2451130c4d1f252ad9f63b12205cd1aae70eb7
Reviewed-on: https://code.wireshark.org/review/12978
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoSquelch a compiler warning.
Guy Harris [Thu, 31 Dec 2015 22:38:04 +0000 (14:38 -0800)]
Squelch a compiler warning.

Change-Id: I8933cbc250e3d1a3c6867f8166bc5b584b82211c
Reviewed-on: https://code.wireshark.org/review/12977
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness.
Guy Harris [Thu, 31 Dec 2015 22:33:48 +0000 (14:33 -0800)]
Don't cast away constness.

Change-Id: I37a1923c2e463346244cd5e56daf22122d119d78
Reviewed-on: https://code.wireshark.org/review/12976
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness.
Guy Harris [Thu, 31 Dec 2015 22:29:43 +0000 (14:29 -0800)]
Don't cast away constness.

Change-Id: I14130b4be91f36a4dbc187f2eef6d6c438a75774
Reviewed-on: https://code.wireshark.org/review/12975
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness.
Guy Harris [Thu, 31 Dec 2015 22:25:09 +0000 (14:25 -0800)]
Don't cast away constness.

Change-Id: I529d37e57b12fa7515f2bd18a013618b50300231
Reviewed-on: https://code.wireshark.org/review/12974
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness.
Guy Harris [Thu, 31 Dec 2015 22:13:45 +0000 (14:13 -0800)]
Don't cast away constness.

Change-Id: I6339381a052547944cfdb6c0c4d93fabf1cbd1ae
Reviewed-on: https://code.wireshark.org/review/12973
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness.
Guy Harris [Thu, 31 Dec 2015 22:09:16 +0000 (14:09 -0800)]
Don't cast away constness.

Change-Id: I6b5a6099cd90f2e148625c1a1eb3fb36262e8c39
Reviewed-on: https://code.wireshark.org/review/12972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness.
Guy Harris [Thu, 31 Dec 2015 21:54:20 +0000 (13:54 -0800)]
Don't cast away constness.

Change-Id: I8ca89bea19d7d014b81713455c85d2253f906058
Reviewed-on: https://code.wireshark.org/review/12971
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUse wmem_strdup_printf().
Guy Harris [Thu, 31 Dec 2015 22:02:05 +0000 (14:02 -0800)]
Use wmem_strdup_printf().

Change-Id: Ifb9dd16ab4435c23ea2914e16a65a17f9c61c0cb
Reviewed-on: https://code.wireshark.org/review/12970
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoClean up setting the port and address.
Guy Harris [Thu, 31 Dec 2015 21:47:05 +0000 (13:47 -0800)]
Clean up setting the port and address.

Change-Id: I2384424c410e83d299e810467734bfc5428d1182
Reviewed-on: https://code.wireshark.org/review/12969
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness.
Guy Harris [Thu, 31 Dec 2015 21:33:51 +0000 (13:33 -0800)]
Don't cast away constness.

Change-Id: I75c782185b8847abf8c985572d8280271ba00a5a
Reviewed-on: https://code.wireshark.org/review/12968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoGet rid of unused #defines.
Guy Harris [Thu, 31 Dec 2015 21:31:36 +0000 (13:31 -0800)]
Get rid of unused #defines.

Change-Id: I589d8c9b99425eb1893d61e4730864f0b2718acf
Reviewed-on: https://code.wireshark.org/review/12967
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUse wmem_memdup() instead of wmem_alloc() followed by memcpy().
Guy Harris [Thu, 31 Dec 2015 21:26:23 +0000 (13:26 -0800)]
Use wmem_memdup() instead of wmem_alloc() followed by memcpy().

This also fixes a case where, if nfs_fh->len wasn't a multiple of 4, the
allocated buffer was too short, by the difference between the next lower
multiple of 4 and nfs_fh->len, so the memcpy() went past the end of the
buffer.  (And, yes, an NFSv3 file handle can have a byte count that's
not a multiple of 4 - it's a variable-length opaque type - even if the
marshalled data is padded with 0s to a multiple of 4 bytes, as with
other XDR types.)

Change-Id: I689d4b365e8a1547428a1580884f66177dc5841b
Reviewed-on: https://code.wireshark.org/review/12964
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't throw away constness.
Guy Harris [Thu, 31 Dec 2015 20:55:11 +0000 (12:55 -0800)]
Don't throw away constness.

Change-Id: Ia0b014c3d9e4fcaa6f81cdb23dc76f9d384b782b
Reviewed-on: https://code.wireshark.org/review/12963
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUse wmem_memdup() instead of wmem_alloc() followed by memcpy().
Guy Harris [Thu, 31 Dec 2015 20:51:50 +0000 (12:51 -0800)]
Use wmem_memdup() instead of wmem_alloc() followed by memcpy().

Change-Id: Ia937fe15a371a3109178ba619dbdb3a6db3897ee
Reviewed-on: https://code.wireshark.org/review/12962
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agolemon: Fix warnings [-Wcast-qual]
João Valverde [Thu, 31 Dec 2015 10:37:33 +0000 (10:37 +0000)]
lemon: Fix warnings [-Wcast-qual]

Change-Id: I2b9efa50cf6385622601d2a80f4cc51691d080a1
Reviewed-on: https://code.wireshark.org/review/12960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years ago[iso14443] continue dissection of the ATS
Martin Kaiser [Thu, 31 Dec 2015 15:31:44 +0000 (16:31 +0100)]
[iso14443] continue dissection of the ATS

display the individual bytes
the next step is to dissect the meaning of their bits

Change-Id: Id93bcdb3913886365dbd0fb3fdedc7ed0c63be93
Reviewed-on: https://code.wireshark.org/review/12957
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agoRevert "CPack: Use COPYTING.txt as the license file."
Gerald Combs [Wed, 30 Dec 2015 23:53:14 +0000 (23:53 +0000)]
Revert "CPack: Use COPYTING.txt as the license file."

Looks like we need to fix a dependency.

This reverts commit 61cde08a95ddbeaeda32111f4469cbfc48dc95c3.

Change-Id: I490b826f20fbefbf169b63816916bfe784609610
Reviewed-on: https://code.wireshark.org/review/12956
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoCPack: Use COPYTING.txt as the license file.
Gerald Combs [Wed, 30 Dec 2015 21:59:56 +0000 (13:59 -0800)]
CPack: Use COPYTING.txt as the license file.

Otherwise The WiX generator complains with

    CPack Error: unsupported WiX License file extension ''

Change-Id: I4f3aeaf1babaf814c05cc96c4d07a84bd9dbc2a5
Reviewed-on: https://code.wireshark.org/review/12955
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoCPack: Fixup plugin paths on Windows.
Gerald Combs [Wed, 30 Dec 2015 19:42:32 +0000 (11:42 -0800)]
CPack: Fixup plugin paths on Windows.

Fix the per-configuration output directories for plugins. Fixes the following
when running CPack:

----
CMake Error at C:/Development/wireshark/cmbuild/plugins/docsis/cmake_install.cmake:32 (file):
  file INSTALL cannot find
  "C:/Development/wireshark/cmbuild/run/$(Configuration)/plugins/docsis.dll".
Call Stack (most recent call first):
  C:/Development/wireshark/cmbuild/cmake_install.cmake:329 (include)
----

Change-Id: I8d97722cc0d54e9ef26aeaeb311522e161c428e5
Reviewed-on: https://code.wireshark.org/review/12953
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoGTP: fix Dual Stack with one static and one Dynamic IP dissection
Pascal Quantin [Wed, 30 Dec 2015 17:39:35 +0000 (18:39 +0100)]
GTP: fix Dual Stack with one static and one Dynamic IP dissection

Bug: 11945
Change-Id: I759baec7c9af6d2502c5d3c151cb5c6adcf3d25f
Reviewed-on: https://code.wireshark.org/review/12950
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>
4 years agoDocbook: Use cyg-get for download Packages
Alexis La Goutte [Mon, 23 Nov 2015 13:21:43 +0000 (14:21 +0100)]
Docbook: Use cyg-get for download Packages

Chocolatey don't support --source cygwin on 0.9.9.x ...
https://github.com/chocolatey/choco/wiki/CommandsInstall#alternative-sources

Change-Id: Ifa3f0fa0a6cbb88537c727bf64e06dce9916dbb2
Reviewed-on: https://code.wireshark.org/review/12069
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoLBM: No need to cast to 'void *' [-Wcast-qual]
João Valverde [Wed, 30 Dec 2015 09:36:41 +0000 (09:36 +0000)]
LBM: No need to cast to 'void *' [-Wcast-qual]

Change-Id: Ib179fdbdfe8edf8a83b3ff0de323bd26b4bb8362
Reviewed-on: https://code.wireshark.org/review/12945
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>
4 years agoextcap: Fix NMake build issue
Roland Knall [Wed, 30 Dec 2015 11:07:52 +0000 (12:07 +0100)]
extcap: Fix NMake build issue

 The new source was not added to the project file.

Change-Id: I58d65bcab1d1b468f14c224cc8a4ae15e9fbbbf8
Reviewed-on: https://code.wireshark.org/review/12947
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoextcap: Add file extension check
Roland Knall [Tue, 29 Dec 2015 13:57:53 +0000 (14:57 +0100)]
extcap: Add file extension check

 The file-open dialog can now be set with file extensions, allowing
 the exclusion of unwanted file types. The syntax is the same
 as for the Qt QFileDialog, e.g.: "Wireshark (*.pcap *.pcapng)"

 Also, the mustexist option is now considered correctly

Change-Id: I9d4efbb5089ce1af640b2a894de07ed79520271e
Reviewed-on: https://code.wireshark.org/review/12913
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoextcap: Add Required and cleanup
Roland Knall [Tue, 29 Dec 2015 13:50:55 +0000 (14:50 +0100)]
extcap: Add Required and cleanup

 An option may now use the "required=true" argument (see sshdump.c)
 which will ensure, that the capture can only be started via the
 dialog, if the option has been provided. To ensure, that this is
 working properly, multiselect has been moved to a separate source
 file.

 Renamed one method so it may not interfere with a future save
 functionality, and cleaned up the interface to use only default
 buttons and roles

 ONLY the Qt interface is being supported.

Change-Id: Ie1c9a63c1bba2e557d55b1de6f4775d8b9fce515
Reviewed-on: https://code.wireshark.org/review/12912
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoZbee (ZCL Closures): Fix Dead Store (Dead assignement/Dead increment) Warning found...
Alexis La Goutte [Tue, 29 Dec 2015 17:46:13 +0000 (18:46 +0100)]
Zbee (ZCL Closures): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ic9dbdfbce7a1a3e29d1b59e9d1c56ee695a532ff
Reviewed-on: https://code.wireshark.org/review/12917
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoZbee (Zcl Closures): fix FT_BOOLEAN with a bitmask must specify a 'parent field width...
Alexis La Goutte [Tue, 29 Dec 2015 20:02:44 +0000 (21:02 +0100)]
Zbee (Zcl Closures): fix FT_BOOLEAN with a bitmask must specify a 'parent field width' for 'display' found by checkAPIs

Change-Id: Ie2a77896f50b438cee1226c9702b0932acaefb84
Reviewed-on: https://code.wireshark.org/review/12926
Reviewed-by: Aditya Jain <aditya.jain@samsung.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoQt: Show physical interfaces first.
Gerald Combs [Tue, 29 Dec 2015 21:53:11 +0000 (13:53 -0800)]
Qt: Show physical interfaces first.

List physical interfaces before virtual (extcap) interfaces in the main
window. As cool and interesting as the randpkt interface is, I'm not
sure it should come before interfaces with live traffic.

Resize our columns once instead of each time we add an interface.

Change-Id: I917532ab1d76b48c3e307d1f5a1c6c02def4e8aa
Reviewed-on: https://code.wireshark.org/review/12933
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>
4 years agoNetflow/Ipfix: Decode TCP Flags field
Uli Heilmeier [Tue, 29 Dec 2015 09:40:15 +0000 (10:40 +0100)]
Netflow/Ipfix: Decode TCP Flags field

Patch to decode the TCP Flags field (tcpControlBits, ID 6) in Netflow/Ipfix
data to see the used TCP Flags of a flow.

Documentation can be found at http://tools.ietf.org/html/rfc5102#section-5.8.7
and https://www.iana.org/assignments/ipfix/ipfix.xhtml

Unfortunately I can't provide a sanitized pcap.

Change-Id: I1674ff926525124902518fc4b1cebc2d6f38fc6c
Reviewed-on: https://code.wireshark.org/review/12927
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>
4 years agoPrevent infinite loop in DNP3 dissector.
Michael Mann [Wed, 30 Dec 2015 03:55:22 +0000 (22:55 -0500)]
Prevent infinite loop in DNP3 dissector.

Bug: 11938
Change-Id: Icd59092a3139b8c22f3866017a093a8b1270f1b2
Reviewed-on: https://code.wireshark.org/review/12940
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>
4 years ago802.11 (radio): fix no previous prototype for function 'ieee80211_vhtrate' [-Wmissing...
Alexis La Goutte [Tue, 29 Dec 2015 16:01:19 +0000 (17:01 +0100)]
802.11 (radio): fix no previous prototype for function 'ieee80211_vhtrate' [-Wmissing-prototypes]

Change-Id: I863668e98de1eaeff8e2360070881fffc972ad8a
Reviewed-on: https://code.wireshark.org/review/12916
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoExpand a comment.
Guy Harris [Wed, 30 Dec 2015 01:41:33 +0000 (17:41 -0800)]
Expand a comment.

Also fix the capitalization of "Qt", and don't have a commented-out
definition of GTK_VERSION to 3.5.2; if you want GTK+ 3.5.2, you'd do it
by setting the environment variable GTK_VERSION to 3.5.2 when running
the script.

Change-Id: I71a5d8caf87c08a5f98730aea65f994aff611590
Reviewed-on: https://code.wireshark.org/review/12939
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agocmake: do not fail if help/faq.txt already exists
Peter Wu [Tue, 29 Dec 2015 22:50:57 +0000 (23:50 +0100)]
cmake: do not fail if help/faq.txt already exists

The glob pattern should not catch the generated faq.txt file. Fix this
by explicitly listing all source .txt files.

Bug: 11896
Change-Id: I3904a0e094b5dba3808dacaaabd4db298a8f14cb
Reviewed-on: https://code.wireshark.org/review/12930
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
4 years agoZigBee NWK: fix Info column for NWK Rejoin Resp.
dsrsupport [Tue, 29 Dec 2015 13:02:12 +0000 (16:02 +0300)]
ZigBee NWK: fix Info column for NWK Rejoin Resp.

Fixed ZigBee NWK Rejoin Response info column to display an address which parent gave to the rejoining child.

Bug: 11940
Change-Id: I886b9fd6c7e99b097b297f351a84b95b3ffc5a94
Reviewed-on: https://code.wireshark.org/review/12911
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>
4 years agoimproved the developer documentation
Barbu Paul - Gheorghe [Tue, 29 Dec 2015 09:20:49 +0000 (11:20 +0200)]
improved the developer documentation

* tvb_*_length mentioned in README.dissector
* fixed typos in README.dissector
* using stats_tree_register_plugin in the stats_tree examples both in README.stats_tree and the dev guide
* removed the version information and the #endif from the stats tree section in README.dissector

Change-Id: I27df0b5dfd66a7c0ac5b0fe1bdc882b3e9ffda74
Reviewed-on: https://code.wireshark.org/review/12908
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoVINES: fix no previous prototype for function 'capture_vines' [-Wmissing-prototypes]
Alexis La Goutte [Tue, 29 Dec 2015 14:41:44 +0000 (15:41 +0100)]
VINES: fix no previous prototype for function 'capture_vines' [-Wmissing-prototypes]

Change-Id: I55dbc6c49bdc12540e06d2cf4415789ec1577d17
Reviewed-on: https://code.wireshark.org/review/12915
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoCMake updates
Joerg Mayer [Tue, 29 Dec 2015 20:14:23 +0000 (21:14 +0100)]
CMake updates
- make CMAKE_VERSION configurable via environment variable
- Fix download URL (no www. and httpS)

Change-Id: Id347b2f837d26063d889667f69bb1b4418e8e86d
Reviewed-on: https://code.wireshark.org/review/12934
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
4 years agoFix compile problems on OS X.
Guy Harris [Tue, 29 Dec 2015 20:40:16 +0000 (12:40 -0800)]
Fix compile problems on OS X.

Apparently, the C++ compilers on the OS X buildbots don't realize that a
reference cannot be null and therefore that there's nothing ambiguous
about QString(NULL) - the NULL must be a "const char *".  Instead, use a
constructed null QString.

Change-Id: Ibc56ea7f84c5e49cf3b1974c3de905bf23e90ff0
Reviewed-on: https://code.wireshark.org/review/12928
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAllow overriding of the GTK and QT versions without modifying the script.
Joerg Mayer [Tue, 29 Dec 2015 18:42:27 +0000 (19:42 +0100)]
Allow overriding of the GTK and QT versions without modifying the script.

Change-Id: I6e43845ee199232b53887d970996ca273564338c
Reviewed-on: https://code.wireshark.org/review/12923
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
4 years agoQt: Add gui.prepend_window_title option
Alexis La Goutte [Tue, 15 Dec 2015 14:40:30 +0000 (15:40 +0100)]
Qt: Add gui.prepend_window_title option

Bug: 11102
Change-Id: I659b6be4652a65542c217370e01340e4696c0e31
Reviewed-on: https://code.wireshark.org/review/12653
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>
4 years agoQt: Add support of gui.window_title
Alexis La Goutte [Tue, 15 Dec 2015 11:12:27 +0000 (12:12 +0100)]
Qt: Add support of gui.window_title

Ping-Bug: 11102
Bug: 11691
Change-Id: I7b1673ffafcda644f4905265061ba11733dd91d3
Reviewed-on: https://code.wireshark.org/review/12650
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoQt: Remove usage of setWindowFilePath
Alexis La Goutte [Mon, 21 Dec 2015 09:25:27 +0000 (10:25 +0100)]
Qt: Remove usage of setWindowFilePath

Change-Id: I29591709d88d1858e44c753d09e4a29d0f28ce53
Reviewed-on: https://code.wireshark.org/review/12781
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoZigBee NWK: add End Device Initiator field into NWK Frame Control according to ZigBee r21
dsrsupport [Tue, 29 Dec 2015 12:46:23 +0000 (15:46 +0300)]
ZigBee NWK: add End Device Initiator field into NWK Frame Control according to ZigBee r21

Change-Id: I99d079145d371106257bb8f41979fd04b0d030d4
Reviewed-on: https://code.wireshark.org/review/12910
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>
4 years agoAdd support for IEEE-11073 FLOATs
Michal Labedzki [Sun, 6 Sep 2015 17:01:47 +0000 (19:01 +0200)]
Add support for IEEE-11073 FLOATs

Add support for IEEE-11073 32-bit FLOAT and 16 bit SFLOAT field types.
Use them in Bluetooth ATT dissector.

Change-Id: Ife0f3843da84a9af23483b0a0d9b69cd2f511d08
Reviewed-on: https://code.wireshark.org/review/12680
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoNAS EPS: upgrade dissector to v13.4.0
Pascal Quantin [Tue, 29 Dec 2015 08:53:00 +0000 (09:53 +0100)]
NAS EPS: upgrade dissector to v13.4.0

Change-Id: Iac7257fe574841e5199a99559ee99252da75b1fd
Reviewed-on: https://code.wireshark.org/review/12906
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
4 years ago3GPP NAS: upgrade dissector to v13.4.0
Pascal Quantin [Mon, 28 Dec 2015 22:14:22 +0000 (23:14 +0100)]
3GPP NAS: upgrade dissector to v13.4.0

Change-Id: Id4c7b29d63216e0475da93ed38b5a275bd29cd5c
Reviewed-on: https://code.wireshark.org/review/12905
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoIPv6: Update option type parameters, make value_string_ext
João Valverde [Mon, 28 Dec 2015 22:42:23 +0000 (22:42 +0000)]
IPv6: Update option type parameters, make value_string_ext

Also correct IANA registry URL.

Change-Id: I362ddc797b51f6f77c3da86dcdf30ad95a674069
Reviewed-on: https://code.wireshark.org/review/12892
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>
4 years agoUpdate.
Guy Harris [Tue, 29 Dec 2015 08:23:42 +0000 (00:23 -0800)]
Update.

Change-Id: Ie008e8c396a3ead44f046ce2ebe4965ad93dae5c
Reviewed-on: https://code.wireshark.org/review/12903
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAlways supply a g_mallocated error message from select_rlc_lte_session().
Guy Harris [Tue, 29 Dec 2015 08:00:59 +0000 (00:00 -0800)]
Always supply a g_mallocated error message from select_rlc_lte_session().

That way, we don't have to pass a "free this" indication separately.

While we're at it, don't just free the error message, *display* it in
all cases where rlc_graph_segment_list_get() fails.

(I wish more programming languages had a proper string type, including
some whose names consist solely of the third letter of the alphabet, but
I digress....)

Change-Id: I99f8b088aa19bc8fbb178bdb36d85ba5b89c06e0
Reviewed-on: https://code.wireshark.org/review/12902
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agodebian: Recommend libqt5multimedia5-plugins for wireshark-qt
Balint Reczey [Mon, 28 Dec 2015 18:35:34 +0000 (19:35 +0100)]
debian: Recommend libqt5multimedia5-plugins for wireshark-qt

This makes RTP Player actually play RTP stream using Qt, too.

Bug: 11918
Change-Id: I9a90f50ceeccc1f298bf1b0a8dcc7a9017107484
Reviewed-on: https://code.wireshark.org/review/12882
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoselfm: Dissector fails to detect message length on multi-message packets
cbontje [Mon, 28 Dec 2015 21:00:53 +0000 (14:00 -0700)]
selfm: Dissector fails to detect message length on multi-message packets

- correction to get_selfm_length function
- fix Fast Message response decoding when multiple auto-configuration sessions are present in capture
- remove depreciated selfm 'simple' dissection

Bug: 11935
Change-Id: I685dba3bddfc61e0d2faf7b0258cd5572ce4e7ed
Reviewed-on: https://code.wireshark.org/review/12888
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>
4 years agoRevert "Prep for 2.0.1." Wrong branch.
Gerald Combs [Tue, 29 Dec 2015 00:52:10 +0000 (00:52 +0000)]
Revert "Prep for 2.0.1." Wrong branch.

This reverts commit affa8011a2fc5e8128e7d5bf46df15e8e7b491db.

Change-Id: I5816b1100a44d7db961f0d0f6586130958ccbc17
Reviewed-on: https://code.wireshark.org/review/12900
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoClean up indentation.
Guy Harris [Tue, 29 Dec 2015 00:50:53 +0000 (16:50 -0800)]
Clean up indentation.

Change-Id: I77954f376ba9356f134e5876239838a40f9364ff
Reviewed-on: https://code.wireshark.org/review/12899
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoGet rid of another unnecessary new_ prefix.
Guy Harris [Tue, 29 Dec 2015 00:47:52 +0000 (16:47 -0800)]
Get rid of another unnecessary new_ prefix.

Change-Id: I99522c1e5f2a4aac091cb19dd7fff450ddc2c26e
Reviewed-on: https://code.wireshark.org/review/12898
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRename new_stat_tap_ui to stat_tap_table_ui.
Guy Harris [Tue, 29 Dec 2015 00:31:06 +0000 (16:31 -0800)]
Rename new_stat_tap_ui to stat_tap_table_ui.

A "new" statistics tap UI is a statistics tap UI where the statistics
are maintained as tables and common code handles the tables; what
matters is the tables, not that it's "new".

Change-Id: I7a0e63cfac98c24cd5e7dce973b9a0cc5b6a03ba
Reviewed-on: https://code.wireshark.org/review/12897
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoThere's no "old" stat_tap_table, so remove "new_" from the name.
Guy Harris [Tue, 29 Dec 2015 00:18:12 +0000 (16:18 -0800)]
There's no "old" stat_tap_table, so remove "new_" from the name.

Change-Id: I1a0349d5d9d47210a97ff7a99fb358e59fd70e72
Reviewed-on: https://code.wireshark.org/review/12896
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoPrep for 2.0.1.
Gerald Combs [Mon, 28 Dec 2015 23:28:33 +0000 (15:28 -0800)]
Prep for 2.0.1.

Change-Id: Ie25cefb4dd317a77b1cb63b1f3dff4186f8f425e
Reviewed-on: https://code.wireshark.org/review/12895
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoCode cleanup
Stig Bjørlykke [Mon, 28 Dec 2015 23:05:54 +0000 (00:05 +0100)]
Code cleanup

This is a small code cleanup to sync with master-2.0.

Change-Id: I96a0fbd8bbb7bfde9d69a9bf512de839b2ca1536
Reviewed-on: https://code.wireshark.org/review/12894
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoSave the results of wmem_strndup(NULL, ...) in a non-const pointer.
Guy Harris [Mon, 28 Dec 2015 23:01:21 +0000 (15:01 -0800)]
Save the results of wmem_strndup(NULL, ...) in a non-const pointer.

That way, we have a non-const pointer to use when freeing it, and don't
have to undo the constification with a cast.

Rename "has_slash" to "slash", while we're at it, as it's not a Boolean
indicating whether the string has a slash, it's either a pointer to the
slash in question or NULL if the string has no slash.

Change-Id: Ia55b39bddb67c8ca71f7b09ee5eb82efaa3bdf0c
Reviewed-on: https://code.wireshark.org/review/12891
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness for the key in g_hash_table_lookup().
Guy Harris [Mon, 28 Dec 2015 21:00:39 +0000 (13:00 -0800)]
Don't cast away constness for the key in g_hash_table_lookup().

Change-Id: Ibd5cf8947028d90a734de629e3c4202af9d0514b
Reviewed-on: https://code.wireshark.org/review/12887
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoEliminate more unnecessary casting away of constness.
Guy Harris [Mon, 28 Dec 2015 20:43:46 +0000 (12:43 -0800)]
Eliminate more unnecessary casting away of constness.

Change-Id: I3d2d83d60f798703ea3fa16ba2d6e95a00f88469
Reviewed-on: https://code.wireshark.org/review/12885
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't cast away constness unnecessarily.
Guy Harris [Mon, 28 Dec 2015 20:33:17 +0000 (12:33 -0800)]
Don't cast away constness unnecessarily.

Compare functions for various collection data types don't need to modify
what they're comparing, so keep everything const.

Change-Id: I1c2cff6954b1a8c5ade74943934324d0bd8f523c
Reviewed-on: https://code.wireshark.org/review/12884
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoQt: fix QString::arg: Argument missing: "PT=%u telephone/event" warning
Pascal Quantin [Mon, 28 Dec 2015 18:20:11 +0000 (19:20 +0100)]
Qt: fix QString::arg: Argument missing: "PT=%u telephone/event" warning

Change-Id: If6065d0895a4bf8311badfff74bb1dff5841490d
Ping-Bug: 11918
Reviewed-on: https://code.wireshark.org/review/12881
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>
4 years agoRefactor GUI dependencies out of color_filters.[ch] and move it to epan directory.
Michael Mann [Tue, 22 Dec 2015 20:07:00 +0000 (15:07 -0500)]
Refactor GUI dependencies out of color_filters.[ch] and move it to epan directory.

This also moved color.h into color_filters.h

Change-Id: Ic19e27aa1b3ec67e764aa7ee8bbef7b1187bb12e
Reviewed-on: https://code.wireshark.org/review/12831
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years ago[docsis->bpkmattrib] Correction for TLV 15 text from 14->15
AdrianSimionov [Mon, 28 Dec 2015 12:56:40 +0000 (13:56 +0100)]
[docsis->bpkmattrib] Correction for TLV 15 text from 14->15

Change-Id: Ic1122e36c8099c1f891d3d5f81bd7fb4977d2ffd
Reviewed-on: https://code.wireshark.org/review/12880
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>
4 years agoZigBee: Implement r21 NWK End Device Timeout Request/Response commands
dsrsupport [Fri, 25 Dec 2015 12:31:30 +0000 (15:31 +0300)]
ZigBee: Implement r21 NWK End Device Timeout Request/Response commands

Change-Id: I4d05307d5c6bbfaacc68429bd675c1ecf14d1d5c
Reviewed-on: https://code.wireshark.org/review/12866
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>
4 years agoZbee zdp (management/binding): fix parameter 'pinfo' not found in the function declar...
Alexis La Goutte [Sat, 26 Dec 2015 10:22:11 +0000 (11:22 +0100)]
Zbee zdp (management/binding): fix parameter 'pinfo' not found in the function declaration [-Wdocumentation]

Change-Id: If10f81281e410efc67e9602d33a09b4d1807766d
Reviewed-on: https://code.wireshark.org/review/12869
Reviewed-by: Eugene Exarevsky <eugene.exarevsky@dsr-company.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years ago[docsis->sync] Remove colon from INFO field
AdrianSimionov [Sun, 27 Dec 2015 21:14:53 +0000 (22:14 +0100)]
[docsis->sync] Remove colon from INFO field

SYNC is a simple message, there is no info to follow the colon.
Most probably was introduced as a copy paste from more complex packets.

Change-Id: I552aad68f9484f347266838e9c319de680825dde
Reviewed-on: https://code.wireshark.org/review/12879
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years ago[Automatic update for 2015-12-27]
Gerald Combs [Sun, 27 Dec 2015 16:10:08 +0000 (08:10 -0800)]
[Automatic update for 2015-12-27]

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

Change-Id: Ib19b36e9bc2d5c8cdbbeb3291b32f4291e619851
Reviewed-on: https://code.wireshark.org/review/12876
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoZigBee: fix for inabulity to parse ZigBee packets due to parsing _any_ IEEE 802.15...
dsrsupport [Fri, 25 Dec 2015 11:04:08 +0000 (14:04 +0300)]
ZigBee: fix for inabulity to parse ZigBee packets due to parsing _any_ IEEE 802.15.4 packet as a command.

In dissect_ieee802154_common() any packet unconditionally parsed as a command, command it byte cut.
As a result, all except MAC commands are garbaged.
Added check for the frame type and parce/cut command id only for 802.15.4 commands.

Bug: 11929
Change-Id: Iab17d28c19485063e3d802eec3dc03a9d9c33a7a
Reviewed-on: https://code.wireshark.org/review/12860
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: Graham Bloice <graham.bloice@trihedral.com>
4 years agoSanity check column size to prevent allocating an unrealistic amount of memory.
Michael Mann [Sat, 26 Dec 2015 22:41:42 +0000 (17:41 -0500)]
Sanity check column size to prevent allocating an unrealistic amount of memory.

Bug: 11931
Change-Id: I19fa2937a649382b3a2eda2c8192246e3e9d9e28
Reviewed-on: https://code.wireshark.org/review/12874
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoHTTP2: fix cast from 'const void *' to 'struct HTTP2Tap *' drops const qualifier...
Alexis La Goutte [Sat, 26 Dec 2015 14:04:03 +0000 (15:04 +0100)]
HTTP2: fix cast from 'const void *' to 'struct HTTP2Tap *' drops const qualifier [-Wcast-qual]

Change-Id: I9d0ba8eb1ce5a3e3f867266f3fbad0727984fca2
Reviewed-on: https://code.wireshark.org/review/12873
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoNGHTTP2: Update to 1.6.0
Alexis La Goutte [Sat, 26 Dec 2015 11:02:21 +0000 (12:02 +0100)]
NGHTTP2: Update to 1.6.0

Change-Id: I0794b47ec95a6604ade3d1e0637603a9687d1ed4
Reviewed-on: https://code.wireshark.org/review/12872
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoieee802154: fix parameter '...' not found in the function declaration / '...' command...
Alexis La Goutte [Sat, 26 Dec 2015 13:57:31 +0000 (14:57 +0100)]
ieee802154: fix parameter '...' not found in the function declaration / '...' command used in a comment that is not attached to a function declaration  [-Wdocumentation]

Change-Id: I797e68c409a10877315f2a13fa6f16f8d4a768e2
Reviewed-on: https://code.wireshark.org/review/12871
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoZbee (aps): fix parameter 'clisuer_id' not found in the function declaration [-Wdocum...
Alexis La Goutte [Sat, 26 Dec 2015 10:27:41 +0000 (11:27 +0100)]
Zbee (aps): fix parameter 'clisuer_id' not found in the function declaration [-Wdocumentation]

Change-Id: I30a2671f1c469d5e04958f6e00fd9022d93e1339
Reviewed-on: https://code.wireshark.org/review/12870
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoZigBee: ZDP Mgmt Leave: rollback Mgmt_leave bitmask definition change
dsrsupport [Fri, 25 Dec 2015 15:43:23 +0000 (18:43 +0300)]
ZigBee: ZDP Mgmt Leave: rollback Mgmt_leave bitmask definition change

Oops, sorry - I was wrong, no need to change a bitmask defines.
Please, rollback.

Bug: 11927
Change-Id: Iba0f8829f2fd5eb080c4e97742a7be18c6565f32
Reviewed-on: https://code.wireshark.org/review/12868
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>