fix the interface list in the main welcome screen

when no interfaces are available at startup, the number of columns in
the interface tree is set to 1
when new interfaces become available later, the column number is not
reset to the default value and we end up with an interface list whose
entries are not visible
reset the number of columns each time the interface list is updated

Change-Id: I267c5b47da6d5ae9e7769b1036622f79da4d97f2
Reviewed-on: https://code.wireshark.org/review/8996
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Remove a bunch of deprecated tvb_length calls

Change-Id: I9362e0fdc4519ba5f3d656152966e7030f478839
Reviewed-on: https://code.wireshark.org/review/9022
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>

checkAPIs.pl: proto_tree_add_bytes_item takes an encoding parameter

Change-Id: Iebe0e2483d9fd1661bf87ea5efaeb4ae14f6e105
Reviewed-on: https://code.wireshark.org/review/9027
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

NCP: fix comma at end of enumerator list [-Wpedantic]

Change-Id: I47795fb9e1044f4319721c3bf1208c269a4b9c34
Reviewed-on: https://code.wireshark.org/review/9023
Reviewed-by: Michael Mann <mmann78@netscape.net>

ws80211_utils.h: fix empty paragraph passed to '@param' command [-Wdocumentation]

Change-Id: Iecd9f8820840959a2f226120cbc359977d20c757
Reviewed-on: https://code.wireshark.org/review/9009
Reviewed-by: Evan Huus <eapache@gmail.com>

PKCS12: Remove from ASN1 DIRTY list

Change-Id: I454c48d5342ebe5682217667e4cafd6164e58d41
Reviewed-on: https://code.wireshark.org/review/9004
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>

PKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]

Change-Id: Iaaaaffc8a271ac844b745d1b9265eb06df2efe9c
Reviewed-on: https://code.wireshark.org/review/9003
Reviewed-by: Evan Huus <eapache@gmail.com>

Add a strlen cast.

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

Refactor RTD stats.

Very similar to the refactoring of SRT stats, it provides more commonality of the stats for all GUI interfaces.  Currently implemented for TShark and GTK.  Affected dissectors: MEGACO, MGCP, Radius

Change-Id: Icb73a7e603dc3502b39bf696227fcaae37d4ed21
Reviewed-on: https://code.wireshark.org/review/8998
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>

Fix make distcheck buildbot

packet-dnp.c:2735:28: error: variable 'al_filename' set but not used [-Werror=unused-but-set-variable]
packet-dnp.c:1843:32: error: variable 'al_filename_offs' set but not used [-Werror=unused-but-set-variable]

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

[pcep] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for certain multibyte fields.

Change-Id: Idc31728ce1b327ff86a58541ba01275107c7598b
Reviewed-on: https://code.wireshark.org/review/9019
Reviewed-by: Bill Meier <wmeier@newsguy.com>

[rfid-pn532] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for several 3-byte fields.

Change-Id: If70a45d59fdce105b429d00fbbc4a8b2784262a2
Reviewed-on: https://code.wireshark.org/review/9018
Reviewed-by: Bill Meier <wmeier@newsguy.com>

service_response_time_table.h: fix parameter 'gui_data' not found in the function declaration [-Wdocumentation]

Change-Id: Ie214d654aa91b91da2a1435dce63a822e404669a
Reviewed-on: https://code.wireshark.org/review/9010
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix typo caused assertion

Invalid character ')' in filter name 'gsm_abis_rsl.llsdu.sacch)'
**
ERROR:wireshark/epan/wmem/wmem_core.c:50:wmem_alloc: assertion failed: (allocator->in_scope)
Aborted

Change-Id: Ie22035cf9a9d1d29354a64cd5b085f1c2e18b1d3
Reviewed-on: https://code.wireshark.org/review/9017
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

GSM MAP: Fix decoding of IPv6 addresses

From 3GPP 23.003

The GSN Address is composed of the following elements:
1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the
Address field.
2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field.
3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address.
Address Type 0 and Address Length 4 are used when Address is an IPv4 address.
Address Type 1 and Address Length 16 are used when Address is an IPv6 address.
The IP v4 address structure is defined in RFC 791 [14].
The IP v6 address structure is defined in RFC 2373 [15].

Currently the Wireshark decodes IPv6 addresses as IPv4

This commit reverts parts of commit 1cdef1d98aac306932dc599d427a3e1191d48a44

Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444
Reviewed-on: https://code.wireshark.org/review/8984
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Eliminate proto_tree_add_text from some dissectors.

Change-Id: I979990e9385182870ce4809a7e6fa16e598cb2be
Reviewed-on: https://code.wireshark.org/review/9016
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Convert "macro checks" to use expert info in line with dissectors with comparable checks.

Change-Id: I30affba4941ba150c34541bfba67ff8da5b52a17
Reviewed-on: https://code.wireshark.org/review/9015
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[bmp] minor cleanup

- Simplify some code;
- Remove unneeded initializers;
- Remove some unused code;

Change-Id: I30b6a7751845670b732eae8ec143cd23e57fc54c
Reviewed-on: https://code.wireshark.org/review/9014
Reviewed-by: Bill Meier <wmeier@newsguy.com>

PKCS12: fix warning about unused parameter when don't build with LIBGCRYPT

Change-Id: I7cc47f811d6c090aa2be54d3d92361966d011ccd
Reviewed-on: https://code.wireshark.org/review/9002
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove deprecated tvb_length from a bunch of dissectors

Change-Id: I5c777806cb1403062a9d85261149d722df57b239
Reviewed-on: https://code.wireshark.org/review/9005
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix memory leak printing eui64s

The scope that is passed in should only be used for the return value - other
temporary buffers we must alloc/free ourselves, since if the scope is NULL they
will not be managed automatically.

Bug: 11293
Change-Id: I27be856f1c5cdf47f78e766192a29523664a543e
Reviewed-on: https://code.wireshark.org/review/9007
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

ERM (Aruba): Fix Assigned value is garbage or undefined found by Clang Analyzer

Fix also trailing whitespace

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

[Automatic update for 2015-06-21]

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

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

editcap: split usage output so won't wrap in cmd.exe window

Change-Id: I8a8ed3721e525ceb685f8e105147a0cc012fc912
Reviewed-on: https://code.wireshark.org/review/9001
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

Remove now unneeded tap-srt.h

Change-Id: Ic625f5a0f8e3c4d70dd04f5e3eb7100fb54027e5
Reviewed-on: https://code.wireshark.org/review/8997
Reviewed-by: Michael Mann <mmann78@netscape.net>

editcap: trivial changes while looking into the -L option

Change-Id: I94dd83af160eebb9dc44c123b2b83674bc5866f6
Reviewed-on: https://code.wireshark.org/review/9000
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

srt_table: fix conversion shortens 64-bit value into a 32-bit value

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

Further refactor SRT stats.

Create "common" SRT tap data collection intended for all GUIs.   Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK.

SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic.
CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone.

Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc
Reviewed-on: https://code.wireshark.org/review/8894
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Call the "802.11 radio information" dissector for radio headers.

Have dissectors of various forms of radio information headers in the
packets fill in a struct ieee_802_11_phdr with radio information as
appropriate, and call the "802.11 radio information" dissector rather
than the raw 802.11 dissector.

This means that the radio information can be found in a
protocol-independent and encapsulation-independent form when you're
looking at the packet; that information can be presented in a form
somewhat easier to read than the raw metadata header format.

It also enables having a single "radio information" tap that allows
statistics to handle all different sorts of radio information
encapsulation.

In addition, it lets us clean up some of the arguments passed to the
common 802.11 dissector routine, by having it pull that information from
the struct ieee_802_11_phdr.

Ensure that the right structure gets passed to that routine, and that
all the appropriate parts of that structure are filled in.

Rename the 802.11 radio protocol to "wlan_radio", rather than just
"radio", as it's 802.11-specific.  Give all its fields "wlan_radio."
names rather than "wlan." names.

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

(trivial) fix a spelling mistake in a comment

Change-Id: I3f9feab57032c8c701c4ea487c0f5acca428d5d9
Reviewed-on: https://code.wireshark.org/review/8995
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

[mifare] make the payload of the write command filterable

use an FT_BYTES variable instead of passing it to the data dissector

Change-Id: Ia52cba24dedec13c9842109d45b3a277ee627f42
Reviewed-on: https://code.wireshark.org/review/8994
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

[mifare] minor cleanup

remove the if(tree) so that we fill the info column regardless of the tree
clear the info column first, then append our data
remove an unnecessary initializer

Change-Id: I0e9e9582f360dd929e422f994c3d4a644c602642
Reviewed-on: https://code.wireshark.org/review/8993
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

Use "Present"/"Absent" for presence bits.

That's clearer than "True"/"False".

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

Support the "number of extension spatial streams" information.

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

ftypes: display BASE_HEX_DEC integers as hexadecimal

Bug: 11292
Change-Id: I69a5591996bec77c2cb2bfcd04e9179784470edf
Reviewed-on: https://code.wireshark.org/review/8987
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>

qt_ui_utils: fix  parameter 'glib_string' not found in the function declaration

Only a small typo glib_string => glib_gstring

Change-Id: Ia3ad0a8086f6c1a47065754dee33eff1e0ad770f
Reviewed-on: https://code.wireshark.org/review/8988
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[rpcrdma] Do some minor bug-fixes and cleanup

Change-Id: I9d440cba281945672767642967d955351fa67b90
Reviewed-on: https://code.wireshark.org/review/8985
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Bill Meier <wmeier@newsguy.com>

[rtse] Convert tabs to spaces to match editor modelines

Change-Id: I03c7decacd4def0552f461c81c4e634a85380438
Reviewed-on: https://code.wireshark.org/review/8986
Reviewed-by: Bill Meier <wmeier@newsguy.com>

[thrift] fix a minor bug; Also: use col_clear()

Change-Id: I07dc57583f2e78b6b841a7adb5470e57fa314786
Reviewed-on: https://code.wireshark.org/review/8969
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Improved dissection of some netlink attributes

Added missing strings to netlink_route_ifla_attr_vals
Improved dissection of netlink.hdr_flags
Replaced deprecated use of tvb_length_remaining

Change-Id: Ie16f7e602e1fb69a0a88a4d0657ec2d6da3c0d83
Reviewed-on: https://code.wireshark.org/review/8916
Reviewed-by: Anders Broman <a.broman58@gmail.com>

recent.c: accept an UTF-8 string in read_set_recent_pair_dynamic() function

Previous code was checking that the string was ASCII, which does not work when
the recent capture files list contains non ASCII characters

Change-Id: I1ea96035cca4b2aa2ea5061e7a4f98e78ac88f20
Reviewed-on: https://code.wireshark.org/review/8965
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Bluetooth: Coverity fixes

Try to fix Coverity issues in Bluetooth HCI and androiddump.

Change-Id: Id2ed35130eb4dbb0698b7a54afccdba56af62bfd
Reviewed-on: https://code.wireshark.org/review/8983
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

Qt: remove some compilation warnings

Change-Id: If14d6b46cfb3d42798afdaa0721f9892af93fddc
Reviewed-on: https://code.wireshark.org/review/8981
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Pass the 802.11 pseudo-header as an argument.

Rather than accessing it through pinfo->pseudo_header, have it passed as
an argument.

This means we no longer tweak the pseudo-header filled in by libwiretap,
but instead construct our own pseudo-header, which is a bit cleaner.

It also opens up the possibility of other dissectors passing radio
information down to the 802.11 dissector, so it can display it in a
better-organized format than the raw metadata headers for
radiotap/PPI/Prism/AVS/etc., and having some of the options for 802.11
dissection (Atheros padding, Centrino stuff, etc.) also passed in
through that pseudo-header so we have fewer arguments to
dissect_ieee80211_common().

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

1.99.7 → 1.99.8

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

Build 1.99.7.

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

Add ExtremeNetworks attribute 213 (and the source of the information)

Change-Id: I2fe561eef38ecc31693270b527af1f42ef564734
Reviewed-on: https://code.wireshark.org/review/8977
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Bluetooth: ensure to give bluetooth_data structure to dissect_eir_ad_data()

Bug: 11285
Change-Id: I1d3a4900fe3daec6f8d7596a9925322063f2c4eb
Reviewed-on: https://code.wireshark.org/review/8976
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

[aeron] Remove unneeded initializers

Change-Id: Ifa129c221b5df9120a0c475edc2109775f84ae35
Reviewed-on: https://code.wireshark.org/review/8974
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Bill Meier <wmeier@newsguy.com>

Asterix: field array must be NULL terminated

Bug: 11287
Change-Id: Iffcaa1cd2663768f616aedb550a101b7196e456b
Reviewed-on: https://code.wireshark.org/review/8975
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Add possibility to export Logcat Text PDUs

Enable exporting PDUs from Logcat Text, so they can be saved as pcapng.

Change-Id: I413055d7706d245525609a9a4cbe9e02e8d99a0f
Reviewed-on: https://code.wireshark.org/review/8904
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

BTLE: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I818ba409a01b2ae2701d22f97340183df42cd075
Reviewed-on: https://code.wireshark.org/review/8962
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>

Get rid of unnecessary stuff copied-and-pasted from the radiotap dissector.

What the dissector calls "radiotap" isn't even remotely like radiotap.
It took some flags from radiotap, but that's it.

Make the names of the flags in question match what's in the libwiretap
code.  Get rid of everything not in the libwiretap code, and get rid of
all code that does anything if those flags are set or that puts them
into the protocol tree.

This means that we don't do anything with the FCS or the Atheros
padding; just call the "802.11 with no FCS" dissector.

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

Get rid of some unused members of struct ieee_802_11_phdr.

Remove some unused members, and move the presence flags after the
should-always-be-set fields, right before the fields to which it
applies.

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

The STBC subfield of the radiotap MCS field is a count, not a flag.

It's a 2-bit field that is the "number of STBC streams", according to
the radiotap Web site item for the MCS field:

http://www.radiotap.org/defined-fields/MCS

Correctly label both the FCS type and STBC stream count fields.

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

[c15ch] Trivial: Remove unneeded #include

Change-Id: I07db4f6e7dda81f3be1b828d42c08c385b6e8e27
Reviewed-on: https://code.wireshark.org/review/8968
Reviewed-by: Bill Meier <wmeier@newsguy.com>

Add frequency_utils.

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

Add a preferences editor frame.

This replaces the single preference editor dialog in the GTK+ UI.

Change-Id: I10e030981e9f7d1ec121811593586b65cf0797c5
Reviewed-on: https://code.wireshark.org/review/8966
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Update the release notes.

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

Qt: fix a crash when closing application under Windows

QCoreApplication visits eldritch horrors upon argv on Windows. Keep a
local copy for our own processing.

---
[ Pascal's original comments ]
g6c4ec4a introduced the use of arg_list_utf_16to8 that triggers a crash on my
computer when freeing the g_allocated memory.
Let's do a similar work but with a memory allocator that does not trigger an exception.

Also fix a memory leak in arg_list_utf_16to8 while we are at it.

Change-Id: I93d899af20b09c9a5d584a46297f715591502df9
Reviewed-on: https://code.wireshark.org/review/8961
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Asterix dissector support for category 021 v2.3

- Add item 040 field LLC
- Add item 200 field ME
- Edit item 271 field LW

Change-Id: I13b3774b248731f208b3b950f7ae0736398edbe4
Reviewed-on: https://code.wireshark.org/review/8892
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Marko Hrastovec <marko.hrastovec@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

[ath] minor cleanup

- Remove unneeded #include;
- Remove unused code;
- Adjust whitespace.

Change-Id: I1a287478e629af26234e97824db091c732168447
Reviewed-on: https://code.wireshark.org/review/8964
Reviewed-by: Bill Meier <wmeier@newsguy.com>

[ocfs2] trivial changes: unneeded initializer; indentation/whitespace

Change-Id: Icef38e94d5c3e9f5598d55c3e988c94b2798f81f
Reviewed-on: https://code.wireshark.org/review/8963
Reviewed-by: Bill Meier <wmeier@newsguy.com>

Profinet: I&M5 Data is added.

This optional attribute allows identifying separately orderable OEM parts used to built the device.
It consists of the following attributes:
Number Of Entries, IM Annotation, Vendor ID, IM Order ID, Serial Number, Hardware Revision, Software Revision

Change-Id: I793f6ecd798f93e7f40e8e1a42e42a7070a4a1c1
Reviewed-on: https://code.wireshark.org/review/8955
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix the Qt main window popup behavior.

By default QMainWindow::createPopupMenu shows a checkable list of
toolbars which aren't synced with our actions under the View menu.
Replace it with a version that handles all the main window widgets.

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

Qt: Add protocol preferences menus.

Add protocol preferences in the packet list and packet detail context
menus. Note that we need a PreferencesEditorFrame in the main window for
editing numeric and string preferences. For now we just show the prefs
dialog.

Change-Id: Ice0cc8e9bc25963cc14aa47698f042f2a73088d8
Reviewed-on: https://code.wireshark.org/review/8957
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Save the wireless toolbar recent settings.

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

Don't include <wsutil/frequency-utils.h> if it's not needed.

Change-Id: I7c958a31681defb5297428fdb77aa43462b2d160
Reviewed-on: https://code.wireshark.org/review/8953
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>

Qt: Make sure we have usable command line arguments.

Call arg_list_utf_16to8 in wireshark-qt.cpp on Windows. Set our default
codec in Qt4 to UTF-8 before doing so.

Bug: 11276
Change-Id: I8e0afb9523ddb5956d30424b7b7ad7f3ea0838c7
Reviewed-on: https://code.wireshark.org/review/8954
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Pass the pseudo-header to wtap_encap dissectors via the "data" argument.

Have the "data" argument to dissectors registered in thw wtap_encap
dissector table point to the pseudo-header for the packet.

Use that argument in the Bluetooth dissector.

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

Disable AirPcap by default in Autotools.

Note that we might want to remove the check entirely.

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

[Qt] Delete generated file config.pri at "clean"

Change-Id: Ia8469a91eebf92bf8349d2507bdfcfdba55da916
Reviewed-on: https://code.wireshark.org/review/8949
Reviewed-by: Anders Broman <a.broman58@gmail.com>

PKCS12: fix a duplicate OID

The value for OID 1.2.840.113549.1.12.1.6 was copy-pasted from the line above.
Its correct definition can be found in  RFC7292, whose relevant parts are in
pkcs12.asn.

Note that the capitalization is not consistent in the RFC (pbeWith/pbewith).
I used the same convention.

Change-Id: I702c2b698660a7ea8df043775d37cadfa6d3ca72
Reviewed-on: https://code.wireshark.org/review/8928
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

TLS Decryption is now possible with a user provided PMS and Client Random values

Bug: 11263
Change-Id: I1476948ed823fc34de2cecdeb1bddafccbb8ec39
Reviewed-on: https://code.wireshark.org/review/8803
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Qt: Remove redundant actions from UI file

Change-Id: Ia571844a2729683ef5f9487fca0aa9d5fd09b235
Reviewed-on: https://code.wireshark.org/review/8948
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>

packet-nfs: For flexfiles the versions is now an array

Change-Id: I1b61f6a91fbd3553106d1a9a8aba56db1894a010
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/8940
Reviewed-by: Anders Broman <a.broman58@gmail.com>

packet-nfs: flexfiles now uses string uid/gid

And no longer uses opaque_auth

Change-Id: I272e1c5c1391dac977ad850b899505a28c42b6fd
Reviewed-on: https://code.wireshark.org/review/8939
Reviewed-by: Anders Broman <a.broman58@gmail.com>

packet-nfs: update to draft 05 of flexfiles xdr

Change-Id: I7a4e99242365a6fd7c0fa81c6bc97cbe01a00763
Reviewed-on: https://code.wireshark.org/review/8938
Reviewed-by: Anders Broman <a.broman58@gmail.com>

packet-nfs: flexfile getdeviceinfo needs to decode rsize/wsize

Change-Id: I67239a7cd1ea63499e5ee1956a2a5ac7b8191f9e
Reviewed-on: https://code.wireshark.org/review/8936
Reviewed-by: Anders Broman <a.broman58@gmail.com>

packet-nfs: flexfile getdeviceinfo support

Change-Id: I7ba0720f4f1dcf15d257d5358226e82b4ee7d2d9
Reviewed-on: https://code.wireshark.org/review/8935
Reviewed-by: Anders Broman <a.broman58@gmail.com>

packet-nfs: flexfile layoutget support

Change-Id: Idd162119b1fdc6747452b9a13ef580705567983e
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/8934
Reviewed-by: Anders Broman <a.broman58@gmail.com>

packet-nfs: switch on layout type for getdeviceinfo

We can only parse file layout ds addrs, treat all other layouts as having
opaque data.

Change-Id: I50892dbdbd6785d8216e2d8725da7bec0c554ee2
Reviewed-on: https://code.wireshark.org/review/8933
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Check for NL and AIRPCAP defines.

This should hopefully fix compilation on OS X.

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

Add the wireless toolbar.

Add the wireless toolbar to the Qt UI.

Start adding AirPcap support to ui/80211_utils. Add FCS validation
routines to ws80211_utils.

Move a bunch of AirPcap routines that require epan from caputils to
ui/gtk. They were required for driver key management, which we'll
leave to the AirPcap Control Panel in the Qt UI.

Move frequency-utils to wsutil.

Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1
Reviewed-on: https://code.wireshark.org/review/8910
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

wtap_encap dissectors don't get passed a media type name as data.

Get rid of stuff probably left over from copying-and-pasting a
lines-of-text dissector that *did* register for a media type.

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

Don't assume we get passed a null data pointer for JSON files.

That assumption will cease to be valid in the future.

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

Clean up whitespace.

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

Clean up handling of metadata in Bluetooth dissectors.

Make the "previous protocol data" union in bluetooth_data_t a
discriminated union, and use the discriminator to decide whether to use
a given member of the union or not (or to check whether the member you
plan to use is valid).

Have separate top-level dissectors depending on what the data type
pointed to by the "data" argument is.

Use that member to point to pseudo-header metadata, and, for now, set it
to point to the appropriate pinfo->pseudo_header value; eventually, we
plan to pass the pseudo-header pointer in as the "data" argument from
the "frame" dissector.

Don't overwrite the pseudo-header in the packetlogger dissector -
construct a new one and pass it in.

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

Accept drop events immediately.

Accept drop events before opening our capture file instead after.

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

Define XXX_phdr structures in the order in which they appear in the union.

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

Move some structures used only in pcap-common.c there.

Those aren't pseudo-headers exported from libwiretap, they're just
structures corresponding to the pseudo-headers for some pcap/pcap-ng
link-layer header types.

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

Fix the CMake windows installer to pickup the locally built zlib1.dll

Change-Id: I8880a760d9817dd038694e96b4a3d9b8d2db3c2c
Reviewed-on: https://code.wireshark.org/review/8931
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>

[vsip] Fix 2 minor bugs; Do some minor cleanup

  Bugs: Incorrect bytes pane highlighting in certain cases.

Change-Id: I6f0fd4e3f7f1599c20524c8715ef831668b7391f
Reviewed-on: https://code.wireshark.org/review/8932
Reviewed-by: Bill Meier <wmeier@newsguy.com>

GTP: put T-PDU Data item under GTP tree

Otherwise it is put in the top tree, which seems a bit surprising (as seen in the attachment for bug 11271)

Change-Id: I0e7f9c89d8ecaeecc3a951893e10154bc11927d3
Reviewed-on: https://code.wireshark.org/review/8927
Reviewed-by: Anders Broman <a.broman58@gmail.com>

TFS: Mutualize Response/Request TFS

move tfs_response_request to epan/tfs.[ch] and use this

Change-Id: I29d5894fade721b5234649a7c2d83dd1d6a19a0d
Reviewed-on: https://code.wireshark.org/review/8930
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Support for MPL
(https://tools.ietf.org/html/draft-ietf-roll-trickle-mcast-12)

Change-Id: Idde0f0ef6c23b4c91f08fed1d5b18c68e8c5cf4e
Reviewed-on: https://code.wireshark.org/review/8885
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Separate Windows CMake compiler definitions and flags

Change-Id: I70af6d43f45e2110ee7707ff5747b5e990ba7238
Reviewed-on: https://code.wireshark.org/review/8926
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>

Profinet: Combined Object Container is added.

An IO device may define so called “combined objects”.
A particular combined object is a group of related submodules, e.g. an interface and its ports.
The Combined Object Container holds the parametrization for all submodules.

Change-Id: Ifb6c63d2c3a1d3cf2cf100a8f54cf0eafa84fe6c
Reviewed-on: https://code.wireshark.org/review/8853
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>

PCP: fix dissection of R bit

Request and response values were inverted.

Bug: 11278
Change-Id: I9b337f423055578252cc01211d74c77837b7ae87
Reviewed-on: https://code.wireshark.org/review/8924
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

openflow_v4: oxm_length includes experimenter

As defined in section 7.2.3.10 "Experimenter
Flow Match Fields" of openflow-switch v1.3.5 spec.

Change-Id: I7268f614417720f225a22b226c8f21603b7f2d0f
Reviewed-on: https://code.wireshark.org/review/8882
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>