metze/wireshark/wip.git
3 years agoRemove executable bit, from not executable files.
Jakub Zawadzki [Sat, 25 Feb 2017 19:00:40 +0000 (20:00 +0100)]
Remove executable bit, from not executable files.

Change-Id: I8afa246172cd8d5a86513ade2f482566e3f9957a
Reviewed-on: https://code.wireshark.org/review/20272
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
3 years ago[Automatic update for 2017-02-26]
Gerald Combs [Sun, 26 Feb 2017 16:11:41 +0000 (08:11 -0800)]
[Automatic update for 2017-02-26]

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

Change-Id: I3094033ff26c1d8da5abcc22a25e4075f6bc087f
Reviewed-on: https://code.wireshark.org/review/20285
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoapply_line_edit(.h): fix extra ';' inside a class [-Wextra-semi] (clang) / extra...
Alexis La Goutte [Sun, 26 Feb 2017 08:42:40 +0000 (09:42 +0100)]
apply_line_edit(.h): fix extra ';' inside a class [-Wextra-semi] (clang) / extra ‘;’ [-Wpedantic] (gcc)

Change-Id: Ie75da8de308a5fe3a063cf929d0bb2ab739ad96f
Reviewed-on: https://code.wireshark.org/review/20276
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>
3 years ago plugin_if: fix no previous prototype for ‘ext_toolbar_find_item’ [-Wmissing-prototypes]
Alexis La Goutte [Sun, 26 Feb 2017 09:12:56 +0000 (10:12 +0100)]
 plugin_if: fix no previous prototype for ‘ext_toolbar_find_item’ [-Wmissing-prototypes]

Change-Id: Ie11bc347b609bce754b85516601b57f6b0174f7b
Reviewed-on: https://code.wireshark.org/review/20279
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>
3 years agopreferences_dialog (Qt): fix commas at the end of enumerator lists are a C++11 extens...
Alexis La Goutte [Sun, 26 Feb 2017 09:03:14 +0000 (10:03 +0100)]
preferences_dialog (Qt): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]

Change-Id: I9781fea02e7578f7d940c050a6f405bfe4b347dd
Reviewed-on: https://code.wireshark.org/review/20278
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agopluginif: Adapt code for Qt4.8
Roland Knall [Sun, 26 Feb 2017 09:41:50 +0000 (10:41 +0100)]
pluginif: Adapt code for Qt4.8

Change-Id: I663bb39cc6b186228bee01946c705eb6e12a8a0a
Reviewed-on: https://code.wireshark.org/review/20280
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoBugfix for extcap fileselect functionality, start button in extcap options dialog...
Kim Bäckström [Sat, 25 Feb 2017 22:44:15 +0000 (23:44 +0100)]
Bugfix for extcap fileselect functionality, start button in extcap options dialog wouldn't
get enabled if the user had selected a file (and mustexist=true wasn't specified).

This commit also contains minor fixes to doc/README.extcap, it's now more aligned to the
actual implementation.

Added example usage of fileselect, radio and multiselect to doc/extcap_example.py.

Change-Id: Ibfe40a35a26f49322fbe64c0594506a2163f7e20
Reviewed-on: https://code.wireshark.org/review/20274
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoplugin_if(.h): fix commas at the end of enumerator lists are a C++11 extension [...
Alexis La Goutte [Sun, 26 Feb 2017 09:01:53 +0000 (10:01 +0100)]
plugin_if(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]

Change-Id: I09fa357dbf9fee44a83ae9e9d78d8512b1aa9ee8
Reviewed-on: https://code.wireshark.org/review/20277
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoandroiddump: Set connect socket to non-blocking on Windows
Michael Mann [Sun, 26 Feb 2017 01:49:43 +0000 (20:49 -0500)]
androiddump: Set connect socket to non-blocking on Windows

Bug: 13104
Change-Id: I05248dad8e72272cf0933c766ec0bf5160075e1e
Reviewed-on: https://code.wireshark.org/review/20275
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agosmb2: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Wed, 22 Feb 2017 06:14:05 +0000 (07:14 +0100)]
smb2: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ib1a74394195a945c8c723299f08dc9709233a5af
Reviewed-on: https://code.wireshark.org/review/20245
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoRADIUS: add cnergee dictionary (from FreeRADIUS)
Alexis La Goutte [Mon, 20 Feb 2017 14:01:18 +0000 (14:01 +0000)]
RADIUS: add cnergee dictionary (from FreeRADIUS)

commit e37987492b0d575a8ef41900ef916244112b2468
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Sat Feb 18 12:11:05 2017 -0500

    Dictionary from cnergee.

    Which modifications so that the names don't conflict with
    existing ones.

Change-Id: I4fed7f38300dd8bcf526e5a07eec6c7812991d95
Reviewed-on: https://code.wireshark.org/review/20258
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoRevert "Qt: call cleanup from destructor in WiresharkApplication."
Peter Wu [Sat, 25 Feb 2017 19:23:39 +0000 (19:23 +0000)]
Revert "Qt: call cleanup from destructor in WiresharkApplication."

Calling cleanup() twice (via exit signal and via destructor) results in a
use-after-free on exit via write_profile_recent.

This reverts commit e47f9fbeb090a68f9229b0f03c3f76a6285d2dff.

Change-Id: Ic3ca0742c03a345fd8cb7f3f782942872a3057f5
Reviewed-on: https://code.wireshark.org/review/20273
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agojson2pcap support added
Martin Kacer [Mon, 13 Feb 2017 08:36:02 +0000 (09:36 +0100)]
json2pcap support added

Modified tshark -T json -x output
Added tshark -T jsonraw output
json2pcap.py (can be used for basic packet editing by modifying json)

The modification in tshark -T json -x and new tshark -T jsonraw output
add into  hex-data output in JSON also information on which position
each field is dissected in the original frame, what is the field length,
bitmask (for not byte aligned fields) and type. This information can be
used for latter processing. One use-case is json2pcap script which
assembles the protocol layers back together from upper to lowers layers,
which allows the basic packet modification/editing/rewriting.

Change-Id: Ibf948eb8fc7e3b0b51c12df6c3855f705a9c7925
Reviewed-on: https://code.wireshark.org/review/19990
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agoRADIUS: update nomadix dictionary (from FreeRADIUS)
Alexis La Goutte [Fri, 24 Feb 2017 08:24:25 +0000 (08:24 +0000)]
RADIUS: update nomadix dictionary (from FreeRADIUS)

commit ade4a571ad959d54faa4844df2305e5d5ccbb86
Author: Mark Johnson <mark@sunray.net>
Date:   Thu Feb 9 12:15:37 2017 -0800

    Updating Nomadix dictionary with missing attributes.

commit 4400bf37add2e1fb29a9dcf18ad76d2b8001db7b
Author: Ethan Hayon <ehayon@gmail.com>
Date:   Tue Jun 4 13:27:58 2013 -0400

    Updated VSAs for Nomadix Access Gateway

Change-Id: I015418dc1ac808a128f12146ff8468a5eb8b6c5f
Reviewed-on: https://code.wireshark.org/review/20259
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFix compilation without plugins:
Jakub Zawadzki [Sat, 25 Feb 2017 11:00:26 +0000 (12:00 +0100)]
Fix compilation without plugins:

filesystem.c: In function ‘free_progdirs’:
filesystem.c:2209:12: error: ‘plugin_dir’ undeclared (first use in this function)
     g_free(plugin_dir);

Change-Id: Ib52b86d41be79b8ed7e42f5fdfaddcae6b0ca5c8
Reviewed-on: https://code.wireshark.org/review/20270
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoConvert a few more dissectors to use wmem_hash instead of GHashtable.
Michael Mann [Sat, 25 Feb 2017 00:46:49 +0000 (19:46 -0500)]
Convert a few more dissectors to use wmem_hash instead of GHashtable.

Change-Id: I86c9e485b447b380f00195bf407ce28c05bb1822
Reviewed-on: https://code.wireshark.org/review/20268
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agopacket-fw1.c: header should be packet scoped, not epan scoped
Michael Mann [Sat, 25 Feb 2017 03:11:22 +0000 (22:11 -0500)]
packet-fw1.c: header should be packet scoped, not epan scoped

Subtle memory leak

Change-Id: I39e3f2d35de5a8c48469f3e0992cdfec09ff0755
Reviewed-on: https://code.wireshark.org/review/20269
Petri-Dish: Michael Mann <mmann78@netscape.net>
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>
3 years agoConfiguration dump for webshark.
Jakub Zawadzki [Sun, 12 Feb 2017 23:09:16 +0000 (00:09 +0100)]
Configuration dump for webshark.

Change-Id: Ideaedaaa7bf5f1244d7f6845a08e4dc36a2c798f
Reviewed-on: https://code.wireshark.org/review/20083
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
3 years agoReplace "n/a" with an em dash.
Gerald Combs [Fri, 24 Feb 2017 20:20:51 +0000 (12:20 -0800)]
Replace "n/a" with an em dash.

Replace occurrences of "n/a" with an em dash. It matches what we do
elsewhere and reduces the need for translation.

Change-Id: Ib5b63be765b7da9ae3e66ab19bd25cb497fd722d
Reviewed-on: https://code.wireshark.org/review/20267
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>
3 years agodtd: fix build due to -Wtypedef-redefinition
Peter Wu [Fri, 24 Feb 2017 17:56:52 +0000 (18:56 +0100)]
dtd: fix build due to -Wtypedef-redefinition

dtd.h defines the type, so avoid redefining to avoid this warning:

    epan/dtd_preparse.l:113:3: warning: redefinition of typedef 'Dtd_PreParse_scanner_state_t' is a C11 feature [-Wtypedef-redefinition]

Change-Id: Id6dddb8fe082717b483a6eeae08dfde468c19c89
Fixes: v2.3.0rc0-2505-ge1282f2875 ("dtd: free memory on shutdown.")
Reviewed-on: https://code.wireshark.org/review/20266
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agodtd: free memory on shutdown.
Dario Lombardo [Tue, 21 Feb 2017 15:37:29 +0000 (16:37 +0100)]
dtd: free memory on shutdown.

Change-Id: I502e505730b9310066563bfd9c8df9fceddd0301
Reviewed-on: https://code.wireshark.org/review/20229
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoudpdump: fix help.
Dario Lombardo [Fri, 24 Feb 2017 15:38:08 +0000 (16:38 +0100)]
udpdump: fix help.

Change-Id: Iad0e802f8c5d3920104751fab5135d71f02b29b8
Reviewed-on: https://code.wireshark.org/review/20264
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoandroiddump: Use nonblocking connect
Michal Labedzki [Mon, 23 Jan 2017 14:51:58 +0000 (15:51 +0100)]
androiddump: Use nonblocking connect

Release as version 1.0.5:
All connects to ADB are now non-blocking.
Try to connect up to 10 times with 1ms delays,
so in worst-case it takes ~10ms (for example 14ms)

Bug: 13104
Change-Id: I791909c9c951b62195b48acd82490e1b9ebf2be0
Reviewed-on: https://code.wireshark.org/review/19968
Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
3 years agotools: add options validation.
Dario Lombardo [Mon, 20 Feb 2017 15:35:32 +0000 (16:35 +0100)]
tools: add options validation.

This prevents to call the apps with incongruent options.

Change-Id: I76919a2da141bd277c06e708548c971c19dd7af7
Reviewed-on: https://code.wireshark.org/review/20211
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoDevelopers Guide typo
Graham Bloice [Fri, 24 Feb 2017 10:50:39 +0000 (10:50 +0000)]
Developers Guide typo

Change-Id: I125f8d9171ebdfaf7528d784e69d9768e6b1b8b7
Reviewed-on: https://code.wireshark.org/review/20262
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
3 years agoQt: Code cleanup
Stig Bjørlykke [Fri, 24 Feb 2017 08:49:11 +0000 (09:49 +0100)]
Qt: Code cleanup

Remove whitespace to match coding style used in file.

Change-Id: I4c1649aa02087cd39b2f516db6e40749899c5125
Reviewed-on: https://code.wireshark.org/review/20260
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
3 years agopluginif: Add documentation for toolbar interface
Roland Knall [Fri, 24 Feb 2017 08:58:49 +0000 (09:58 +0100)]
pluginif: Add documentation for toolbar interface

Add the documentation for the new toolbar interface
to the README file

Change-Id: I9dd37dc4f31760ccd1c9a3e6ae379cd6f9ca1db9
Reviewed-on: https://code.wireshark.org/review/20261
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoPluginIF: AdditionalToolbar
Roland Knall [Tue, 24 Jan 2017 16:34:07 +0000 (17:34 +0100)]
PluginIF: AdditionalToolbar

Creates an interface for plugins and other parts of the code, to
add a new toolbar to the system and have various widget types interact
with this toolbar.

All toolbars added via this interface, will be added to an additional
submenu called "Additional Toolbars" within Wireshark.

Also a demo plugin is being provided, demonstrating various features
of the toolbar, including updating the gui elements. It also demonstrates
how to update toolbar items.

Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3
Reviewed-on: https://code.wireshark.org/review/19803
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoReduce number of fwrite when writing pcap-ng EPB.
AndersBroman [Thu, 23 Feb 2017 08:27:50 +0000 (09:27 +0100)]
Reduce number of fwrite when writing pcap-ng EPB.

According to callgrind with the patch dumping 3000 pakets the number of
calls to write_to_file is reduced from 11541 to 9000 reducing the number
of lr from 4 681 518 to 4 314 101.

If the buffer holding the packet was guaranteed to be padded to 32 bit
boundary the code could be simplified and if there was space "in front"
for the packet header it would be even better.

Change-Id: Ie991c05fa9d831ee4d703bd47b8123f2b1f83277
Reviewed-on: https://code.wireshark.org/review/20256
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoMake MIPv6 options into a dissector table.
Michael Mann [Wed, 22 Feb 2017 22:41:36 +0000 (17:41 -0500)]
Make MIPv6 options into a dissector table.

This provides external access for dissectors and plugins to provide their
own implementation of MIPv6 options.
Also cleaned up some of the "offset defines" and just went with relative
increments for the option functions.

Change-Id: I40db0b316eec37ee2045e6d663829ce69e3dac37
Reviewed-on: https://code.wireshark.org/review/20257
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>
3 years agoFix sharkd compilation on some <glibc-2.16 or <gcc-4.8
Jakub Zawadzki [Wed, 22 Feb 2017 00:12:16 +0000 (01:12 +0100)]
Fix sharkd compilation on some <glibc-2.16 or <gcc-4.8

- use printf() instead of fwrite().
- don't shadow stat()

Bug: 13424
Change-Id: Idc8931bcc5b1387f0ce3a3bfa146ffeb5b4edc82
Reviewed-on: https://code.wireshark.org/review/20234
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agosharkd: fix redundant redeclaration of ‘cfile’ [-Wredundant-decls]
Alexis La Goutte [Sun, 19 Feb 2017 16:01:51 +0000 (17:01 +0100)]
sharkd: fix redundant redeclaration of ‘cfile’ [-Wredundant-decls]

Change-Id: I6ffe2d21cabfe326568b5f090c322d4dafd92d9d
Reviewed-on: https://code.wireshark.org/review/20181
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>
3 years agoUSB COM: highlight the bytes of the communications descriptor
Martin Kaiser [Wed, 22 Feb 2017 20:41:13 +0000 (21:41 +0100)]
USB COM: highlight the bytes of the communications descriptor

Change-Id: Ia3aa1f5e35945ff8bf500508a67731b6ad3e28e3
Reviewed-on: https://code.wireshark.org/review/20252
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoMake IP options into a dissector table.
Michael Mann [Wed, 15 Feb 2017 12:17:56 +0000 (07:17 -0500)]
Make IP options into a dissector table.

This provides external access for dissectors and plugins to provide their
own implementation of IP options.

Change-Id: I40ce17ce408217769e3b86e364f372a5181888e1
Reviewed-on: https://code.wireshark.org/review/20163
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agogeoip_db: replace g_free with free.
Dario Lombardo [Wed, 22 Feb 2017 08:54:53 +0000 (09:54 +0100)]
geoip_db: replace g_free with free.

Fix also a const cast by using the proper constness.

Change-Id: Ifcf1854051c7f5dec911331d9cfc809e6b2dd42e
Reviewed-on: https://code.wireshark.org/review/20246
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agog_malloc -> g_malloc0 where not all struct elements are initialized or
Joerg Mayer [Wed, 22 Feb 2017 18:04:07 +0000 (19:04 +0100)]
g_malloc -> g_malloc0 where not all struct elements are initialized or
when combined with memset.

Change-Id: I5148a65bee6d4d00c140113ffb1e228adefae93f
Reviewed-on: https://code.wireshark.org/review/20251
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
3 years agoGPRS-NS: display nsip.cause and nsip.pdu_type as BASE_HEX
Pascal Quantin [Wed, 22 Feb 2017 16:39:26 +0000 (17:39 +0100)]
GPRS-NS: display nsip.cause and nsip.pdu_type as BASE_HEX

Bug: 13428
Change-Id: I82ffab61cd59bbd39d82b92c6eebf8800dc2f5be
Reviewed-on: https://code.wireshark.org/review/20250
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: Martin Kaiser <wireshark@kaiser.cx>
3 years agomergecap: free memory on shutdown.
Dario Lombardo [Mon, 20 Feb 2017 13:42:42 +0000 (14:42 +0100)]
mergecap: free memory on shutdown.

Change-Id: I65445cca6b16f750bf3a98fdfea228a51b46106c
Reviewed-on: https://code.wireshark.org/review/20203
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoeditcap: use single exit point.
Dario Lombardo [Mon, 20 Feb 2017 14:30:27 +0000 (15:30 +0100)]
editcap: use single exit point.

Change-Id: I9ed9a7effdcfdb660616f5199a8227b466e91ad4
Reviewed-on: https://code.wireshark.org/review/20204
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoreordercap: free memory on exit
Dario Lombardo [Mon, 20 Feb 2017 14:36:54 +0000 (15:36 +0100)]
reordercap: free memory on exit

Change-Id: Ie81de7c185589fa7ba4c25cada5ef0e1435ef0e0
Reviewed-on: https://code.wireshark.org/review/20208
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoQt: call cleanup from destructor in WiresharkApplication.
Dario Lombardo [Mon, 20 Feb 2017 15:18:14 +0000 (16:18 +0100)]
Qt: call cleanup from destructor in WiresharkApplication.

This allow the correct cleanup routine to be called both when user
exits and when application exits by itself (like in WIRESHARK_QUIT_AFTER_CAPTURE=1).

Change-Id: I88e468bde029b4247ac90616f3aba0065a2b8e00
Reviewed-on: https://code.wireshark.org/review/20210
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoQt: free memory used by rtd_tables.
Dario Lombardo [Mon, 20 Feb 2017 15:16:26 +0000 (16:16 +0100)]
Qt: free memory used by rtd_tables.

Change-Id: Ibb6e3327127840fd01c5410c145ccec07efa4c73
Reviewed-on: https://code.wireshark.org/review/20209
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoextcap: Reduce number of scans and storage
Roland Knall [Tue, 21 Feb 2017 16:28:32 +0000 (17:28 +0100)]
extcap: Reduce number of scans and storage

Reduce the number of storage arrays and the number
of necessary loads. Also include cleaner methods for
reloading the interfaces and cleanly reload if asked by
the overall system

Change-Id: I529465ec2593d40c955c6cdeaf3a85e3021c0596
Reviewed-on: https://code.wireshark.org/review/20230
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years ago[skinny]: Fix tvb struct size guard value
Diederik de Groot [Sun, 19 Feb 2017 17:05:20 +0000 (18:05 +0100)]
[skinny]: Fix tvb struct size guard value

The struct size guard value was used incorrectly, causing message with short
content to be only partially dissected.

Minor:
- Renamed OffHookWithCgpn to OffHookWithCalingPartyNumber
- Added SetHookFlashDetect Message
- Removed some of the debug logging when parse_xml2skinny_dissector.py:debug=0

Change-Id: If4f20d2412f8775fac3d0a2979200e8369cea6f2
Reviewed-on: https://code.wireshark.org/review/20186
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoQt: Avoid flicker in filter expressions toolbar
Stig Bjørlykke [Tue, 21 Feb 2017 11:38:28 +0000 (12:38 +0100)]
Qt: Avoid flicker in filter expressions toolbar

Calling adjustSize() on the display filter toolbar causes flicker
in the filter expression toolbar when switching between profiles
without buttons and in some cases changing to a profile without buttons.

Only calling adjustSize() if adding buttons should be fine to avoid
this issues, even if they may be caused by something else.

Change-Id: I8cca84a51dbbc8244dc4342ac0466e35884c294d
Reviewed-on: https://code.wireshark.org/review/20222
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoFaking different U-RNTIs for different CCCH streams.
S. Shapira [Tue, 21 Feb 2017 18:54:01 +0000 (20:54 +0200)]
Faking different U-RNTIs for different CCCH streams.

Change is in the FP dissector but it's effect is in the RLC dissector's
conversation finding logic (which uses the U-RNTI).

Bug: 13423
Change-Id: Ice2302a07e644d0cc744e9925df03acb722d3184
Reviewed-on: https://code.wireshark.org/review/20232
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>
3 years agoL&G 8979 - Fix 'flags' display and RTU->master echoed responses from SBO commands
Chris Bontje [Tue, 21 Feb 2017 19:54:58 +0000 (12:54 -0700)]
L&G 8979 - Fix 'flags' display and RTU->master echoed responses from SBO commands

Change-Id: I7bf8ce24ded164d547c739b00299f292bc4237cf
Reviewed-on: https://code.wireshark.org/review/20233
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoClean up the get_if_capabilities_ routines a bit.
Guy Harris [Wed, 22 Feb 2017 04:05:29 +0000 (20:05 -0800)]
Clean up the get_if_capabilities_ routines a bit.

Allocate the interface capabilities structure only if we succeed in
getting a pcap_t handle for it.

For remote devices, explicitly set caps->can_set_rfmon and
caps->data_link_types, to be a little bit more like what we do for local
devices.

Change-Id: I985c05f85f165fce4dfe0392569ec51ed1eeb91e
Reviewed-on: https://code.wireshark.org/review/20242
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoOnly do save_errno = errno and errno = save_errno around g_free();
Guy Harris [Wed, 22 Feb 2017 01:41:55 +0000 (17:41 -0800)]
Only do save_errno = errno and errno = save_errno around g_free();

There is *no* need to do it around an assignment statement.  (We
*probably* don't need to do it around g_free(), but better safe than
sorry - maybe some memory allocator makes system calls to hand regions
of the address space back.)

Change-Id: Ib57540cc36b505aadf4a5e8885b9a744a35b1f75
Reviewed-on: https://code.wireshark.org/review/20236
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMake sure we zero out the newly allocated list, otherwise g_list append may
Joerg Mayer [Wed, 22 Feb 2017 00:25:53 +0000 (01:25 +0100)]
Make sure we zero out the newly allocated list, otherwise g_list append may
dereference ->next containing an arbitrary value.

Bug: 13418
Change-Id: I240bc03e652ede557083379cc81b81ae83d720e5
Reviewed-on: https://code.wireshark.org/review/20235
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
3 years agoSnort: use GRegex to find pcre matches
Martin Mathieson [Sun, 19 Feb 2017 10:32:04 +0000 (02:32 -0800)]
Snort: use GRegex to find pcre matches

Change-Id: Ie08bc1f3139ebe5564365e662f89257ad8d5b129
Reviewed-on: https://code.wireshark.org/review/20177
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
3 years agoFix a double free.
Gerald Combs [Tue, 21 Feb 2017 17:57:16 +0000 (09:57 -0800)]
Fix a double free.

In create_persconffile_profile, pf_dir_path_copy needs to be allocated
separately since the subsequent call to get_dirname is destructive. Add
back a call to g_strdup. This should hopefully fix a crash in the Win32
buildbot.

Change-Id: I591b5845032c9b8a5324bf6ac60fc43d1e92ac2e
Reviewed-on: https://code.wireshark.org/review/20231
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years ago[GSM A BSSMAP] Correct a cause value according to TS 48.008 V13.2.0
AndersBroman [Tue, 21 Feb 2017 14:21:20 +0000 (15:21 +0100)]
[GSM A BSSMAP] Correct a cause value according to TS 48.008 V13.2.0

Change-Id: Ie1983530ed7e3606aa7b21ea91fb1c0867c50759
Reviewed-on: https://code.wireshark.org/review/20228
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoQt: Handle cancel in import coloring rules
Stig Bjørlykke [Tue, 21 Feb 2017 12:18:55 +0000 (13:18 +0100)]
Qt: Handle cancel in import coloring rules

Change-Id: I450cfc41d19c0dcb4aa59c0515d8d0834cfee60b
Reviewed-on: https://code.wireshark.org/review/20223
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
3 years ago[GSM RLCMAC] Fix column info.
AndersBroman [Tue, 21 Feb 2017 09:07:03 +0000 (10:07 +0100)]
[GSM RLCMAC] Fix column info.

Change-Id: Ib9dc9de7da088ab14e5f52b706e0c367c576b978
Reviewed-on: https://code.wireshark.org/review/20221
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoDNS: Add Edwards-Curve Digital Security Algorithm (EdDSA) for DNSSEC (RFC 8080)
Alexis La Goutte [Sun, 19 Feb 2017 15:53:20 +0000 (16:53 +0100)]
DNS: Add Edwards-Curve Digital Security Algorithm (EdDSA) for DNSSEC (RFC 8080)

Change-Id: I39a8c6639174e73f90bc4c3d8bccf628c3a477c3
Reviewed-on: https://code.wireshark.org/review/20179
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agocouchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 19 Feb 2017 18:04:54 +0000 (19:04 +0100)]
couchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I9f5f91925607582f40855ca1a08875e83d62f4eb
Reviewed-on: https://code.wireshark.org/review/20205
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoCouchbase: Add SSL support
olivermd [Tue, 14 Feb 2017 15:07:46 +0000 (15:07 +0000)]
Couchbase: Add SSL support

Change-Id: I468f92c20184a6e5f5bd1f07d94c0b605c0593dc
Reviewed-on: https://code.wireshark.org/review/20149
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>
3 years agocmake: Add some missing SET_FEATURE_INFO
Alexis La Goutte [Mon, 20 Feb 2017 13:54:16 +0000 (14:54 +0100)]
cmake: Add some missing SET_FEATURE_INFO

for nghttp2, lz4, snappy

Change-Id: I0788c2105b69ba2ae781709fb5e16e13b5ca1533
Reviewed-on: https://code.wireshark.org/review/20200
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>
3 years agocmake: SET_FEATURE_INFO don't need to add www: for URL
Alexis La Goutte [Mon, 20 Feb 2017 13:47:20 +0000 (14:47 +0100)]
cmake: SET_FEATURE_INFO don't need to add www: for URL

Change-Id: If01c008690dc1956b42d63d67942414063f3e76c
Reviewed-on: https://code.wireshark.org/review/20199
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agotns(.h): Remove unneeded h file
Alexis La Goutte [Mon, 20 Feb 2017 14:48:19 +0000 (15:48 +0100)]
tns(.h): Remove unneeded h file

Change-Id: I11ccaa73e2ea58ffbfb897ee54bbdf89068e36dc
Reviewed-on: https://code.wireshark.org/review/20207
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>
3 years agoGet rid of unused variable.
Guy Harris [Tue, 21 Feb 2017 03:21:28 +0000 (19:21 -0800)]
Get rid of unused variable.

Change-Id: I684ce34b33e8abc596b9109068e302db57f85115
Reviewed-on: https://code.wireshark.org/review/20220
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoNew/updated reference URLs.
Guy Harris [Tue, 21 Feb 2017 02:58:03 +0000 (18:58 -0800)]
New/updated reference URLs.

Add an IBM link for SNA, they being its creators.

Point to Wayback Machine archives for the protocols.com page, as that
doesn't seem to be available on protocols.com any more.

Change-Id: I33633c838707f13afacde7a207a06f87b9f99bbb
Reviewed-on: https://code.wireshark.org/review/20219
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoHave all the remote host list routines' names begin with recent_.
Guy Harris [Tue, 21 Feb 2017 02:46:08 +0000 (18:46 -0800)]
Have all the remote host list routines' names begin with recent_.

Some did, some didn't - make it consistent.

Clean up some header comments while we're at it.

Change-Id: I978c84167cce3c8f1c0280898aa4d0b60958325b
Reviewed-on: https://code.wireshark.org/review/20218
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoHave a routine to iterate over the remote host list.
Guy Harris [Tue, 21 Feb 2017 02:31:15 +0000 (18:31 -0800)]
Have a routine to iterate over the remote host list.

Have a routine that iterates over the remote host list if it exists.

Remove the routine to get the remote host list; all accesses should be
through functions in ui/remote.c.

Change-Id: Idddceba76b50ce85ef8557e132d7552191c2fddc
Reviewed-on: https://code.wireshark.org/review/20217
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoDon't use identical log messages for non-identical error cases.
Joerg Mayer [Mon, 20 Feb 2017 23:03:54 +0000 (00:03 +0100)]
Don't use identical log messages for non-identical error cases.

Change-Id: Ia80f112bef5f0c10e54223d3b57570fa53f7e867
Reviewed-on: https://code.wireshark.org/review/20216
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
3 years agoCalling g_hash_table_size with a NULL argument causes a GLib-CRITICAL.
Joerg Mayer [Mon, 20 Feb 2017 20:44:27 +0000 (21:44 +0100)]
Calling g_hash_table_size with a NULL argument causes a GLib-CRITICAL.

This fixes the first issue appearing in the log of

Bug: 13418
Change-Id: I2fe68a06dd4a19be8300ec34be65a8dc47d0f8b3
Reviewed-on: https://code.wireshark.org/review/20214
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
3 years agoFix a typo and a copy-and-pasteo.
Guy Harris [Mon, 20 Feb 2017 21:26:04 +0000 (13:26 -0800)]
Fix a typo and a copy-and-pasteo.

Change-Id: I6688658698efb2588520f0ef3ffbe8e6e38aedec
Reviewed-on: https://code.wireshark.org/review/20215
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years ago[GTP] Make flag fields boolean.
AndersBroman [Mon, 20 Feb 2017 15:49:10 +0000 (16:49 +0100)]
[GTP] Make flag fields boolean.

Change-Id: I491a2f03babfae34750efa2a57a64392b4558f13
Reviewed-on: https://code.wireshark.org/review/20213
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>
3 years ago[BSSGP] Dissect new Extended Feature Bitmap fields.
AndersBroman [Mon, 20 Feb 2017 15:41:54 +0000 (16:41 +0100)]
[BSSGP] Dissect new Extended Feature Bitmap fields.

Change-Id: I6993a1b0d0a5056c3c2a3af0f5bc5eef6a36cde1
Reviewed-on: https://code.wireshark.org/review/20212
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>
3 years agowtap_opttypes(.h): fix commas at the end of enumerator lists are a C++11 extension...
Alexis La Goutte [Mon, 20 Feb 2017 13:24:30 +0000 (14:24 +0100)]
wtap_opttypes(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]

Change-Id: Ie7f67510ea948fb72b57fe08d9f95d135c5855a5
Reviewed-on: https://code.wireshark.org/review/20194
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>
3 years agoprint(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc+...
Alexis La Goutte [Mon, 20 Feb 2017 13:23:18 +0000 (14:23 +0100)]
print(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]

Change-Id: Iedffbd72c855340ab77157df954366c8e479c7df
Reviewed-on: https://code.wireshark.org/review/20193
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoYell at the user less.
Gerald Combs [Sun, 19 Feb 2017 18:58:47 +0000 (10:58 -0800)]
Yell at the user less.

Our user-facing messages should have a helpful (or at the very least
neutral) tone. In English, exclamation points are neither. Replace a
bunch of them with periods.

Change-Id: I29c3b2f84c25e06aae5b559860224559053a0378
Reviewed-on: https://code.wireshark.org/review/20189
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>
3 years agostats_tree: fix no previous prototype for ‘stats_tree_cfg_free’ [-Wmissing-prototypes]
Alexis La Goutte [Mon, 20 Feb 2017 13:32:42 +0000 (14:32 +0100)]
stats_tree: fix no previous prototype for ‘stats_tree_cfg_free’ [-Wmissing-prototypes]

Change-Id: Iddf63fabec9a2abb5b3d75fb5289f769e0175b55
Reviewed-on: https://code.wireshark.org/review/20197
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years ago[Diameter] Add 3GPP AVPs
AndersBroman [Mon, 20 Feb 2017 14:49:53 +0000 (15:49 +0100)]
[Diameter] Add 3GPP AVPs

Change-Id: I53c2298584b53943924da417ac407e13f7c23d40
Reviewed-on: https://code.wireshark.org/review/20206
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoSNMP: fix insertion of first entry in SNMP Users UAT
Pascal Quantin [Sun, 19 Feb 2017 21:02:04 +0000 (22:02 +0100)]
SNMP: fix insertion of first entry in SNMP Users UAT

when using the GUI to add the first entry, num_ueas is still 0.

Change-Id: Iea03495a2e5e39b71391a01454aec5fb6e2b05eb
Reviewed-on: https://code.wireshark.org/review/20191
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>
3 years agoSNMP: duplicate dynamic members of snmp_ue_assoc_t structure in localize_ue()
Pascal Quantin [Sun, 19 Feb 2017 20:41:55 +0000 (21:41 +0100)]
SNMP: duplicate dynamic members of snmp_ue_assoc_t structure in localize_ue()

Otherwise you can end up freeing twice the same memory blocks
(from localized_ues and unlocalized_ues lists)

Bug: 13420
Change-Id: I7e6f1f8d740b0e5ffca851f3f5b1928a7686c069
Reviewed-on: https://code.wireshark.org/review/20190
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoAdd some glib functions not available in older glibs
AndersBroman [Fri, 17 Feb 2017 15:19:56 +0000 (16:19 +0100)]
Add some glib functions not available in older glibs

Change-Id: I6526d799447a3b6c0b9bb42f8d0f8c3415299ed0
Reviewed-on: https://code.wireshark.org/review/20158
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>
3 years agoQt: Mystery pixel issue is solved
Stig Bjørlykke [Sun, 19 Feb 2017 18:46:13 +0000 (19:46 +0100)]
Qt: Mystery pixel issue is solved

The mystery pixel issue has probably been mysteriously solved earlier
because the adjustments does not work as expected now.

This fixes an issue where one of the panes increases with 1 pixel at
startup and when changing profile using layout type 3, 4, 5 and 6
(selection number 1, 4, 5 and 6 in “Preferences -> Appearance -> Layout”).

Change-Id: Iab36fa5303dc8628b21e5cf920e7c70a7167d76e
Reviewed-on: https://code.wireshark.org/review/20188
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>
3 years agoQt: Add "Reset Layout"
Stig Bjørlykke [Sat, 18 Feb 2017 21:40:49 +0000 (22:40 +0100)]
Qt: Add "Reset Layout"

Add menu item "Reset Layout" to manually reset panes to equal sizes.

Change-Id: I1efbf655462e25053062e03f8038dc20f9f555c0
Reviewed-on: https://code.wireshark.org/review/20173
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>
3 years agostat_tap_ui: skip duplicate keys.
Dario Lombardo [Mon, 13 Feb 2017 15:37:39 +0000 (16:37 +0100)]
stat_tap_ui: skip duplicate keys.

Change-Id: If2a2d6af94458a72dc304eae3cacac0a4af2d25a
Reviewed-on: https://code.wireshark.org/review/20092
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoDNS: Don't display DNSSEC Protocol and Algo in flag tree
Alexis La Goutte [Sun, 19 Feb 2017 16:00:47 +0000 (17:00 +0100)]
DNS: Don't display DNSSEC Protocol and Algo in flag tree

Change-Id: Ifbee604f25c27076750f41ada9dfef6157ac7819
Reviewed-on: https://code.wireshark.org/review/20180
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>
3 years agoBGP: Update some draft to final RFC
Alexis La Goutte [Sun, 19 Feb 2017 17:31:58 +0000 (18:31 +0100)]
BGP: Update some draft to final RFC

draft-ietf-idr-aigp -> RFC7311
draft-ietf-idr-ls-distribution -> RFC7752
draft-ietf-idr-large-community -> RFC8092

Change-Id: Ia05809ed88514f3a0c221af2aaea779f24be99e7
Reviewed-on: https://code.wireshark.org/review/20187
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>
3 years agoBGP: add Deprecated BGP Path Attribute (RFC 8093)
Alexis La Goutte [Sun, 19 Feb 2017 16:11:09 +0000 (17:11 +0100)]
BGP: add Deprecated BGP Path Attribute (RFC 8093)

Change-Id: I18f01f8c989a8d25a168761f22b4cf6e2b51bf18
Reviewed-on: https://code.wireshark.org/review/20182
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agopacket-tns.c: Add Sesskey, Auth (SQLNET_RETURN_OPI_PARAM)
Alexandr Savca [Sat, 18 Feb 2017 12:34:22 +0000 (14:34 +0200)]
packet-tns.c: Add Sesskey, Auth (SQLNET_RETURN_OPI_PARAM)

I added a few TNS pcaps on the SampleCaptures wiki and tested with all
of them.

With this patch I get an error (malformed packet) on 'Set Protocol'
response. Peter Wu fixed it by this patch:
https://code.wireshark.org/review/#/c/20098/

Change-Id: Ia41ba7d229a5332740c57853b1929764604eda03
Reviewed-on: https://code.wireshark.org/review/20165
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agotap: use g_new0() instead of g_new() and memset()
Martin Kaiser [Sun, 19 Feb 2017 14:54:55 +0000 (15:54 +0100)]
tap: use g_new0() instead of g_new() and memset()

Change-Id: Ib6b7424ac38a08efebc3b86aca4dc6641f6c7585
Reviewed-on: https://code.wireshark.org/review/20178
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
3 years ago[Automatic update for 2017-02-19]
Gerald Combs [Sun, 19 Feb 2017 16:12:05 +0000 (08:12 -0800)]
[Automatic update for 2017-02-19]

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

Change-Id: I2796bfe2a186adfe14adaf09c0fef65e765c474a
Reviewed-on: https://code.wireshark.org/review/20183
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agostat_tap_ui: remove leaks.
Dario Lombardo [Sat, 11 Feb 2017 23:04:31 +0000 (00:04 +0100)]
stat_tap_ui: remove leaks.

Change-Id: If7a28ba305bed9f63f200f8a8a27a796f2df9c07
Reviewed-on: https://code.wireshark.org/review/20015
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoClean up some memory leaks in wsutil/filesystem.c
Michael Mann [Sat, 18 Feb 2017 15:46:24 +0000 (10:46 -0500)]
Clean up some memory leaks in wsutil/filesystem.c

The fixes involve functions always returning a string that needs to be
freed by the caller.  That way the static string pointers within the functions
don't end up leaking at program end.

Change-Id: I35a8dc37536c2927d88f33217887f62efafcc8ca
Reviewed-on: https://code.wireshark.org/review/20175
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFix ieee80211_tag_ssid
Michael Mann [Sat, 18 Feb 2017 22:29:52 +0000 (17:29 -0500)]
Fix ieee80211_tag_ssid

Was still using tag type + length when doing offset calculations.

Change-Id: I778f56f28fa1ccec57c5192df4f8e4aa99e45e45
Reviewed-on: https://code.wireshark.org/review/20174
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agofile-pcapng: Undo some unnecessary changes.
Jim Young [Sat, 18 Feb 2017 18:28:43 +0000 (13:28 -0500)]
file-pcapng: Undo some unnecessary changes.

In commit 35cf66d8bd2d225ab4dad39f5af5253ab6c8caa9 four existing
objects were renamed for no good reason.  Restore original names.
Also remove unnessary Darwin options from packet block options
and remove leftover include.

Change-Id: I9dfa642639af13e73b519438b82b1b2a77546c7c
Reviewed-on: https://code.wireshark.org/review/20171
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
3 years agoOnly cleanup open_routines if not NULL
Michael Mann [Sat, 18 Feb 2017 20:29:56 +0000 (15:29 -0500)]
Only cleanup open_routines if not NULL

Change-Id: I76ea675625ef2812f51bad0c37f6c58060897f55
Reviewed-on: https://code.wireshark.org/review/20172
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoroofnet: display always reserved field
Alexis La Goutte [Sat, 18 Feb 2017 15:17:31 +0000 (16:17 +0100)]
roofnet: display always reserved field

Change-Id: I22d91cad10f925e7634c246ef9d22abe59fd9b51
Reviewed-on: https://code.wireshark.org/review/20170
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>
3 years agoroofnet: always declare variable on the top
Alexis La Goutte [Sat, 18 Feb 2017 09:07:32 +0000 (10:07 +0100)]
roofnet: always declare variable on the top

i known... not longer recommanded but i prefer

Change-Id: I0114202a2f1d7045524aa9fe254209c93d510b7d
Reviewed-on: https://code.wireshark.org/review/20169
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoroofnet: fix indent (add some missing space)
Alexis La Goutte [Sat, 18 Feb 2017 09:00:40 +0000 (10:00 +0100)]
roofnet: fix indent (add some missing space)

Change-Id: Iecd662a60ffc96e5d4900c716766fd376a6b2c14
Reviewed-on: https://code.wireshark.org/review/20168
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoproto: ensure that length is set for proto_tree_add_item_new_ret_length
Peter Wu [Tue, 14 Feb 2017 09:05:01 +0000 (10:05 +0100)]
proto: ensure that length is set for proto_tree_add_item_new_ret_length

A user reported that the TNS dissector would show "Malformed Packet" in
the Info column in Qt. The actual packet details and Expert Info dialog
however had no trace of the issue.

It turns out that proto_tree_add_item_new_ret_length did not correctly
set the length. Test case (based on pcap from SampleCaptures wiki):

    tshark -r TNS_Oracle1.pcap -w 19.pcap -Y frame.number==19
    tshark -r 19.pcap -Y tcp

Change-Id: I82cb1ccbc7c3b33d2bcdb22f89a1754c1a4575e7
Fixes: v2.1.0rc0-1394-gc67c6e8f30 ("Add routines to add an item and return the item's real length.")
Reviewed-on: https://code.wireshark.org/review/20098
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoplugins: free list on cleanup.
Dario Lombardo [Sun, 12 Feb 2017 15:52:11 +0000 (16:52 +0100)]
plugins: free list on cleanup.

Change-Id: Idff606297f72238f8539cb00ea394ee80fcb502c
Reviewed-on: https://code.wireshark.org/review/20074
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoepan/wsutil: free memory on exit.
Dario Lombardo [Fri, 10 Feb 2017 17:04:20 +0000 (18:04 +0100)]
epan/wsutil: free memory on exit.

Change-Id: I1cf3a4ce3b21b2e10887cbef5576e5e028e55bab
Reviewed-on: https://code.wireshark.org/review/20052
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agowsutil: remove leaks from filesystem and plugins code.
Dario Lombardo [Wed, 8 Feb 2017 13:25:57 +0000 (14:25 +0100)]
wsutil: remove leaks from filesystem and plugins code.

Change-Id: Iac2805c0130bd2ba6cdb3c9dd997050274d58d99
Reviewed-on: https://code.wireshark.org/review/20020
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoWhy you only get 16 bytes of process name.
Guy Harris [Sat, 18 Feb 2017 08:41:53 +0000 (00:41 -0800)]
Why you only get 16 bytes of process name.

Change-Id: I719706e04668aa50ed0eb6184681943718b67f00
Reviewed-on: https://code.wireshark.org/review/20164
Reviewed-by: Guy Harris <guy@alum.mit.edu>