metze/wireshark/wip.git
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 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>
2 years agoWSUG: Add a TCP Analysis section.
Gerald Combs [Wed, 24 May 2017 22:37:03 +0000 (15:37 -0700)]
WSUG: Add a TCP Analysis section.

Try to document as accurately as possible the circumstances under which
each TCP analysis flag is added.

Update some TCP debugging code.

Change-Id: I793756f73b8ade328e150acf32bc203792e29449
Reviewed-on: https://code.wireshark.org/review/21749
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2 years agoModbus: Add dissection of each bit for holding coils and discrete inputs
Graham Bloice [Thu, 25 May 2017 22:00:32 +0000 (23:00 +0100)]
Modbus: Add dissection of each bit for holding coils and discrete inputs

Bug: 13734
Change-Id: Ifd89bc1055edd7c123395ce0511594fc88d151a2
Reviewed-on: https://code.wireshark.org/review/21759
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoAdded IEEE CID support to the make-manuf script. These prefixes are commonly used...
Brandon Enochs [Mon, 22 May 2017 23:53:25 +0000 (19:53 -0400)]
Added IEEE CID support to the make-manuf script.  These prefixes are commonly used in IEEE 802.11 MAC address randomization.

Change-Id: I94ed29d31c81df0e4f514d7c354073182c116f75
Reviewed-on: https://code.wireshark.org/review/21737
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoGTK: Don't allow extcap capture filters to be verified.
Michael Mann [Thu, 25 May 2017 19:27:18 +0000 (15:27 -0400)]
GTK: Don't allow extcap capture filters to be verified.

There isn't an API to do it and if WinPcap isn't present it can
cause a crash.

Change-Id: I5338f854acb26f0822ac027e6c853a550da3f7b1
Reviewed-on: https://code.wireshark.org/review/21758
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoDon't try to compile capture filter if pcap_compile isn't available.
Michael Mann [Thu, 25 May 2017 18:36:44 +0000 (14:36 -0400)]
Don't try to compile capture filter if pcap_compile isn't available.

This is most likely due to WinPcap not being installed.

Bug: 13672
Change-Id: Ic7069f98c7f8068cdc5045204c2e23ab56b3f7eb
Reviewed-on: https://code.wireshark.org/review/21757
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoFP - Fixed bug in heur PCH dissector
DarienSpencer65 [Thu, 25 May 2017 16:24:51 +0000 (19:24 +0300)]
FP - Fixed bug in heur PCH dissector

Calculated length in bits ( * 8 ) then checked as bytes

Change-Id: Ic9ef94bcdce40fc6463bf472d1e3a4a3cf05b1ba
Reviewed-on: https://code.wireshark.org/review/21755
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2 years agocheckAPIs.pl: Add check to make sure tvb_get_ function isn't used in proto_tree_add_xxx
Michael Mann [Tue, 16 May 2017 13:07:17 +0000 (09:07 -0400)]
checkAPIs.pl: Add check to make sure tvb_get_ function isn't used in proto_tree_add_xxx

Check for situations for things like proto_tree_add_uint, where the "uint" passed
is a call to tvb_get_ntohl().  For that, proto_tree_add_item should be used.

Change-Id: Ibe14678bd66b05f612b125ca289f671c499a2990
Reviewed-on: https://code.wireshark.org/review/21685
Petri-Dish: Anders Broman <a.broman58@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>
2 years agopacket-lpp.c: Create temporary variables for some proto_tree_add_uint calculations.
Michael Mann [Wed, 24 May 2017 13:03:17 +0000 (09:03 -0400)]
packet-lpp.c: Create temporary variables for some proto_tree_add_uint calculations.

Pacify checkAPIs.pl

Change-Id: I03be9eaa4f47df48d8809d205997ee4db47707b7
Reviewed-on: https://code.wireshark.org/review/21743
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agopacket-lte-rrc.c: Create temporary variables for some proto_tree_add_uint calculations.
Michael Mann [Wed, 24 May 2017 13:14:18 +0000 (09:14 -0400)]
packet-lte-rrc.c: Create temporary variables for some proto_tree_add_uint calculations.

Pacify checkAPIs.pl

Change-Id: I1801bd92aeb34e3e3240b15cef024718062852d7
Reviewed-on: https://code.wireshark.org/review/21744
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoumts_fp: Fix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Thu, 25 May 2017 09:14:51 +0000 (11:14 +0200)]
umts_fp: Fix Dereference of null pointer found by Clang analyzer

Change-Id: I9b35429d7599c95e0231cec835ac3cd1fca6b06b
Reviewed-on: https://code.wireshark.org/review/21752
Reviewed-by: sswsdev <sswsdev@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoumts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Thu, 25 May 2017 09:06:53 +0000 (11:06 +0200)]
umts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ia3f467e7cbec0a253da42b4d549de75330c91366
Reviewed-on: https://code.wireshark.org/review/21751
Reviewed-by: sswsdev <sswsdev@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoRADIUS: Add support for extended attributes (RFC 6929)
João Valverde [Fri, 19 May 2017 23:27:01 +0000 (00:27 +0100)]
RADIUS: Add support for extended attributes (RFC 6929)

Bug: 13176
Change-Id: I22cdce01d8e7d5b69c2013684a98a9a48acc0d13
Reviewed-on: https://code.wireshark.org/review/21727
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>
2 years agoicq: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Thu, 25 May 2017 09:16:12 +0000 (11:16 +0200)]
icq: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ic009ea5bce2f349ede407e0bed3a8640262433d2
Reviewed-on: https://code.wireshark.org/review/21753
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>
2 years agoSimplify proto_tree_add_bytes_format[_value]
Michael Mann [Thu, 25 May 2017 03:20:54 +0000 (23:20 -0400)]
Simplify proto_tree_add_bytes_format[_value]

Call proto_tree_add_bytes first so it can do all of the basic
field checks that were being duplicated.

Change-Id: Idc9a3cbf9498aa612a39cc80e3381eba52ce9fa4
Reviewed-on: https://code.wireshark.org/review/21750
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agopacket-icq.c: Use more FT_UINT_STRING
Michael Mann [Wed, 24 May 2017 14:30:01 +0000 (10:30 -0400)]
packet-icq.c: Use more FT_UINT_STRING

Makes it simpler than proto_tree_add_string + tvb_get_string_enc combo.

Change-Id: Id25d1cc1ed727a6211d9ce113d54dd29c9bbdfcb
Reviewed-on: https://code.wireshark.org/review/21745
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agopacket-gsm_a_rr.c: proto_tree_add_uint -> proto_tree_add_bits_item
Michael Mann [Wed, 24 May 2017 14:45:19 +0000 (10:45 -0400)]
packet-gsm_a_rr.c: proto_tree_add_uint -> proto_tree_add_bits_item

Change-Id: Iacf9328ddaa51f9459fd19752bcde70d9312e425
Reviewed-on: https://code.wireshark.org/review/21746
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: Michael Mann <mmann78@netscape.net>
2 years agoNBAP: Create E-DCH channel info
DarienSpencer65 [Wed, 24 May 2017 12:12:05 +0000 (15:12 +0300)]
NBAP: Create E-DCH channel info

Adding missing creation and insertion of the E-DCH channel
info the the FP conversation info struct

Change-Id: Ic7dfb5b9579133ff84b2fc4fff73a3560055dcca
Reviewed-on: https://code.wireshark.org/review/21742
Reviewed-by: S. Shapira <sswsdev@gmail.com>
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>
2 years agoSMB2: set session server port in partial capture
Aurelien Aptel [Tue, 23 May 2017 16:58:36 +0000 (18:58 +0200)]
SMB2: set session server port in partial capture

When dissecting a capture that does not have a session setup exchange,
assume tree connect response packets are coming from the server and set
the port accordingly.

This is needed for decryption because the decryption key is different
depending on which side the message was created on. We need to set the
server port to know if a packet was made on the server.

Change-Id: I80229ed6d69821bc0c76808e57bdb2fc53fcceb3
Reviewed-on: https://code.wireshark.org/review/21741
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>
2 years ago[RANAP] Pretify info column.
AndersBroman [Tue, 23 May 2017 13:09:49 +0000 (15:09 +0200)]
[RANAP] Pretify info column.

Change-Id: I7f1832cd818d76843e00b689883e28ed46633585
Reviewed-on: https://code.wireshark.org/review/21739
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoRevert "Fix issue with dissecting multiple DT1 packets in the frame"
Anders Broman [Tue, 23 May 2017 10:56:03 +0000 (10:56 +0000)]
Revert "Fix issue with dissecting multiple DT1 packets in the frame"

Bug: 13651
This reverts commit daefa86695ecb6f859615ccd1bee6269e2c568a5.

Change-Id: I50eee7ae99bc471d95365a8da0271188d826ac46
Reviewed-on: https://code.wireshark.org/review/21738
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoUMTS FP: Fixed heuristic FACH dissector
sswsdev [Mon, 22 May 2017 14:57:58 +0000 (17:57 +0300)]
UMTS FP: Fixed heuristic FACH dissector

Dissector was not adding the correct TB size & TB count to the conversation
info for the longer RACH variant (52 bytes long)

Change-Id: Iace894929684af3e0eb9804cbc57cdc169f136a9
Reviewed-on: https://code.wireshark.org/review/21736
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>
2 years agoZigBee: Add attribute and command names from Events cluster
Kenneth Soerensen [Mon, 15 May 2017 12:08:46 +0000 (14:08 +0200)]
ZigBee: Add attribute and command names from Events cluster

Bug: 13360
Change-Id: Ie6c5cb4d592490716204ff56dea11e92e071f740
Reviewed-on: https://code.wireshark.org/review/21662
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>
2 years ago[RANAP] Update to 3GPP TS 25.413 V14.0.0 (2017-03)
AndersBroman [Mon, 22 May 2017 13:09:13 +0000 (15:09 +0200)]
[RANAP] Update to 3GPP TS 25.413 V14.0.0 (2017-03)

Change-Id: I5d448a4daf438b05a30473e999574803e5d6ade9
Reviewed-on: https://code.wireshark.org/review/21730
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: Michael Mann <mmann78@netscape.net>
2 years agopacket-dccp.c: Don't use tvb_get_ptr for getting a uint number.
Michael Mann [Sun, 21 May 2017 12:12:15 +0000 (08:12 -0400)]
packet-dccp.c: Don't use tvb_get_ptr for getting a uint number.

Use the tvb_get_ntohXXX instead.

Change-Id: I8d5c6ac2f2c8b1ac9237297f06709513fc2c9113
Reviewed-on: https://code.wireshark.org/review/21733
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agopacket-h261.c: Use proto_tree_add_item
Michael Mann [Sun, 21 May 2017 11:39:32 +0000 (07:39 -0400)]
packet-h261.c: Use proto_tree_add_item

Change-Id: Ifbb69d0bd2a71c4dd022c6dbae2ed84c2bf5f912
Reviewed-on: https://code.wireshark.org/review/21732
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agopacket-rfc2190.c: Use proto_tree_add_item instead of proto_tree_add_xxx.
Michael Mann [Fri, 19 May 2017 23:00:19 +0000 (19:00 -0400)]
packet-rfc2190.c: Use proto_tree_add_item instead of proto_tree_add_xxx.

Use hf_ fields with bitmasks instead of manually computing bits.

Change-Id: I342ac9288155647fc6600223f892513bab351a7c
Reviewed-on: https://code.wireshark.org/review/21731
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agopacket-megaco.c: Rename my_proto_tree_add_string -> megaco_tree_add_string.
Michael Mann [Mon, 22 May 2017 13:25:58 +0000 (09:25 -0400)]
packet-megaco.c: Rename my_proto_tree_add_string -> megaco_tree_add_string.

It can trip up some of the check*.pl scripts and makes it clearer it's
very megaco specific.

Change-Id: Idb8ee104f59e07d5cfabd7aaedf23f915fad51b3
Reviewed-on: https://code.wireshark.org/review/21734
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoCreate temporary variables for some proto_tree_add_<datatype> calculations.
Michael Mann [Mon, 22 May 2017 13:27:33 +0000 (09:27 -0400)]
Create temporary variables for some proto_tree_add_<datatype> calculations.

checkAPIs.pl doesn't like tvb_get_* parameters because it thinks
proto_tree_add_item should be used.  This is just to pacify the check.

Change-Id: I2df1233fe8c7976c257197079c06d24e472303b5
Reviewed-on: https://code.wireshark.org/review/21735
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agodnp3: fix parser when a packed variation is used with prefix value qualifier
Eric Wetzel [Thu, 18 May 2017 02:17:30 +0000 (22:17 -0400)]
dnp3: fix parser when a packed variation is used with prefix value qualifier

Bug: 13733
Change-Id: I4d490793b54816e731d72bf1317d3779a05ae011
Reviewed-on: https://code.wireshark.org/review/21722
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2 years ago[Automatic update for 2017-05-21]
Gerald Combs [Sun, 21 May 2017 08:15:09 +0000 (08:15 +0000)]
[Automatic update for 2017-05-21]

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

Change-Id: I4a0774a6aa3ecb101b7ca0a87571544dc936012d
Reviewed-on: https://code.wireshark.org/review/21723
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2 years agoQUIC: fix some indent issue
Alexis La Goutte [Sat, 20 May 2017 14:51:32 +0000 (16:51 +0200)]
QUIC: fix some indent issue

Change-Id: If259cb4c37b10aca9f5b8e16f409acc8412f0622
Reviewed-on: https://code.wireshark.org/review/21719
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoRevert "Change exports from Q.932 to use VALS_WITH_TABLE in the same way as QSIG"
Pascal Quantin [Sat, 20 May 2017 17:00:24 +0000 (19:00 +0200)]
Revert "Change exports from Q.932 to use VALS_WITH_TABLE in the same way as QSIG"

This reverts commit d3b72329359103f298e4f633b8c83fe2ce3c7517.

Revert "Fix debian symbols check after Q.932 symbols removal"

This reverts commit 3bc43e377076d1097321e2f7ffc89f52ee33afa0.

Change-Id: Ib0623ab289613f48c73d38d038131a69cbf2190b
Reviewed-on: https://code.wireshark.org/review/21720
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2 years agoIf we don't have an ARUUID, don't use it as if we do.
Guy Harris [Sat, 20 May 2017 17:54:40 +0000 (10:54 -0700)]
If we don't have an ARUUID, don't use it as if we do.

Don't use random on-the-stack data as a UUID.

Change-Id: I77961e1404ad73a484a7fc865bc54219dc239b4d
Reviewed-on: https://code.wireshark.org/review/21721
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2 years agoUMTS FP: Refactored FP Conversation Info struct
sswsdev [Fri, 19 May 2017 09:28:36 +0000 (12:28 +0300)]
UMTS FP: Refactored FP Conversation Info struct

Moved some fields which are only relevant to HS-DSCH / E-DCH  channel into appropriate 'channel specific' structs.
Also renamed "dchs_in_flow_list" to  "dch_ids_in_flow_list"

Change-Id: I7bdeb74c7b1eda0872c0243f0e5f229df2691866
Reviewed-on: https://code.wireshark.org/review/21707
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoShow structures as FT_NONE, not FT_STRING.
Guy Harris [Sat, 20 May 2017 01:29:31 +0000 (18:29 -0700)]
Show structures as FT_NONE, not FT_STRING.

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