Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured
length.

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

Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured
length.

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

ZigBee: fix IS_ANALOG_SUBTYPE macro

Modify IS_ANALOG_SUBTYPE macro according to 07-5123-04 zigbee cluster
library specification. It wasn't filtering out the 8-bit enums ans 16
bit enum (digital types).

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

CMake: Fix an NSIS dependency.

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

CMake: Initial PortableApps targets.

Add portableapps_app_dir and portableapps_package targets.

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

Start moving win-setup to PowerShell.

Add win-setup.ps1, which duplicates the following tasks performed by
config.nmake + Makefile.nmake + win-setup.sh:

- Create the windows library directory.
- Download files.
- Download and unpack zip files.
- Check and set current-tag.txt

Don't verify applications or libraries. CMakeLists.txt does that.

Update the Developer's Guide.

Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which
appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript".

This removes our dependencies on unzip and wget and reduces our dependency
on bash.

Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614
Reviewed-on: https://code.wireshark.org/review/7990
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: Gerald Combs <gerald@wireshark.org>

openSAFETY: Replace deprecated API

 Replace deprecated API functions tvb_length and tvb_length_remaining

Change-Id: Ibf4c7b12a1a6ea3b1a750dce7faf2f4933b4c470
Reviewed-on: https://code.wireshark.org/review/8063
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Bluetooth: OBEX: Update to PBAP 1.2, GOEP 2.1, CTN 1.0 and GPP 1.0

Add a lot of fields.

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

Oops, have to actually comment out the definition, not just the declaration.

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

Cast away a (non-relevant) warning.

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

That made some *other* routines unused; "#if 0" them out.

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

"#if 0" out some unused variables and functions.

This should be checked - why are they being generated by idl2wrs?

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

Get rid of extra variable.

That assigns all string members with a g_strdup-family function, making
the assignment of the name similar to the other assignments.

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

Change deprecated API tvb_length -> tvb_reported_length

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

GIOP: Reassembly of fragments

Support for the reassembly of GIOP Fragment message types.
A new bool preference (giop.reassemble) is introduced to control reassembly
and it is enabled by default.

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

Geospatial and Imagery Access Service (GIAS) Dissector

A Corba (GIOP) based protocol for the exchange of Intelligence, Surveillance
and Reconnaissance (ISR) products.
Defined in STANAG 4559/AEDP-5 "NATO Standard ISR Library Interface (NSILI)"
See http://www.nato.int/structur/ac/224/standard/4559/4559.htm for more
information.
The dissector is generated using idl2wrs using the gias.idl, with some
manual corrections, as noted in README.gias.

Patch Set 4: Initialise uninitialised variables and no longer mark them as
unused.

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

Bluetooth: SDP: Update to MAP 1.2 and PBAP 1.2

There are some new attributes comparing MAP 1.1 to 1.2
and PBAP 1.1 to 1.2.

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

Bluetooth: OBEX: Fix reassemble at transport layer

Transport layer is RFCOMM. OBEX packet may be fragmented over RFCOMM.
If so then (Opcode + Final flag + ) Packet Length determines packet length,
but whole OBEX packet will be framented over parts/packet that first packet
has Packet Length and next packets are sequential parts of whole packet
(no header, etc.) Reassemble on this level is simple concatenation of all packet
up to Packet Length. Let threat packet shorted than 3 bytes as bad packet.

There is still no reasssemble on OBEX level (aka Final flag), so content send
over OBEX (vCards, files, XMLs) is still not reassembled.

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

Bluetooth: OBEX: Add request/response tracking

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

Bluetooth: GATT/L2CAP: Add support for 6LoWPAN

6LoWPAN is used by GATT level profile called IPSP.

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

Bluetooth: HFP: Update to HFP 1.7

Update to latest Bluetooth specification: 1.7 (previously 1.6)
Add +BIND and +BIEV commands, also update +BRSF to support new features.
There is still some things to implement, but need more work to do it, like
request-response tracking.

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

Just use g_strdup_printf() to create a g_mallocated formatted string.

And, as it's g_mallocated, we don't need to g_mallocate it again with
g_strdup().

The same is true of strings allocated with g_strconcat().  Don't make an
extra copy, and don't free up the original.

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

UI: Implementing menus for plugins

 Plugins may utilize the tap interface to provide special tools
 or analysis options, not otherwise available in Wireshark, or
 perhaps not allowed to be distributed freely. Up until now, those
 tools either had to start automatically, or could not be started
 at all, or had to be started separately.

 It should be possible, that those tools may be started using a
 menu entry directly from Wireshark. This interface tries to achieve
 exactly that.

 This interface uses a clean interface, which can be implemented in
 any plugin or dissector. Documentation for this has been added to
 README.plugins.

 Separators are only supported for now in the Qt interface, but
 URLs can now be added as a simple item, and the UI will use the
 same methods used for other URL calls to open them.

Change-Id: I170107dafb66f6badaa864d05a9091e5cbbf52c2
Reviewed-on: https://code.wireshark.org/review/7865
Reviewed-by: Roland Knall <rknall@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 zlib DLL copy.

Switch to "if exist ... xcopy".

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

More casts.

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

Add a major version number argument to --with-qt.

Without a major version number, it behaves as before, picking whatever
version it finds, and preferring Qt 5 to Qt 4.  With a major version
number, it looks only for the version in question.

Bug: 10793
Change-Id: Idf6c2c61e84bb87f7b601d8f09c33f31b67bf46d
Reviewed-on: https://code.wireshark.org/review/8052
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>

Cast away some warnings.

offsetof() doesn't necessarily return an int-sized value; cast it to
guint.

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

Add the OpenSUSE zlib1.dll when needed.

The Visual Studio solution files created by CMake list "Debug" as the
first configuration, which means that we end up with zlibd1.dll by
default. Many of the OpenSUSE DLLs depend on zlib1.dll. Add the OBS
version in that case.

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

Fix extcap interface capture with tshark

Extcap parameters must be saved when doing the interface number/name matching,
otherwise extcap program is not launched and pipe is not created

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

dumpcap: fix opening of pipes on Windows broken since gbed29af

Previous code was assuming that all local pipes were of extcap type. Let's explicitly check for extcap prefix now.

Bug: 10803
Change-Id: If955e77a9ee2af11b553740269964c40273d5177
Reviewed-on: https://code.wireshark.org/review/8013
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: Add option to copy all visible item or selected tree items in Packet Details pane

The idea is allow to copy data from GUI by user,
what is currently case only for tshark.

The first option copy every item from Packet Details that are expanded (visibled).
The second option do the same but start on currently selected item/tree.
(let think about protocols like BT SDP where there is a lot of recursive subtrees)

Change-Id: I19c925d21293ceb8af2167c7d2c1b1b36507124e
Reviewed-on: https://code.wireshark.org/review/8047
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>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>

Support for new netscaler 3.5 trace format.

Change-Id: Ica74f3f9239a96486967cf248feb4313bc390734
Reviewed-on: https://code.wireshark.org/review/7751
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add more "bitmask grouping" APIs.

Add proto_tree_add_bitmask_value, proto_tree_add_bitmask_value_with_flags and proto_tree_add_bitmask_list to aid in the removal of proto_tree_add_boolean "groupings" as well as "groups" of fields that use proto_tree_add_item with the same offset/len.

This may be able to be optimized later, but the first step will be converting dissectors to use it.  A sample conversion of each API is also included.

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

GSM A: force display of the bits sequence corresponding to "Degrees of longitude" field

It makes the display more consistent with other fields of Location Estimate IE

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

Remove deprecated API tvb_lengtRemove deprecated API tvb_length

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

Fix the path for androiddump.

The androiddump binary ends up in the top-level source directory, not
the extcap subdirectory.

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

Windows: fix generation of PortableApps.com installer

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

androiddump: Disable automatic starting adb

It does not work as expected.

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

androiddump: add more compatibility with MSVC connect API

Change-Id: I11d84d3904e11a085381b30cca7fc678c18797e6
Reviewed-on: https://code.wireshark.org/review/8034
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Windows: do not install androiddump by default

It adds a delay on startup and is verbose on command line when Android SDK is not installed

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

Add missing androiddump stuff

Add missing androiddump stuff like:
- release notes
- documentation
- Windows nmake support
- running androiddump as a windows application instead of console on Windows
- addition of androiddump to the Windows installer

Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d
Reviewed-on: https://code.wireshark.org/review/7981
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
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>

[Automatic update for 2015-04-12]

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

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

Only add flags to CFLAGS_FOR_BUILD if $CC and $CC_FOR_BUILD are the same.

Otherwise, just because a flag is appropriate for $CC, that doesn't
necessarily mean it's appropriate for $CFLAGS_FOR_BUILD.

(We don't use CFLAGS_FOR_BUILD for many things, so it's probably not
worth making a lot of effort to throw all the warning flags into it if
we're cross-compiling; we *do* throw them in for native compilation,
which is what most developers use and test with, so that should be
sufficient to let the warnings catch problems with the build tools we're
building.)

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

Ignore androiddump - it's another build target.

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

Use HAVE_ARPA_INET_H to control whether to include <arpa/inet.h>.

That's how we do it elsewhere.

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

Add removal of zlib 1.2.8 folder

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

More type cleanup to squelch warnings.

Make exported_pdu_headers_size a size_t to make it big enough.  Make
used_buffer_length a size_t as it doesn't go negative and gets compared
with unsigned values.  Cast length to size_t when comparing it with
used_buffer_length - by that time, we've ensured that it's not negative.

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

androiddump: fix a typo

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

Use G_GUINT64_CONSTANT() to make a guint64_t (or uint64_t) constant.

Don't assume "UL" is good enough; long is 32 bits on ILP32 platforms.

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

Squelch 64-bit-to-32-bit shortening errors.

Cast some sizeofs, make a variable size_t.

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

It's not "Windows vs. (Linux or OS X or Cygwin)", it's "Windows vs. UN*X".

Either it's Windows and not Cygwin (__WIN32 suffices for both 32-bit and
64-bit Windows, and this code is unlikely to work on 16-bit Windows, not
that much of anybody cares about it any more), or it's UN*X or Windows-
pretending-to-be-UN*X-with-Cygwin.  That way we don't have to pile on
new defined(XXX)'s for every UN*X out there.

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

A temporary variable squelches some warnings.

GINT32_FROM_BE() and GINT32_TO_BE() both declare local variables, and
they collide, so warnings are issued if you use them both in the same
statement.

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

Retire ws-manifest.pl.

We haven't used it in a while and we won't use in the CMake environment.

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

Move the PortabaleApps packaging up one level.

Update the PA section of the Developer's Guide.

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

Remove depricated API tvb_length -> tvb_reported_length

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

CMake: Add a build environment == generator check.

If we're building on Windows and %Platform% is "x64" or undefined,
check it against our generator's target platform.

Update the "${CMAKE_GENERATOR} MATCHES" regexes to match what CMake
uses internally.

Change-Id: I33996344978855cbdf7c1ee9e55b7340efea5b5c
Reviewed-on: https://code.wireshark.org/review/7994
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

MIP6: Remove proto_tree_add_text

Based on packet-ip.c

Change-Id: Ibc561b58d5f4b3e3469e1c578e83b3abe3c206f8
Reviewed-on: https://code.wireshark.org/review/8008
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameter

By remove duplicate code...

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

Androiddump: fix Potential leak of memory pointed to by 'serial_number'

Change-Id: Ib244ec9a94d99a3589d411a4e3bcb1b03212b82e
Reviewed-on: https://code.wireshark.org/review/7987
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Androiddump: Fix Result of 'malloc' is converted to a pointer of type 'unsigned short', which is incompatible with sizeof operand type 'unsigned short *'

Remove malloc

Change-Id: I12a7f76026336853a50bc5277404c44aa715b8d2
Reviewed-on: https://code.wireshark.org/review/7986
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

OCFS2: fix some GCC / Clang warnings

packet-ocfs2.c:249: comma at end of enumerator list [-Wpedantic]
packet-ocfs2.c:1171: no previous prototype for 'proto_register_ocfs2' [-Wmissing-prototypes]
packet-ocfs2.c:1651: no previous prototype for 'proto_reg_handoff_ocfs2' [-Wmissing-prototypes]
packet-ocfs2.c:1678:4: no newline at end of file [-Wnewline-eof]

Remove also unneed glib.h include

Change-Id: I47a03dbc9f175a0e2453dd90a733144ac9f95fc4
Reviewed-on: https://code.wireshark.org/review/8007
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Pass HTTP URLs to wget.

Not all wgets are equal. Revert part of 7787c1b so that wget fetches
over HTTP instead of HTTPS.

Change-Id: Iced263380429795975cf239cba7dac54bd729d38
Reviewed-on: https://code.wireshark.org/review/8005
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Replace PROTO_TREE_ADD_XXX_ITEM macro use with real code.

PROTO_TREE_ADD_XXX_ITEM had a bug in it for int values.  This was
fixed by adding proto_tree_set_ ## ctype ## to the macro, but not
all compilers support macros at the end of a function, so just
remove the macro entirely and just have the duplicate code.

Change-Id: Icf92a6786daa0e84305ba174ce155833f90b6463
Reviewed-on: https://code.wireshark.org/review/8006
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Correct macro expansion in PROTO_TREE_ADD_XXX_ITEM for integer fields.

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

Replace deprecated API tvb_length -> tvb_reported_length

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

REplace deprecated API tvb_length -> tvb_reported_length

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

802.11: use switch for Aruba type

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

802.11: don't return when Wrong Tag Length

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

Replace deprecated API tvb_length... with tvb_reported_length...

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

Cleanup CMake VS solution

Move the zlib artefacts into Libs\zlib "folder"

Change-Id: Iddf0121fad3885553d908a51e9e07a7f676403fe
Reviewed-on: https://code.wireshark.org/review/7993
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

TRILL: Fix incorrect header length

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

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

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

Improve ATH dissector.

Address comments made after initial dissector was submitted.

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

zigbee: correct zcl meas sensing

corrected the relative humidity measurement 0.00 to 100.00 values.
Previous version had bug for example 0.01% -> display 0.1%

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

[IEEE 802.11] fix two potential endless loops

add_tagged_field() may return 0 if the tag length is not what is
expected for this particular tag

Bug: 11110

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

ATH dissector

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

Fix CMake build for Windows

The change to zlib 1.28 requires the variable BUILD_SHARED_LIBS
to be set and true to build the correct zlib dll on Windows.

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

androiddump: Fix missing headers for Mac OSX

 Add sys/socket.h as well as arpa/inet.h and the definition
 of closesocket.

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

extcap: Add support for Android - androiddump

androiddump is extcap program that can be used with Android devices
(need Android SDK in system PATH). Supported is Logcat/Logger logs and
Bluetooth interfaces for all Android to this day (Lollipop).

Please note that it will work also for FirefoxOS.

Interfaces:
1. Logcat Main (binary or text)
2. Logcat System (binary or text)
3. Logcat Events (binary or text)
4. Logcat Radio (binary or text)
5. Logcat Crash (text; Lollipop)
6. Bluetooth Hcidump (<Kitkat)
7. Bluetooth Bluedroid External Parser (Kitkat)
8. Bluetooth BtsnoopNet (Lollipop)

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

802.11: Not showing all 11k subelement fields

Add support of Reported Frame Body (subelement of Beacon Report)

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

WiFi P2P: Update to Peer-to-Peer (P2P) Technical Specification Version 1.5

Add new IE
19 Out-of-Band Group Owner Negotiation Channel
21 Service Hash
22 Session Information Data Info
23 Connection Capability Info
24 Advertisement_ID Info
25 Advertised Service Info
26 Session ID Info
27 Feature Capability
28 Persistent Group Info

Bug:11074
Change-Id: I627ca5906c1e3235aa7d4abb4ebfa757825b7fbf
Reviewed-on: https://code.wireshark.org/review/7914
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>

Replace deprecated tvb_length with tvb_reported_length.

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

Add section to README.dissector about dissector tables

Bug: 8985
Change-Id: I9245fb556a55da681fe53dd5c12bb549c83c89c6
Reviewed-on: https://code.wireshark.org/review/7926
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove RTAC Serial preference that doubled for Decode As.

Just use Decode As directly.

Change-Id: Iab03a6ff8a70c3c6b0406f426e622eb52bb34ba7
Reviewed-on: https://code.wireshark.org/review/7902
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Remove MPLS preference that doubled for Decode As.

Just use Decode As directly.
Also replace "registered" dissectors which just the creation of a handle since the dissectors really don't need to be "found" outside of themselves.

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

Add proper "Decode As" mechanism for FLIP payload instead of (many) preferences.

Other cleanup with FLIP dissector while in the neighborhood.

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

Win32: Restore the versioned plugin installation path.

Revert parts of g2ef72cb and g7710da4 so that the NSIS installer once
again places plugins in $INSTDIR\plugins\$VERSION. This matches the
behavior of Autotools and previous Windows installers, and reduces the
chances of a version mismatch if the user happens to install a custom
plugin.

Leave the development plugin path unversioned. Leave the extcap path
unversioned for now.

Change-Id: I861d4ee12975fba4b642e391871c5e852d92a2fe
Reviewed-on: https://code.wireshark.org/review/7976
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Qt: fix maximized state apply

Preferences are not loaded yet when we call MainWindow::loadWindowGeometry()
Anyway, prefs.gui_geometry_save_maximized should only be checked when saving preferences (MainWindow::saveWindowGeometry() method) like what we do in GTK UI

Change-Id: I8eb01a5f4f7672fbf5846bc576584e28f72d5e31
Reviewed-on: https://code.wireshark.org/review/7978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Add zlib compilation to CMake on Windows

Modify CMake to compile zlib, removing need for an nmake compilation
of zlib before running CMake.

Change-Id: I63cead55b14d6a2e22b1b6a8536eaf9260e21231
Reviewed-on: https://code.wireshark.org/review/7864
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

Byte view tab (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Remove unused bmask variable

Change-Id: I44613f1d949dbaf8e559b3bfb2196609d821c4f3
Reviewed-on: https://code.wireshark.org/review/7496
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

ATM: add a cast to pacify the OSX 10.5 x86 buildbot

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

Typo fix in manpage of editcap

Positve => Positive

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

ieee80211.c: "IEEE 802.11 plus Network Monitor radio header" encap: Fix dissection

Specifically: Management/Control frames saved by Microsoft Netmon (3.4?)
with "IEEE 802.11 plus Network Monitor radio header"  encapsulation
may or may not be saved with an FCS.

See Bug 11105.

Fix: Use "check fcs" preference to specify whether Management & Control
frames have an fcs for this encapsulation.

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

802.11: don't not showing all 11k subelement fields

Missing break for Measurement Report tag

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

SGSAP: fix indent (use 4 spaces)

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

[SGSAP] Use the subtree for MCC MNC.

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

[SGSAP] Add dissection of TMSI based NRI container and
Selected CS domain operator.

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

Add OCFS2 dissector.

Bug: 5553
Change-Id: If297036b6d7a7afe163d97b05bc4a319d6cf2e97
Reviewed-on: https://code.wireshark.org/review/7949
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

DMP: Handle encoded 7bit string as binary.

This bug was introduced when rewriting tvb_get_string() to
handle encoding (and thus handling ASCII string different).

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

Revert "Don't rescan packets when a display filter is added if we are capturing without "Updating list of packets in real time".  There are no displayed packets to filter!"

This reverts commit a11f7a75486abe3b2fdb7e8ba61e41b40b738dee.

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