metze/wireshark/wip.git
6 years agoprefs: Avoid empty elements in string lists.
Stig Bjørlykke [Thu, 1 Jun 2017 08:57:05 +0000 (10:57 +0200)]
prefs: Avoid empty elements in string lists.

When parsing a comma-separated string list from file we should not
add an empty element if this list is empty.  Otherwise we would
get an empty string in when writing the file back.

Change-Id: Iea5a33d20991f8c5daed6811beb8ec97b8b1dbe3
Reviewed-on: https://code.wireshark.org/review/21870
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>
6 years agoAdd interval array data structure, with growable intervals
Ahmad Fatoum [Sat, 15 Apr 2017 13:59:52 +0000 (15:59 +0200)]
Add interval array data structure, with growable intervals

A sorted array keyed by intervals
You keep inserting items, then sort the array.
sorting also compacts items that compare equal into one and adjusts
the interval accordingly. find uses binary search to find the item

This is particularly useful, if you got many similar items,
e.g. ObjectMapping subindices in the XDD. XDDs can be upward of
25k lines long with much duplication (253 subindices having the same
content).

Interval Trees wouldn't work, because they didn't allow expanding
existing intervals. Using an array instead of a tree, additionally offers
a possible performance advantage, but it's not that critical here,
as finding should only happen in the async frames

There's room for optimization in the creation process of the array,
but it doesn't matter much, as they aren't created frequently.
Finding speed is what matters for the use case of parsing EDS
and XDD files

Change-Id: Iaaddc90059f0e49b456774a111d8d42452b90cf9
Reviewed-on: https://code.wireshark.org/review/21111
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 years agoAdd a new feature to the release notes.
Stig Bjørlykke [Thu, 1 Jun 2017 09:14:23 +0000 (11:14 +0200)]
Add a new feature to the release notes.

Change-Id: I99dafc515ac70f7ed037c30936aceddd695d3525
Reviewed-on: https://code.wireshark.org/review/21871
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agoQt: Enable unhiding all interfaces.
Stig Bjørlykke [Thu, 1 Jun 2017 07:20:38 +0000 (09:20 +0200)]
Qt: Enable unhiding all interfaces.

When having hidden interfaces it was not possible to unhide all
in the "Manage Interfaces" dialog because prefs.capture_devices_hide
was not updated when not having any hidden interfaces.

This bug was introduced in g6eee29bf.

Change-Id: If94c2e592eea60e6f1ef1ce2107ff9b2b27c3176
Reviewed-on: https://code.wireshark.org/review/21869
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoQt+prefs: Add a dark theme check and default colors.
Gerald Combs [Tue, 30 May 2017 18:57:06 +0000 (11:57 -0700)]
Qt+prefs: Add a dark theme check and default colors.

Add prefs_set_gui_theme_is_dark and call it in the WiresharkApplication
constructor. Add a set of dark syntax color defaults.

We could alternatively add a preference for the syntax foreground color,
but that would imply adding a preference for the background color as
well.

Bug: 11131
Bug: 13738
Change-Id: Iefe135ed04e63372ed434c5b9759647c9f4046e3
Reviewed-on: https://code.wireshark.org/review/21827
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>
6 years agocmake: Add -Wshorten-64-to-32 for C++ when using Qt >= 5.9
Stig Bjørlykke [Wed, 31 May 2017 13:45:59 +0000 (15:45 +0200)]
cmake: Add -Wshorten-64-to-32 for C++ when using Qt >= 5.9

The warnings has been fixed in Qt 5.9.

Change-Id: I7cc71612e601517b7d7117c3cf2711ec983593a6
Reviewed-on: https://code.wireshark.org/review/21861
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>
6 years agoQt: Disable -Wframe-larger-than= for ui_main_window.h
Stig Bjørlykke [Wed, 31 May 2017 19:34:55 +0000 (21:34 +0200)]
Qt: Disable -Wframe-larger-than= for ui_main_window.h

The generated Ui_MainWindow::setupUi() can grow larger than our configured
limit, so turn off -Wframe-larger-than= for ui_main_window.h.

Change-Id: I550ff30ebe566b711c63f7a9d0276e5b06244407
Reviewed-on: https://code.wireshark.org/review/21866
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>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agodebian: remove imagemagick and demote xdg-utils deps
Peter Wu [Fri, 26 May 2017 13:55:08 +0000 (15:55 +0200)]
debian: remove imagemagick and demote xdg-utils deps

imagemagick was needed since v1.11.1-rc1-140-g02a8e72b43, but
unnecessary since v2.1.0rc0-491-g18a54fcaa4, remove it.
xdg-utils is needed for xdg-open (opening websites) at runtime in GTK+,
but not for Qt nor during the build, remove it or mark it as optional.

Change-Id: I6fc4d5fb61ea8b5cf79526d92ef8c108bc9d11a3
Reviewed-on: https://code.wireshark.org/review/21765
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 years agopacket-epl.c: Fix bounds error on malformed packet
Ahmad Fatoum [Tue, 30 May 2017 20:25:23 +0000 (22:25 +0200)]
packet-epl.c: Fix bounds error on malformed packet

dissect_epl_payload is called with len retrieved from the packet payload,
so we've to ensure there are indeed at least len bytes remaining in the tvbuff.

Counting the remaining bytes has to start from the _current_ offset, not from
the start of the buffer.

Change-Id: I6f4a94e8503cde6c5eaadc43f560c15ef8c1c375
Reviewed-on: https://code.wireshark.org/review/21829
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: Roland Knall <rknall@gmail.com>
6 years agoQt: Capitalize "Select SACKs" in tcptrace graph.
Stig Bjørlykke [Wed, 31 May 2017 18:52:34 +0000 (20:52 +0200)]
Qt: Capitalize "Select SACKs" in tcptrace graph.

Change-Id: I2d0b433fec482431f6ccfe6f8fe6576193fc7773
Reviewed-on: https://code.wireshark.org/review/21863
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agoQt: Add cast to QByteArray.resize()
Stig Bjørlykke [Wed, 31 May 2017 13:44:34 +0000 (15:44 +0200)]
Qt: Add cast to QByteArray.resize()

Change-Id: I651cf6e625b8c757820a1e879f3fbde99746ba88
Reviewed-on: https://code.wireshark.org/review/21860
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years ago80211 (prism): fix conflict for hf field
Alexis La Goutte [Wed, 31 May 2017 05:37:24 +0000 (07:37 +0200)]
80211 (prism): fix conflict for hf field

Remove hf_ieee80211_prism_did_sig_rate.

Change-Id: Id75deae2c074ecbb771e33c4a6f3855cb2ba9d9f
Reviewed-on: https://code.wireshark.org/review/21848
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoSort the RADIUS dictionaries and account for a rename of one of them.
Guy Harris [Wed, 31 May 2017 17:02:21 +0000 (10:02 -0700)]
Sort the RADIUS dictionaries and account for a rename of one of them.

Change-Id: Ieea5349a38366a68cd313e70c8f1d28828982d7b
Reviewed-on: https://code.wireshark.org/review/21862
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoacn: fix conflict for hf field
Alexis La Goutte [Wed, 31 May 2017 05:35:56 +0000 (07:35 +0200)]
acn: fix conflict for hf field

Turn hf_magic_reply_invalid_type in an expert info.

Change-Id: I6eeb5590e3d620ebb5afe46eae36cba6784033a4
Reviewed-on: https://code.wireshark.org/review/21847
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>
6 years agodebian: add lintian-overrides for libwireshark0
Alexis La Goutte [Wed, 2 Nov 2016 07:10:06 +0000 (08:10 +0100)]
debian: add lintian-overrides for libwireshark0

Remove last lintian issue

Change-Id: I672b347a8b0fc495b6e010ef987c0ff238eb8d1e
Reviewed-on: https://code.wireshark.org/review/18622
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>
6 years agoUMTS FP: backout part of g899fd42
Pascal Quantin [Wed, 31 May 2017 12:00:27 +0000 (14:00 +0200)]
UMTS FP: backout part of g899fd42

The delay for p_add_proto_data() calls was not required and introduced several
bugs (when the function returns before private info is attached).

Change-Id: Id3a668e6776308b2ea758940e4260bfcbddc236a
Reviewed-on: https://code.wireshark.org/review/21859
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>
6 years agolemon: avoid redundant redeclaration of ‘memory_error’ [-Wredundant-decls]
Alexis La Goutte [Wed, 31 May 2017 05:56:09 +0000 (07:56 +0200)]
lemon: avoid redundant redeclaration of ‘memory_error’ [-Wredundant-decls]

Change-Id: I1fbc11dc433363b659ddba9a77e52ffd4e3968d7
Reviewed-on: https://code.wireshark.org/review/21850
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>
6 years agoopcua: fix no previous prototype for ‘parseNodeClassMask/parseResultMask’ [-Wmissing...
Alexis La Goutte [Wed, 31 May 2017 05:53:19 +0000 (07:53 +0200)]
opcua: fix no previous prototype for ‘parseNodeClassMask/parseResultMask’ [-Wmissing-prototypes]

Change-Id: If57183bcea978b766fc53f691a35c4ddf98ca2dd
Reviewed-on: https://code.wireshark.org/review/21849
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>
6 years agoFix nsis intaller
Graham Bloice [Wed, 31 May 2017 11:13:56 +0000 (12:13 +0100)]
Fix nsis intaller

The radius erx disctionary has been renamed to unisphere.

Change-Id: I3d8a4b9d8f6a5340f3a92274816e66bdaa55ffd3
Reviewed-on: https://code.wireshark.org/review/21858
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
6 years agoSort the dictionary.* files.
Guy Harris [Wed, 31 May 2017 09:38:38 +0000 (02:38 -0700)]
Sort the dictionary.* files.

Change-Id: Iad4457cc17f3e6a5b092d8050a0d1cc541efb2a3
Reviewed-on: https://code.wireshark.org/review/21856
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoRename dictionary.erx to dictionary.unisphere and pick up the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 09:32:55 +0000 (02:32 -0700)]
Rename dictionary.erx to dictionary.unisphere and pick up the FreeRADIUS version.

This picks up

    commit a5ad82aecc194f5f55153c351a62af9bb1c222a0
    Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
    Date:   Sat Dec 7 23:24:20 2013 +0000

        Fully sync ERX/Unisphere with Juniper's dictionaries

as well as picking up the copyright notice.

Change-Id: Ia6a694ccd94ad05caf25bea4dec9b467a4f99157
Reviewed-on: https://code.wireshark.org/review/21855
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate a comment.
Guy Harris [Wed, 31 May 2017 08:22:16 +0000 (01:22 -0700)]
Update a comment.

We now support dotted number values in the oid field.

Note that the attribute flags internal, array, concat, and virtual
aren't documented in the FreeRADIUS dictionary man page.

Change-Id: Iaf27845f75a93f2d006708224757ea48d8023cb1
Reviewed-on: https://code.wireshark.org/review/21853
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoGive more information in a comment.
Guy Harris [Wed, 31 May 2017 08:18:22 +0000 (01:18 -0700)]
Give more information in a comment.

Change-Id: I43efd124bc49bc3d1261bd690ce38c5debb94e45
Reviewed-on: https://code.wireshark.org/review/21852
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 07:51:48 +0000 (00:51 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice, cleans up white space, puts the type and
the properties of attributes in separate fields.

Change-Id: I1a813a784498ed3217c7fc9bfcd9c1162ceffebb
Reviewed-on: https://code.wireshark.org/review/21851
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:34:21 +0000 (20:34 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice and a commented-out attribute.

Change-Id: I0325164eb3875557f7ce9a81cf697a99a0f5de93
Reviewed-on: https://code.wireshark.org/review/21846
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:32:24 +0000 (20:32 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice and a value.

Change-Id: I99957b97cf905b9d13024f70b76e875756e71609
Reviewed-on: https://code.wireshark.org/review/21845
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:30:02 +0000 (20:30 -0700)]
Update to the FreeRADIUS version.

Picks up a copyright notice, a comment, and some attributes.

Change-Id: I299a4f1225eb6be23410c396a4f5a00affd64523
Reviewed-on: https://code.wireshark.org/review/21844
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:26:15 +0000 (20:26 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice and an additional attribute.

Change-Id: Ieebed5ceae7a10bf393245d9fcf82310df6c42d9
Reviewed-on: https://code.wireshark.org/review/21843
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:24:31 +0000 (20:24 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice, a comment, and an attribute.

Change-Id: I9b0c536646860f0d4e6e7f59967db22d592fc1c4
Reviewed-on: https://code.wireshark.org/review/21842
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:22:12 +0000 (20:22 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice, a comment, and an additional attribute.

Change-Id: Ie65dcb039c725a63d1a9b6976814c182e10c74cb
Reviewed-on: https://code.wireshark.org/review/21841
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMerge with the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:20:05 +0000 (20:20 -0700)]
Merge with the FreeRADIUS version.

Pick up copyright notice and some additional attributes, along with
BEGIN-VENDOR and END-VENDOR.

Change-Id: Ifa0112a0bfc56f5977bffd6a32b12d1c1a089529
Reviewed-on: https://code.wireshark.org/review/21840
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:10:20 +0000 (20:10 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice and some more attributes.

Change-Id: I594d8f72913fce3836db1935a3689d60a5a3f2ba
Reviewed-on: https://code.wireshark.org/review/21839
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:08:55 +0000 (20:08 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice and some additional attributes.

Change-Id: I4a942512f62d91d98dcbf4ccba65ff97b6a729c9
Reviewed-on: https://code.wireshark.org/review/21838
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:05:54 +0000 (20:05 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice and adds some attributes and values.

Change-Id: If24d00ceb23002aea2c24c16a7b38fd77df9401a
Reviewed-on: https://code.wireshark.org/review/21837
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 03:03:37 +0000 (20:03 -0700)]
Update to the FreeRADIUS version.

Picks up the copyright notice and new attributes and values, and renames
a few values to remove "-HW".

Change-Id: Iccf3938f54fab8b234ee49b509fdcc8a3cfba670
Reviewed-on: https://code.wireshark.org/review/21836
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 02:40:53 +0000 (19:40 -0700)]
Update to the FreeRADIUS version.

It moves an attribute.

Change-Id: I9f3c88f174b9520b16d3f2c68abe278ef695d403
Reviewed-on: https://code.wireshark.org/review/21835
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 02:38:06 +0000 (19:38 -0700)]
Update to the FreeRADIUS version.

Change-Id: I8af7ec1ec6ee2c44cddd4ed91a95039bcce3bd5e
Reviewed-on: https://code.wireshark.org/review/21834
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 02:36:01 +0000 (19:36 -0700)]
Update to the FreeRADIUS version.

Give a URL for the Extreme Networks documentation listing these
attributes, replacing our earlier citation; the newer version says
attribute 213 is Extreme-VM-Name, as is the case in the FreeRADIUS
version, not Extreme-CLI-Profile, as was the case in our version.

Change-Id: Iddd69c2ef4d3a5d55f16c20f3899eebdea217a2a
Reviewed-on: https://code.wireshark.org/review/21833
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 02:24:21 +0000 (19:24 -0700)]
Update to the FreeRADIUS version.

This file is mainly for supporting older names for certain attributes
and values; all the attributes and values here should be defined by
other files, so we really shouldn't be including this file.

Change-Id: I2e5391f0ed14d42e97434b77794e8ba643850608
Reviewed-on: https://code.wireshark.org/review/21832
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMerge with the FreeRADIUS version.
Guy Harris [Wed, 31 May 2017 02:16:17 +0000 (19:16 -0700)]
Merge with the FreeRADIUS version.

Pick up the copyright notice and some additional attributes/values, and
mark some attributes as no longer being Wireshark additions.  Change
some names to match the FreeRADIUS names.

Mark some URLs as dead links, and try to supply replacements; use the
Wayback Machine for others.

Preserve our fixes and enhancements.

Change-Id: I000cf05682506ed0db9b0fff856998479ee0dfa4
Reviewed-on: https://code.wireshark.org/review/21831
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMerge with the FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 19:43:17 +0000 (12:43 -0700)]
Merge with the FreeRADIUS version.

Pick up their copyright notice and additions.

Replace links used as references.

Our version is now their version with some additional comments and
different links (replacing broken links with non-broken ones).

Change-Id: I785d14f537abd96cd7baa3438191e1371e34ebc0
Reviewed-on: https://code.wireshark.org/review/21828
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoQt: Add support to verify extcap capture filter
Michael Mann [Fri, 26 May 2017 11:52:17 +0000 (07:52 -0400)]
Qt: Add support to verify extcap capture filter

Bug: 11668
Change-Id: Ib218d87c1905e53ffdab4e3dd6f93ba2c3d07c8b
Reviewed-on: https://code.wireshark.org/review/21770
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>
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years ago[GTP] Update cause values.
AndersBroman [Tue, 30 May 2017 11:53:16 +0000 (13:53 +0200)]
[GTP] Update cause values.

Change-Id: Ic9b0ccf045169de676b95c4b85a8d0e1e21e2cb4
Reviewed-on: https://code.wireshark.org/review/21826
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>
6 years ago[Diameter 3GPP] Add subdissection of AVP 1679 AIR-Flags
AndersBroman [Tue, 30 May 2017 11:31:14 +0000 (13:31 +0200)]
[Diameter 3GPP] Add subdissection of AVP 1679 AIR-Flags

Change-Id: I783385b85cfb67d3b0d4affc82a6071e4de51062
Reviewed-on: https://code.wireshark.org/review/21824
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>
6 years agoAdd Inovar specific Diameter AVP codes
Michael Mann [Mon, 29 May 2017 00:24:52 +0000 (20:24 -0400)]
Add Inovar specific Diameter AVP codes

Bug: 13349
Change-Id: I2a06ee3bd7ab1f81414ad8e4155c1430a7287644
Reviewed-on: https://code.wireshark.org/review/21778
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoFP - Checks to avoid NULL dereferencing
Darien Spencer [Thu, 25 May 2017 16:05:24 +0000 (19:05 +0300)]
FP - Checks to avoid NULL dereferencing

Making sure channel specific structs are not null

Change-Id: I9f979db4e24bb7bd490cf29a5c68ef32d1b029db
Reviewed-on: https://code.wireshark.org/review/21754
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>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 04:04:07 +0000 (21:04 -0700)]
Update to the FreeRADIUS version.

Pick up copyright notice, comment tweaks, additional attributes.

Change-Id: I16f1683febff5286d5698aaf513c5dc0eb169b15
Reviewed-on: https://code.wireshark.org/review/21823
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 03:58:25 +0000 (20:58 -0700)]
Update to the FreeRADIUS version.

Update copyright notice, fix typo in comment.

Change-Id: Ida68691847e4e9aa80a15a25580e2657d0763bb3
Reviewed-on: https://code.wireshark.org/review/21822
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 03:56:15 +0000 (20:56 -0700)]
Update to FreeRADIUS version.

Pick up copyright notice, more attributes and values.

Change-Id: I83d99cf191c198ced4a1093d5e17a793ae9d38d6
Reviewed-on: https://code.wireshark.org/review/21821
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 03:54:40 +0000 (20:54 -0700)]
Update to FreeRADIUS version.

Pick up copyright notice, fix typoes.

Change-Id: I428b5d8657ca2fba1ae0072bb4d5793025b0855f
Reviewed-on: https://code.wireshark.org/review/21820
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to the FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 03:51:22 +0000 (20:51 -0700)]
Update to the FreeRADIUS version.

Copyright notice, white space cleanups, additional attributes.

Change-Id: I5e52b40ad08dc11722e16fbe927ec8f0f6fed7cd
Reviewed-on: https://code.wireshark.org/review/21819
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 03:22:57 +0000 (20:22 -0700)]
Update to FreeRADIUS version.

Pick up copyright, whitespace cleanups, put UKERNA- in front of some
attributes with the same name as RFC 7055 attributes, add some
additional attributes.

Change-Id: Iad05b3c83c37185bdd18be208fd2e1878b950a0e
Reviewed-on: https://code.wireshark.org/review/21818
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 03:15:28 +0000 (20:15 -0700)]
Update to FreeRADIUS version.

Adds copyright notices, cleans up whitespace, picks up typo fixes.

Change-Id: I9f0583d6d488c2b494c2e651b850bb4226cd6085
Reviewed-on: https://code.wireshark.org/review/21817
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoNote that our dictionary.iea has stuff FreeRADIUS's doesn't.
Guy Harris [Tue, 30 May 2017 03:11:48 +0000 (20:11 -0700)]
Note that our dictionary.iea has stuff FreeRADIUS's doesn't.

Change-Id: I43844691c8bfcd6f8fcd223fd26ee9e0373f2deb
Reviewed-on: https://code.wireshark.org/review/21816
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMerge with FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 03:09:13 +0000 (20:09 -0700)]
Merge with FreeRADIUS version.

Pick up the copyright notice, whitespace changes, and other comment
changes.

Add a comment giving the Wireshark bug whence the additional entries
came.

Change-Id: Ibc188640efe73ca2f53d84bf995b5d7bf34752f9
Reviewed-on: https://code.wireshark.org/review/21815
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate to current FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 03:02:45 +0000 (20:02 -0700)]
Update to current FreeRADIUS version.

Change-Id: I86ce4ed13bfd7e87ccdd282e51e8500fbdc9dded
Reviewed-on: https://code.wireshark.org/review/21814
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix whitespace to match FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 02:54:30 +0000 (19:54 -0700)]
Fix whitespace to match FreeRADIUS version.

Change-Id: I406b47f3907745504f49644a890a3588eabf7c0b
Reviewed-on: https://code.wireshark.org/review/21813
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix white space to match FreeRADIUS.
Guy Harris [Tue, 30 May 2017 02:47:55 +0000 (19:47 -0700)]
Fix white space to match FreeRADIUS.

Change-Id: Ie814a790c15381036ba6bdb1d066012bb15bfb33
Reviewed-on: https://code.wireshark.org/review/21812
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMerge with FreeRADIUS.
Guy Harris [Tue, 30 May 2017 02:36:46 +0000 (19:36 -0700)]
Merge with FreeRADIUS.

They changed some names and added an attribute.

They also removed Aruba-AP-Name with no obvious indication of why; we
leave it in for now.

Give new URLs for attribute lists.

Change-Id: I270573b7d29f47572042abe46e4a531003e6a48e
Reviewed-on: https://code.wireshark.org/review/21811
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMerge with FreeRADIUS and update.
Guy Harris [Tue, 30 May 2017 02:18:03 +0000 (19:18 -0700)]
Merge with FreeRADIUS and update.

Pick up the copyright notice and $Id value.

Don't double-comment-out the items we handle in
packet-radius_packetcable.c; they're already commented out in the
FreeRADIUS version, and that reduces the number of differences between
us and them.  Note in a comment before them that we're handling them in
packet-radius_packetcable.c.

Add a comment pointing at various CableLabs specs before the attributes,
noting where in the specs they're mentioned. (Hint: NOT in a section
about RADIUS!  I guess the idea is that some protocol *other* than
RADIUS can be used to transfer them.)

Change-Id: Ib16fb10df9a434f79a05ce0537c671076aff11a2
Reviewed-on: https://code.wireshark.org/review/21810
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agosharkd: Fix build using system Speex library (autotools)
João Valverde [Mon, 29 May 2017 21:23:49 +0000 (22:23 +0100)]
sharkd: Fix build using system Speex library (autotools)

Change-Id: I1798f3dc76704c646d67d11533f8dc32ebab7401
Reviewed-on: https://code.wireshark.org/review/21793
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
6 years agoFix capitalization of "WiMAX" in END-VENDOR.
Guy Harris [Tue, 30 May 2017 01:29:55 +0000 (18:29 -0700)]
Fix capitalization of "WiMAX" in END-VENDOR.

Change-Id: I35e30b824b9ed8debfbb6a05d72b2396f7132204
Reviewed-on: https://code.wireshark.org/review/21809
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate item for dictionary.airespace.
Guy Harris [Tue, 30 May 2017 01:18:01 +0000 (18:18 -0700)]
Update item for dictionary.airespace.

Change-Id: I5bacf0700a6bac4204a322d60812d5ece7a73be0
Reviewed-on: https://code.wireshark.org/review/21808
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMerge with the FreeRADIUS version.
Guy Harris [Tue, 30 May 2017 01:15:39 +0000 (18:15 -0700)]
Merge with the FreeRADIUS version.

Pick up the copyright notice and other comments.

Update the list of URLs, and include the new attributes as copied from
the Cisco support forum article.

Change-Id: I5f8c8833fa88e2538f3132c85a4baa4c8691eccb
Reviewed-on: https://code.wireshark.org/review/21807
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agodictionary.h3c is now the same as the FreeRADIUS one.
Guy Harris [Tue, 30 May 2017 00:26:08 +0000 (17:26 -0700)]
dictionary.h3c is now the same as the FreeRADIUS one.

Change-Id: I0fe227ce7c0e8a3010c6d74eb8f511dd4986aba8
Reviewed-on: https://code.wireshark.org/review/21806
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoWSDG: trivial: fix a link
Martin Kaiser [Mon, 29 May 2017 20:52:02 +0000 (22:52 +0200)]
WSDG: trivial: fix a link

Asciidoc will just create a link from a URL that appears in the text. If
we want the link to appear as an address without a description, there's
no need to add an empty description. We should, however, have a space
behind the link to separate it from the text that follows.

Change-Id: Ic01b1dbbea922d785776f1965481ed58f389e30a
Reviewed-on: https://code.wireshark.org/review/21789
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>
6 years agogif: expert info for unknown data block type
Martin Kaiser [Sun, 28 May 2017 08:26:05 +0000 (11:26 +0300)]
gif: expert info for unknown data block type

Before this patch, the dissector would assume that any data block type
that is unknown must be the trailer byte. Check explicitly if we have a
trailer byte and bring up an expert info for unknown data block types.

Change-Id: I4c3087eb403e2e668a22628062edd0240309a2bc
Reviewed-on: https://code.wireshark.org/review/21790
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>
6 years agoAnother update from FreeRADIUS.
Guy Harris [Mon, 29 May 2017 23:49:56 +0000 (16:49 -0700)]
Another update from FreeRADIUS.

Picks up copyright notice and

  commit 803477f565678f56bac8739aab0b11e0fdf0ff13
  Author: Mathieu Simon <mathieu.simon@simweb.ch>
  Date:   Mon Jan 20 16:04:17 2014 +0100

      Extend the H3C dictionary based on public manuals

      Try to extend the H3C dictionary based on what is scattered on
      their pages. At least most of it is found quite consistently in
      the product-specific "Security Configuration Guides".

      This compilation/crosschecking is based H3C documentation for
      listed devices:
      - H3C S12500 and S6800 Switches
      - H3C WA WLAN Access Points
      - H3C MSR Routers

      Remarks:
      Does not stick with H3C's use of of underline in attribute naming.

  commit 3046419a3a40d0146cea18083c496703b965d8c4
  Author: Mathieu Simon <mathieu.simon@simweb.ch>
  Date:   Mon Jan 20 14:56:00 2014 +0100

      Revisit H3C Exec-Privilege

      Try to match H3C terminology as close as to their documentation.

      - The Attribute name seems to not exactly match documentation,
        found consistently user i.e. in:
        - H3C S12500: Configurations Guides
        - H3C WA Series: Security Configuration Guide

      - Rename privilege levels to match H3C's documentation
        (previously likely more 3Com-ish). The levels naming
        are being used consistently mentioned throughout:
        - H3C SecPath F1000-E: Operational Manual
        - H3C S5500-SI: Operation Manual

  commit 6182027784b9a81af57f9e0e76bc80c94b2ba692
  Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  Date:   Sun Jan 19 22:45:58 2014 +0000

      Add H3C HW-Exec-Privilege as posted by Mathieu Simon

Change-Id: I06d14266a5a60fdeb8ccf9d780db9526df86e5e3
Reviewed-on: https://code.wireshark.org/review/21805
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agodictionary.freeswitch is now the same as the FreeRADIUS one.
Guy Harris [Mon, 29 May 2017 22:57:31 +0000 (15:57 -0700)]
dictionary.freeswitch is now the same as the FreeRADIUS one.

Change-Id: I885104eeb2a42a7bceb912f3bb437f48a8836c57
Reviewed-on: https://code.wireshark.org/review/21804
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agodictionary.nortel is now from the v4.0.x FreeRADIUS branch.
Guy Harris [Mon, 29 May 2017 22:51:11 +0000 (15:51 -0700)]
dictionary.nortel is now from the v4.0.x FreeRADIUS branch.

Change-Id: I4b6d4e7cce3e2e5a31d60aeeaa392c816f616f8e
Reviewed-on: https://code.wireshark.org/review/21803
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoAnother update from FreeRADIUS.
Guy Harris [Mon, 29 May 2017 22:49:31 +0000 (15:49 -0700)]
Another update from FreeRADIUS.

Picks up

  commit c329540701fecbd4ec0ca995a8cdafb907aca60a
  Author: Alan T. DeKok <aland@freeradius.org>
  Date:   Mon Feb 13 20:59:29 2012 +0100

      Added User-Role attribute

and adds copyright information.

Change-Id: I293213e39cf5b8fd44956e5a2b0c0153eb4243df
Reviewed-on: https://code.wireshark.org/review/21802
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agodictionary.eltex is now from FreeRADIUS.
Guy Harris [Mon, 29 May 2017 22:45:20 +0000 (15:45 -0700)]
dictionary.eltex is now from FreeRADIUS.

Change-Id: Ic871389d71ac5b9a78d7a2023425df1acbd93447
Reviewed-on: https://code.wireshark.org/review/21801
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoAnother update from FreeRADIUS.
Guy Harris [Mon, 29 May 2017 22:44:08 +0000 (15:44 -0700)]
Another update from FreeRADIUS.

Includes

  commit 3128d4f1b562ddbcf3b2db2a54659be79f953262
  Author: Alan Buxey <alan.buxey@gmail.com>
  Date:   Sun Jul 21 23:01:57 2013 +0100

      more spelling issues cleared

from FreeRADIUS.

Change-Id: I94cc842306b5d0329eb3981acdee63dd877abff8
Reviewed-on: https://code.wireshark.org/review/21800
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoAnother update from FreeRADIUS.
Guy Harris [Mon, 29 May 2017 22:40:04 +0000 (15:40 -0700)]
Another update from FreeRADIUS.

Copyright, whitespace changs, adds missing END-VENDOR.

Change-Id: I1219f83a99e4ebee3af70498848a0b440c6c3bc1
Reviewed-on: https://code.wireshark.org/review/21799
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agopacket-rsl.c: fixed emlpp priority bit range
Piotr Tulpan [Mon, 29 May 2017 22:13:26 +0000 (00:13 +0200)]
packet-rsl.c: fixed emlpp priority bit range

Based on 3GPP TS 48.058 eMLPP Priority takes bits 1-3 not 1-2.
There is also decalred value_string rsl_emlpp_prio_vals (line 2605)
that contains 8 values not 4 as expected for 1-2 bits.

Change-Id: Iea77f8dbff9af3b25fd298f1a9703c1e34c06d30
Reviewed-on: https://code.wireshark.org/review/21797
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
6 years agoMore updates from FreeRADIUS.
Guy Harris [Mon, 29 May 2017 22:30:46 +0000 (15:30 -0700)]
More updates from FreeRADIUS.

Picks up copyright notices, comment changes, and whitespace cleanups.

Change-Id: I42a265bb1f835bfa6cc1f6090d612b7a731f1b1a
Reviewed-on: https://code.wireshark.org/review/21798
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoUpdate from FreeRADIUS.
Guy Harris [Mon, 29 May 2017 22:14:27 +0000 (15:14 -0700)]
Update from FreeRADIUS.

See

    http://www.urbandictionary.com/define.php?term=authentification

Change-Id: Ia9756b160fc9a144a6fff1e51b6abb743faa4f69
Reviewed-on: https://code.wireshark.org/review/21796
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoCopy over some comment-and-whitespace-only changes from FreeRADIUS.
Guy Harris [Mon, 29 May 2017 21:55:16 +0000 (14:55 -0700)]
Copy over some comment-and-whitespace-only changes from FreeRADIUS.

This adds copyright notices and makes other cleanups.

Change-Id: I5975b563dffd704a336160d08efde42203c81676
Reviewed-on: https://code.wireshark.org/review/21795
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoSync up again.
Guy Harris [Mon, 29 May 2017 21:38:52 +0000 (14:38 -0700)]
Sync up again.

They also fixed up the whitespace.

Change-Id: I44eb94bccfd24c027930b7e385255fbec7ca0431
Reviewed-on: https://code.wireshark.org/review/21794
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoradius: Sync with FreeRADIUS
Alexis La Goutte [Mon, 29 May 2017 17:03:37 +0000 (19:03 +0200)]
radius: Sync with FreeRADIUS

add Dell EMC dictonary

commit 2b2a7dc5654abf740ff7ffb52fc0807a5e0f1781
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed May 24 15:55:05 2017 -0400

    as posted to the list

Change-Id: If3e7e7f401c6f1eca5292f0f323c2cd86dfd3fcc
Reviewed-on: https://code.wireshark.org/review/21787
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>
6 years agoPut back whitespace cleanups.
Guy Harris [Mon, 29 May 2017 21:23:21 +0000 (14:23 -0700)]
Put back whitespace cleanups.

(I'll send those to the FreeRADIUS people.)

Change-Id: I9163c2710e2924e657b19f2d48bd310bb805244c
Reviewed-on: https://code.wireshark.org/review/21792
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoCopy over the file from the current FreeRADIUS.
Guy Harris [Mon, 29 May 2017 21:21:50 +0000 (14:21 -0700)]
Copy over the file from the current FreeRADIUS.

That adds the FreeRADIUS copyright notice.

Change-Id: Id6e05214a59b0fcf31e2c0f5ccd4a31632c08459
Reviewed-on: https://code.wireshark.org/review/21791
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoRADIUS: sync with FreeRADIUS
Alexis La Goutte [Mon, 29 May 2017 16:57:40 +0000 (18:57 +0200)]
RADIUS: sync with FreeRADIUS

commit 766b61dc2b6a75ce66819891ae4d3dcf2d6954ed
Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Mon May 29 16:56:02 2017 +0000

    dictionary.patton: fix indent

    using ./format.pl

commit 1c0c6d24953203417c18dbc7d02688d990c6d3d4
Author: Brice Schaffner <brice.schaffner@gmail.com>
Date:   Thu May 11 10:05:24 2017 +0000

    Added missing Patton Vendor Attributes

    Added some new Patton Vendor Attributes to the list.
    These attributes are now supported on the newest Patton device running on Trinity software version 3.11.2.

Change-Id: I4e1de392886494418e2e44d7f7a935c96a6f8425
Reviewed-on: https://code.wireshark.org/review/21786
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoGTK: Bugfix not allowing extcap capture filters to be verified.
Michael Mann [Mon, 29 May 2017 15:30:16 +0000 (11:30 -0400)]
GTK: Bugfix not allowing extcap capture filters to be verified.

Matches Id45052f21ebb290bf92c201370584156a65f2e19

Change-Id: I2b097d176ec3ce0637af95d66d2f58b834c79ea2
Reviewed-on: https://code.wireshark.org/review/21783
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoFix up dissector tables' UI names.
Jeff Morriss [Sat, 7 Jan 2017 02:49:50 +0000 (21:49 -0500)]
Fix up dissector tables' UI names.

This was inspired by using the Decode-As UI to decode Field "SSL TCP Dissector"
Value (port) XXX as YYY.  "SSL Port" makes more sense as the UI name.

Change-Id: Id6398a5dc79e32bddc4f1bfcf0a468ae1364808f
Reviewed-on: https://code.wireshark.org/review/19573
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoExtend display filter len() to support all string and byte field types.
Michael Mann [Sun, 28 May 2017 12:55:15 +0000 (08:55 -0400)]
Extend display filter len() to support all string and byte field types.

len() can now handle FT_STRING, FT_STRINGZ, FT_STRINGZPAD,
FT_UINT_STRING, FT_BYTES, and FT_UINT_BYTES
through the use of fvalue_length()

Change-Id: I53baf2657f7804f64e63e4645d0b84b782ae9b08
Reviewed-on: https://code.wireshark.org/review/21775
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoQt: Fix capture filter verification for non-extcap interfaces.
Stig Bjørlykke [Mon, 29 May 2017 06:51:30 +0000 (08:51 +0200)]
Qt: Fix capture filter verification for non-extcap interfaces.

Change-Id: Id45052f21ebb290bf92c201370584156a65f2e19
Reviewed-on: https://code.wireshark.org/review/21777
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>
6 years agoUpdate some comments.
Guy Harris [Mon, 29 May 2017 03:12:16 +0000 (20:12 -0700)]
Update some comments.

We're no longer commenting out dictionary.rfc6929 or dictionary.rfc6930,
as we now support those extensions.

Make other comments more closely resemble the tip of the master branch
in FreeRADIUS.

Change-Id: I19144bc6c6ff478d6637bf9679df2c737db82186
Reviewed-on: https://code.wireshark.org/review/21779
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agopacket-mq: Handle MQV902
Robert Grange [Wed, 24 May 2017 15:04:05 +0000 (17:04 +0200)]
packet-mq: Handle MQV902

Add various new defines for WMQ902

Change-Id: I2000f35a01e484d2e4665d1fe4a91a74f6c33236
Reviewed-on: https://code.wireshark.org/review/21747
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoGTK+Qt: Show Osmux Packet Counter on Telephony menu
Pau Espin Pedrol [Tue, 9 May 2017 12:04:18 +0000 (14:04 +0200)]
GTK+Qt: Show Osmux Packet Counter on Telephony menu

Change-Id: I565b0d2d43dd98781f77a302a20bd841e3e4650e
Reviewed-on: https://code.wireshark.org/review/21598
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>
6 years agoFixup support of BASE_UNIT_STRING for 64 bit based integer fields
Jim Young [Sun, 28 May 2017 06:11:46 +0000 (01:11 -0500)]
Fixup support of BASE_UNIT_STRING for 64 bit based integer fields

proto.c’s proto_custom_set() was missing a test for
BASE_UNIT_STRING under the 64 bit based integer case.  Any
custom columns sourced from a field stored in a 64 bit integer
and having the BASE_UNIT_STRING attribute would only display the
units but not the actual number.

With this patch 64 bit based integer fields having the
BASE_UNIT_STRING attribute will now properly display both
their value and units when added to the packet list as a
custom column.

Change-Id: Icb9532771eb2f4098891dedd82886fd6223ce7a6
Reviewed-on: https://code.wireshark.org/review/21771
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
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>
6 years agoproto_tree_add_bytes_format[_value] can handle NULL trees
Michael Mann [Fri, 26 May 2017 13:03:25 +0000 (09:03 -0400)]
proto_tree_add_bytes_format[_value] can handle NULL trees

v2.3.0rc0-3618-gd962e7ae71 tried to simplify logic, but missed
use of TRY_TO_FAKE_THIS_REPR.  Create a "friendlier" version
TRY_TO_FAKE_THIS_REPR_NESTED which allows for the "base"
proto_tree_add_xxx to be called in proto_tree_add_xxx_format[_value]
functions.

Bug: 13736
Change-Id: I98883ad4581d2327edb8da5efd8ef8a89b55e3d0
Reviewed-on: https://code.wireshark.org/review/21764
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoRADIUS: Add Vendor ID, Vendor Type and Vendor Length fields
João Valverde [Thu, 25 May 2017 18:11:46 +0000 (19:11 +0100)]
RADIUS: Add Vendor ID, Vendor Type and Vendor Length fields

Change-Id: I241bfb5d77374d8dd1428fb550d9e913a2d3570a
Reviewed-on: https://code.wireshark.org/review/21756
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoproto.c : fix indent
Alexis La Goutte [Sun, 28 May 2017 14:10:04 +0000 (16:10 +0200)]
proto.c : fix indent

Change-Id: Ib2f9b7bee59d6fa60972df7adf7caaaf9921d975
Reviewed-on: https://code.wireshark.org/review/21776
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agocql: Dump row results
Benoît Canet [Sun, 7 May 2017 12:01:18 +0000 (14:01 +0200)]
cql: Dump row results

Bug: 13709
Change-Id: If96e947e14d5bd0ccdc52bf0b618f34c64dd6780
Signed-off-by: Benoît Canet <benoit@scylladb.com>
Reviewed-on: https://code.wireshark.org/review/21637
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years ago[Automatic update for 2017-05-28]
Gerald Combs [Sun, 28 May 2017 08:14:20 +0000 (08:14 +0000)]
[Automatic update for 2017-05-28]

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

Change-Id: Iac064b8029219fcd67a92db28a3209659113a978
Reviewed-on: https://code.wireshark.org/review/21772
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoList all plugin files for static build
Jaap Keuter [Thu, 18 May 2017 19:41:30 +0000 (21:41 +0200)]
List all plugin files for static build

The automake file has a list of plugin files used to support static
builds. This list should be consistent with the files in the tree.
This change aligns the list with the current plugin files.

Change-Id: I463a4dbf21651b1a8917049b5a705a93c0744591
Reviewed-on: https://code.wireshark.org/review/21698
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoLAPDm: Support the LAPDm B4 Frame Format
Harald Welte [Fri, 26 May 2017 19:44:08 +0000 (21:44 +0200)]
LAPDm: Support the LAPDm B4 Frame Format

The B4 Frame Format is used on the downlink SACCH and has no length
field.

While the comment on top of packet-lapdm.c claimed ever since its
introduction in 2009 that B4 was a supported format, in fact it was not
supported yet.  This patch makes handling the length field conditional
to a frame format that has a length field, and introduces lapdm_data_t
that can be passed using call_dissector_with_data().

The GSMTAP dissector is updated to use this mechanism to specify the
frame format based on the channel type.

Change-Id: I52cb1cedbc8c7baf65e70d3e050e8932573647aa
Reviewed-on: https://code.wireshark.org/review/21767
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoQt: About dialog fails when configured without plugins
Jaap Keuter [Fri, 26 May 2017 21:58:07 +0000 (23:58 +0200)]
Qt: About dialog fails when configured without plugins

The about dialog compilation fails when plugins and LUA are disabled.
Add the missing preprocessor statements.
Also make the plugin tab really empty when there's nothing to report.

Change-Id: Idba0dc86e7110e56b2d949f517c966a121d28e47
Reviewed-on: https://code.wireshark.org/review/21768
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoReport syntax errors in UAT prefs parsing
Peter Wu [Wed, 24 May 2017 22:28:45 +0000 (00:28 +0200)]
Report syntax errors in UAT prefs parsing

Add the cause for a syntax error while parsing UATs. Example output:

    $ tshark -ouat:ssl_keys:,
    tshark: Invalid -o flag "uat:ssl_keys:,": ssl_keys:1: No IP address given.
    $ tshark -ouat:unknown:,
    tshark: Invalid -o flag "uat:unknown:,": Unknown preference

Change-Id: I549406c4e31a81d29f487ef47bdb3c22da084947
Reviewed-on: https://code.wireshark.org/review/21748
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Reviewed-by: Michael Mann <mmann78@netscape.net>