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>

icmp,wimax: Fix undefined shift

Fixes these warnings reported by Undefined Behavior Sanitizer (UBSan)
while running the test suite:

    icmp: left shift of 55099 by 16 places cannot be represented in type 'int'
    wimax: left shift of 1 by 31 places cannot be represented in type 'int'

Change-Id: I72913a901b61033098750da9c8f1617b055999a1
Reviewed-on: https://code.wireshark.org/review/8913
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Qt/Bluetooth: Add Devices dialogue

Please found it under Bluetooth menu. It shows all devices found
in logs, not only connected, all that its address can be found in
logs. Show if device is local (in most cases: capturing on it side)
and manufacturer and LMP version what should answer the question what
version of Bluetooth is used by Bluetooth device chip.
Also firmware version.

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

Qt: Add the ability to show preferences by module name.

Currently unused, but allows feature parity with the GTK+ UI.

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

Clean up the ATM dissection a bit.

Have separate dissectors for ATM MPLS pseudo-wire traffic and regular
traffic.  That way, we can handle the regular traffic dissectors being
handed private data, e.g. an ATM pseudo-header from libwiretap.

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

ZVT: add the transaction struct as an argument to the payload functions

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

ZVT: check the minimum apdu length

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

Include QUrl.

It's apparently required by Qt4.

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

Qt: Enable Drag and Drop in the main window.

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

[Automatic update for 2015-06-14]

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

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

ber: fix undefined shift

Fixes this UBSan warning:

    epan/dissectors/packet-ber.c:1917:23: runtime error: left shift of
        54645397829836991 by 8 places cannot be represented in type
        'long int'

Integers are two's complement, so really just cast it to unsigned to
avoid undefined behavior and still set the upper bit.

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

MPLS: always display payload when no 'Decode As' preference is set

Based on the heuristic suggested by Jasper, check whether ethertype matches
IPv4, ARP, RARP, VLAN or IPv6 and decode payload as Ethernet PW (CW heuristic)
by default. Otherwise display payload as data by default.
This can be overridden by the 'Decode As' configuration.

Follow up of g7ca0472

Bug: 11271
Change-Id: Idb2ce1f8b967813a8f4a5e29e6005d5442729395
Reviewed-on: https://code.wireshark.org/review/8912
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Fix some CMake compiler tests for Win64

Change-Id: I03244b48e6593d1fe5f4d139fa5d171debeb9fd7
Reviewed-on: https://code.wireshark.org/review/8909
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

Cleanup and hardening for the Aeron dissector.

Change-Id: Iee544315401784b097ab05e6de5e5c950b622c80
Reviewed-on: https://code.wireshark.org/review/8877
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

AMQP 1.0: Fix dissection of UUID datatypes

Set a correct data length: 16-bytes, not 1-byte. And use the
standard function to print the uuid.

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

AMQP 1.0: Don't treat decimal[32|64|128] as packet errors

Packets with a decimal datatype should be correctly dissected.
Yet, we still cannot display the decimal floating-point numbers as
there is no support in printf and glib.

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

Qt/Bluetooth/ATT: Add SaveAsImage option for table

Also remove CopyAll button and move this option to table's context menu,
where "Save as image" is placed.

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

Qt/Bluetooth/ATT: Fix behaviour when capture file is closed

Disable go to frame and control components when capture is closed.
You can only browse data and copy them.

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

Bluetooth: SDP: Fix alone DID attributes

Fix "malformed" packets where there is only one attribute of DID.

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

Bluetooth: Device name is UTF-8, not ASCII

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

androiddump: Fix socket resource leak

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

androiddump: Fix Bluetooth External Parser

Be careful when use char buffer [aka signed char] with arithmetic and thinking
in unsigned logic. Also add missing rules for SCO.

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

Squelch PortAudio warnings on Windows x64 cmake build

pa_win_wmme.c generates 4 warnings due to converting size_t down to a long
All 4 get the size_t from a strlen() call on a device path so are unlikely
to exceed a long.

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

Add RPCoRDMA dissector

Add support for RPCoRDMA and as a result support NFSoRDMA protocol

Bug:11251

Change-Id: I1a4af1b4e6b344224f5ce0efa77d7dbfca8aae46
Signed-off-by: Slava Shwartsman <slavash@mellanox.com>
Signed-off-by: Yan Burman <yanb@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/8758
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>

Asterix dissector can now dissect ASTERIX Category 004.

The code was added to dissect CAT004.

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

AMQP 1.0: float/double should be in network byte order

The standard says that (unless otherwise specified) AMQP uses
network byte order for all numeric values.

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

AMQP 1.0: 'char' should be 4-bytes UTF32

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

Mark items unused or rarely-used as appropriate.

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

Search for the Lua (version < 5.3) package first: it's the most common case.

Change-Id: I5a74870c491d46e538200f2b275b1608c0afecd4
Ping-Bug: 11219
Reviewed-on: https://code.wireshark.org/review/8865
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

.mailmap: Update .mailmap for fix some name / duplicate entry

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

Replace tabs in files with editor modeline "expandtab"

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

BER: fix call to proto_tree_add_bytes_format()

The start_ptr parameter was missing.

Bug: 11264
Fixes: 8ccf65bfb244 Eliminate proto_tree_add_text from a few dissectors.
Change-Id: I52a59fe572cd1d0da8c6eb64e703752f5e352ed6
Reviewed-on: https://code.wireshark.org/review/8878
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>

ZVT: use the transaction info to set source and destination address

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

Provide port names for UDP ports so they can be used in filter expressions.

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

Provide port names for TCP ports so they can be used in filter expressions.

Bug: 594
Change-Id: Ib41c4c753e24ac78b39463ab1daae7fd00631230
Reviewed-on: https://code.wireshark.org/review/8851
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>

epl: Add config option for dupl. cmd layer

 Allow the command layer to be shown for duplicated frames
 if needed for deep-packet analysis

Change-Id: I2e0026b6e448ebfd96f879f2f002a6f30a0a5031
Reviewed-on: https://code.wireshark.org/review/8874
Reviewed-by: Roland Knall <rknall@gmail.com>
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>

openSAFETY: Fix smaller bugs in detection and tap

 - Add b16 counter to SPDO Time Request/Response
 - Mark generated time fields as generated
 - Fix +1 addition for frameOffset
 - Fix CRC2 calculation for subframes with just 5 bytes datalength

Change-Id: I59ef7bf445de47c2bd165ae0f94d64d9f11d636b
Reviewed-on: https://code.wireshark.org/review/8875
Reviewed-by: Roland Knall <rknall@gmail.com>
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>

[MSVC 2015] Use intptr_t to make MSVC happy.

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

tshark: fix computation of iostat table width when specifying an interval

Bug: 11262
Change-Id: I57468d1e96ade8926a2911bd035adf85500eba39
Reviewed-on: https://code.wireshark.org/review/8860
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

NFSv4: A zero attribute mask is acceptable in dissect_nfs4_fattrs() if
'type' = FATTR4_BITMAP_ONLY

This patch updates the code accordingly.

Vars 'num_bitmaps', and 'count' are declared as guint8 but being passed to
32-bit fields of proto_tree_add_uint() and tvb_ensure_bytes_exist(). In
glibconfig.h 'guint8' is defined as 'typedef unsigned char guint8;' and in
'limits.h', ‘char’ is defined as 8 bits: #define CHAR_BIT 8  /* number of
bits in a char */. These vars have been changed to 32-bits.

There are 22 other dissectors that call "tvb_ensure_bytes_exist()". In
addition, there are an 215 CHECK_BYTE_COUNT_SUBR macro calls in
packet-smb.c which essentially do the same thing. README.developer does
state "you can check whether the data is present by using
"tvb_ensure_bytes_exist()" although this frequently is not needed." This
call has been removed in accordance with that statement.

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

It's INVALID_HANDLE_VALUE, not INVALID_HANDLE.

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

Squelch some type-clash warnings on Windows.

Define WS_INVALID_PID to be the appropriate "there is no process" value.
On UN*X, -1 works; the "pid" is actually a HANDLE for the process on
Windows, so INVALID_HANDLE is appropriate.

Cast HANDLE to intptr_t in the _cwait() call.

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

Rename wsutil/process.h to wsutil/processes.h to avoid collisions.

The MSVC rules for searching for headers are a huge barrel of fun; it
appears that, for some files that need the MSVC <process.h> to declare
getpid(), they're getting our <wsutil/process.h> instead, as that's in
the current directory.  Rename it to avoid the collision.

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

Make sure we include <windows.h> to get HANDLE declared.

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

One more ws_process_id change.

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

Get rid of extra blank line at the end.

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

Use pid_t on UN*X, and HANDLE on Windows, for the process ID.

This avoids type punning; at least with Xcode 7 beta on El Capitan beta,
that produces warnings that get turned into errors.

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

Clean up --with-qt handling.

If you don't specify --with-qt or --without-qt, we build with Qt iff we
find it; we don't fail if we don't find it.

If you specify --with-qt, we build with Qt if we find it and fail if we
don't find it.

If you specify --without-qt, we don't look for Qt and don't build with
it.

This is all independent of --with-gtk2 or --with-gtk3.

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

Qt: fix a V595 warning reported by PVS-Studio

The 'cur_item' pointer was utilized before it was verified against nullptr.

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

GTK: fix a V610 warning reported by PVS-Studio

Unspecified behavior. Check the shift operator '>>'. The left operand '(- 1)' is negative.

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

[MSVC 2015] Use intptr_t for "pointer stored as int" to make MSVC happy.

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

Remove the executable bit from epan/addr_resolv.c

It was added (presumably by accident) in 41ac67c.

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

Add PortAudio to Windows CMake build

Change-Id: I774ff0bf858280f2a5aa551ae1a5e23eedf8dc20
Reviewed-on: https://code.wireshark.org/review/8848
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

[MSVC 2015] Change the check to look for MSVC 2010 or newer rather than
adding MSVC 2015

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

Don't try to clean up uninitialized Lua and crash

Reported to Debian BTS at:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786704

Change-Id: I3045a68f0dd557bf64ea26a488a1bcece4828fec
Reviewed-on: https://code.wireshark.org/review/8765
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: Balint Reczey <balint@balintreczey.hu>

Fix insertion of subnets read from the subnets file: append to the *end* of
the list.

The patch ensures that non-duplicate subnets are appended to the end of the
list rather than as the second element, which if there had been a second
element previously, the memory for it was effectively leaked.

It also allows /32 "subnets", even though arguably the hosts file should be
used instead, but now the test in read_subnets_file() matches the assert in
subnet_entry_set().

Bug: 11247
Change-Id: I54bf1cbb34edfcf410aa634043a377c27091df51
Reviewed-on: https://code.wireshark.org/review/8802
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

tshark: add ability to display streams in EBCDIC

As requested in https://ask.wireshark.org/questions/42958/tshark-follow-tcp-stream-for-ebcdic

Change-Id: Ia8d93f59aa038bd6328adea137c92ea5a52361b5
Reviewed-on: https://code.wireshark.org/review/8844
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

tap-macltestat.c: fix some V523 warnings reported by PVS-Studio

The 'then' statement is equivalent to the 'else' statement.

Change-Id: I9e39afed3520cd4dffee52d5e57830817a8c4399
Reviewed-on: https://code.wireshark.org/review/8846
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

SMB: fix a V595 warning reported by PVS-Studio

The 'si' pointer was utilized before it was verified against nullptr.

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

LBMC: fix Truncation of constant value -16. The value range of unsigned char type: [0, 255] found by PVS Studio (V569)

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

Add TapParameterDialog.

Split StatsTreeDialog into StatsTreeDialog and TapParameterDialog (its
base class). This more closely matches the GTK+ UI and paves the way for
more statistics dialogs.

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

Revert "NFSv4: Fix for Bug 10483"

This reverts commit da1766e9871ba1eb4156ebd05c819eee9d91c10f.

I should have set CR-2 because I was working on the following update: According to RFC 5661, a zero attribute mask is acceptable if type FATTR4_BITMAP_ONLY is passed to dissect_nfs4_fattrs(). In addition I found guint8 vars  'num_bitmaps', and 'count' are declared as guint8 but being passed into 32-bit fields of proto_tree_add_uint() and tvb_ensure_bytes_exist().I will push a new patch for review.

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

aeron: fix infinite loop

`dissected_length` can come from the packet in some paths, meaning it can be 0
or negative and we need to check for underflows and other such problems

Bug: 11255
Change-Id: Iba55ec1824a391ec1c717bfea5b65cc6610fc081
Reviewed-on: https://code.wireshark.org/review/8839
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
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>

PMPROXY: check that pointer is not NULL before doing a strlen

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

AMQP: fix The 'format_name' variable is assigned to itself found by PVS Studio (V570)

Change-Id: I97cdfc20cc635bccea5c96db33f46cdd970e933a
Reviewed-on: https://code.wireshark.org/review/8785
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Petr Gotthard <petr.gotthard@centrum.cz>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Print "and greater" instead of a ten digit number.

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

tcp: simplify tcp.flags.str, fix off-by-one

Observe that tcp_flags_to_str_first_letter is a copy of tcp_flags_to_str
with the flags[][4] variables copied and the loop variables inverted.
This misses the FIN bit, and runs past the flags buffer.

Behavior change: for consistency, move the reserved bits to the front
and print reserved bits individually. Old output / new output:

    NCEUAPRSRRR
    RRRNCEUAPRSF

Tested with this pcap with all flag bits set (0x0fff). hexdump:

    d4c3b2a1020004000000000000000000ff7f000065000000b6b77455f3ac
    06002800000028000000450000280001000040067ccd7f0000017f000001
    0014005000000000000000005fff2000907f0000

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

Profinet: OEM Device ID is added

The Device ID of the OEM part may additionally be offered using OEM Device ID

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

rpc: Support IB transport

Bug: 11251

Change-Id: I1e6fab86af3c95a5303af90079c99424941b6e6e
Signed-off-by: Slava Shwartsman <slavash@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/8759
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>

GTPv2: fix indent (use 4 spaces)

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

Fix MSCV 2015RC Warning in_cksum.c(92): warning C4311: 'type cast':
pointer truncation from 'const guint16 *' to 'unsigned long'.

Even if we only require GLIB 2.16 this will fix the Windows build as we do
have a newer Glib on Windows.

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

BGP: fix an infinite loop when finding an invalid length in EVPN NLRI Route Type 5 option

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

[GTPv2] Throttling Delay unit values are not the same as the timer values,
make a separate Value_string.

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

Update how we search for Lua with pkg-config.

First, search for packages with the version number without the period (bug
11219).

Second, don't look for Lua 5.3 because we don't work with it.  If what we find
(without pkg-config's help) is Lua 5.3, disable Lua support (bug 10881).

Cmake support by Peter Wu (originally Ie73e5b53640f10432881a9671c0a605f7f027ed8):
Note the check for "lua<=5.2.99" instead of "lua<5.3" since cmake does not
support the latter syntax. Tested with lua5.2, lua5.1 and lua (5.3) installed.

Bug: 11219
Ping-Bug: 10881
Change-Id: I382d07ca00eafc6111cd4e9faa2b66f6b8f95b6e
Reviewed-on: https://code.wireshark.org/review/8783
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

NFSv4: Fix for Bug 10483

Bug: 10483
Change-Id: Ic0df7d92c6ec2da83ad02796a008f6512d7fdc9b
Reviewed-on: https://code.wireshark.org/review/8731
Reviewed-by: Anders Broman <a.broman58@gmail.com>

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

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

PER: fix indent (use tabs)

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

THRIFT: fix function name typo

disscet -> dissect

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

Register http.unknown_header as an FT_STRING (rather than FT_BYTES).

This avoids assertions when the field is added with proto_tree_add_string*()
(some of which show up in the fuzzed capture in bug 11254).

Ping-Bug: 11254
Change-Id: Iaf02f59443da0cf279d65eed049122d4dfaf7bcd
Reviewed-on: https://code.wireshark.org/review/8829
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Add editor-modelines; Don't use tabwidth=4; Adjust whitespace.

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

Eliminate proto_tree_add_text from some dissectors.

"file" dissectors are now rid of proto_tree_add_text.

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

igmp: fix memleak

dissector_add_uint_range walks through ranges and then does not need the
range anymore. Discovered with `tshark -G fields` and GCC 5.1 + ASAN.

Change-Id: I76f98a6ccee6dbbecc1efb847c358bd6d010e1dc
Reviewed-on: https://code.wireshark.org/review/8825
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Debugging printf.

The buildbot printed "expr: syntax error", presumably from this, but
that oh-so-descriptive error message doesn't indicate what the problem
is, and just about any string should be valid as the left-hand operand
of the : operator.

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

Restore image/expert_ok.png, it is used by GTK+ UI

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

NCP: fix V519 warnings reported by PVS-Studio

The variable is assigned values twice successively. Perhaps this is a mistake.

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

PER: fix V593 warning reported by PVS-Studio

Consider reviewing the expression of the 'A = B == C' kind. The expression is calculated as following: 'A = (B == C)'.

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

NDPS: fix V535 warnings reported by PVS-Studio

The variable 'ii' is being used for this loop and for the outer loop.

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

H248: fix V712 warning reported by PVS-Studio

Be advised that compiler may delete this cycle or make it infinity. Use volatile variable(s) or synchronization primitives to avoid this.

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

GSM Um: fix V695 warning found by PVS-Studio

Range intersections are possible within conditional expressions. Example: if (A > 0 && A < 5) { ... } else if (A > 3 && A < 9) { ... }.
E-GSM and R-GSM EARFCNs are overlapping, as seen in 3GPP TS 05.05.

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

[Automatic update for 2015-06-07]

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

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

ECP: fix V562 warning reported by PVS-Studio

It's odd to compare 0 or 1 with a value of 1: ((entries > 1)) == 1.

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