Remove proto_tree_add_text from idl2wrs generation.

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

Update the 3GPP list of Experimental-Result-Code values.

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

Add/clarify some comments about how the Experimental-Result-Code AVP is handled.

Specifically we put Experimental-Result-Codes specified by 3GPP in the XML file
and let other vendors' codes be handled through a dissector table.

Change-Id: I2c3977fb959ad84faa5cb90aeb3d191c8b465ede
Reviewed-on: https://code.wireshark.org/review/8319
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Have global_capture_opts if we either have pcap or extcap.

The extcap code uses it; if the intent is not to support extcap if you
don't have pcap, then don't enable it in the configure scripts/CMake.

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

Fix some --without-pcap build problems.

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

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

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

WildPackets → Savvius.

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

[Thrift] Fix a copy-paste-o and add dissecton of T_BYTE

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

GTPv2 : fix unused parameter 'tree' [-Werror=unused-parameter]

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

[GTPv2] Add dissetion of IE Overload Control Information and Metric.

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

THRIFT: Fix Mac Buildbot

packet-thrift.c:99: warning: declaration of 'tvb_captured_length' shadows a global declaration
packet-thrift.c:114: warning: declaration of 'tvb_captured_length' shadows a global declaration
packet-thrift.c:138: warning: declaration of 'tvb_captured_length' shadows a global declaration
packet-thrift.c:166: warning: declaration of 'tvb_captured_length' shadows a global declaration

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

Add a THRIFT dissector.

Change-Id: I69f2a99bde5a9f8c4c969cdd9145838ac776521b
Reviewed-on: https://code.wireshark.org/review/8298
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Set tap filter when WLAN "Limit to display filter" option is checked.

Bug: 11160
Change-Id: Ic2f1475a3b51eb8919435f1064fc0faf3c4da3eb
Reviewed-on: https://code.wireshark.org/review/8296
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 need to manually adjust packet-gias.c (take 2)

Need to have packet-gias.c in the DIRTY_CORBA_IDL_DISSECTOR_SRC grouping to work around the warnings still generated.

Change-Id: I08ea1f7d90577cc112b85e7fc00171827f58d6d2
Reviewed-on: https://code.wireshark.org/review/8266
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix configuration with --without-qt and with no --with-gtk[23].

If building with Wireshark wasn't explicitly disabled - i.e., if we are
building Wireshark, which means we are building an application with a
GUI - and Qt was explicitly disabled, and neither GTK+ 2 nor GTK+ 3 were
explicitly enabled, look for GTK+ 3.

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

GTK UI: remove eo_saveable_pathname in favor of eo_massage_str

The function had several deficiencies:

- When "" is passed as the filename, the function returns a null
  pointer (due to the quirky behavior of g_strsplit_set), which causes a
  segfault when it's dereferenced later. I'm not sure what the correct
  return should be, but it shouldn't be NULL.

- It leaks memory. (The array of strings returned by
  g_strsplit_set are never freed.)

- It only strips out backslashes. That is not the only character that
  is disallowed in filenames, even on windows.

- The functionality is already provided by eo_massage_str and
  it does a more complete job of it.

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

wsdg: clarify gerrit account requirement

A IRC user was asking about the meaning of `my.username` and noted that
information is scattered over places. This patch tries to make the
documentation more friendly for newcomers which are unfamiliar with
Gerrit (and maybe OpenID?).

The login page already recommends Launchpad, so no need to write it
here.

Change-Id: Ic55c9a2073d0045c6367f3efc8c842e53215f2dd
Reviewed-on: https://code.wireshark.org/review/8288
Reviewed-by: Mark <launchpad@markcunningham.ie>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

kerberos encryption types (etype) additions + cleanup

source http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml and referenced RFCs

Change-Id: I898218c3ef75da21130f3f6c83848c0fca095acf
Reviewed-on: https://code.wireshark.org/review/8300
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

CMake: Try to fix version.h dependencies.

Make the gitversion target depend on version.h instead of running
make-version.pl separately. Make wsutil and qtui depend on gitversion.

Change-Id: I32f25347c12c7f86b2439ed4bf517cc8f5fb106f
Reviewed-on: https://code.wireshark.org/review/8299
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 "Try to please both GCC (the compiler, not me) and clang."

Unfortunately it prevents compilation with GCC. I'll just use "cmake -DDISABLE_WERROR=ON" on the affected machine for now.

This reverts commit cdaad860720a17d889e759d9e263c5fcadaf36a2.

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

Updated to add the G8BPQ MKISS additional commands and "Checksum" mode.

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

extcap: Implement QT extcap options

 Implementing a button in the interface list, to bring up
 the extcap options dialog, as well as a dialog, which will
 be generated depending on the selected extcap options.

Change-Id: I1733dc6a8c1a121089a9c353aff10bc4a53e86de
Reviewed-on: https://code.wireshark.org/review/8224
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Try to please both GCC (the compiler, not me) and clang.

The fix for GCC 5's -Wlogical-not-parentheses d7b2327 triggers
-Wparentheses-equality in clang. Try to work around the issue with
diagnostic suppression.

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

DVB-CI: make some more items filterable

wrap long lines, remove a trailing space

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

added features in Feature-List-ID 2 used in S6a/S6d

Change-Id: I4e1be924ffa7cb09c4c73d494f5d97c9cc0bf626
Reviewed-on: https://code.wireshark.org/review/8291
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: Change expected boolean result

 Change boolean options to accept lower- and uppercase TRUE as
 positive result

Change-Id: I858918f7591bb7daf94444fb6c82f9aa37168d01
Reviewed-on: https://code.wireshark.org/review/8283
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
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>

Add support for decoding all Feature-List Gx flags

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

Add accesskey to Bluetooth menu

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

nettrace 3GPP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

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

Fix inconsistent indentation.

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

Don't dissect otherwise-undissected data twice.

Also, set decoded to TRUE after we return from a dissector; that makes
it a bit clearer when we're setting it.

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

Add a note about slot naming.

Note that QMetaObject::connectSlotsByName looks for slots which follow a
specific naming convetion, and that manually connected slots should not
use that convention. This isn't obvious and seems to trip people up from
time to time.

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

Add support for IPv6 heuristic dissectors.

This adds limited support for heuristic subdissectors with IPv6.
The initial motivation is STT but it should transparently work
for other protocols using IP heuristic dissectors in a manner
similar to the non-heuristic dissectors.

The limitation is in regards to IPv6 extension headers. IPv6 has
multiple checks against the next protocol table when determining
when the protocol is an unknown extension header or not. This
assumes that the check is cheap and has no side effects, neither
of which is true for heuristic dissectors. As a compromise, this
assumes that the next protocol is registered as protocol, even
if is not the one that is ultimately dissected. Although not
strictly correct, in practice this is true for existing protocols
and likely future ones because the heuristic dissectors are
overriding non-heuristic ones.

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

ext_menubar: Change action name to remove warning

 on_actionExternalMenu_triggered() triggered a warning, as no menu
 exists on the automatic UI configuration.

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

DVB-CI: remove some proto_tree_add_text() calls

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

Qt: remove a debug log showing the plugins path at startup

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

[Automatic update for 2015-05-03]

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

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

Try to keep capinfos+ASan from failing.

Set ASAN_OPTIONS=detect_leaks=0, otherwise all captures show up as
invalid in capinfos.

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

Don't try checksumming if we didn't capture all the data to be checksummed.

Check the captured length as well as the reported length, as is done in
other checksumming code paths.

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

Handle PIMvN, for N > 2, by just adding the checksum and subtree and bailing.

Don't bother doing the checksum, as we don't know how much to checksum;
don't assume setting pim_length to 0 will force it not to be
checksummed, as it doesn't; and don't test twice for a version != 2.

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

No need to call tvb_reported_length() twice.

Just reuse the result we got from an earlier call.

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

Expand comments.

Update a URL, and tell The Story About PIM, or, at least, about various
drafts floating around.  I guess it took a while for the protocol to
settle down, and a number of things changed significantly between early
drafts and RFC 2117, including whether the protocol runs atop IGMP or
directly atop IP.

There doesn't appear to be *any* draft that corresponds to what
dissect_pimv1() dissects; all have significant differences.

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

Fix checkAPI: Warning: i4b_trace.h has an SVN Id tag. Please remove it!

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

Revert "Fix the need to manually adjust packet-gias.c"

This reverts commit 3ca9318d8215738b8d4edcde0598226cfc6cf031.

Mac OS X buildbot are not happy

packet-gias.c:356: warning: 'hf_UCO_InvalidInputParameter_details' defined but not used
packet-gias.c:359: warning: 'hf_UCO_ProcessingFault_details' defined but not used
packet-gias.c:360: warning: 'hf_UCO_SystemFault_details' defined but not used
packet-gias.c:5275: warning: 'decode_UCO_Ratio_st' defined but not used
packet-gias.c:5303: warning: 'decode_UCO_DirectAccessLocation_st' defined but not used
packet-gias.c:5588: warning: 'decode_UCO_Coordinate3d_st' defined but not used
packet-gias.c:5612: warning: 'decode_UCO_Circle_st' defined but not used
packet-gias.c:5625: warning: 'decode_UCO_Ellipse_st' defined but not used
packet-gias.c:5656: warning: 'decode_UCO_SimpleGSImage_st' defined but not used
packet-gias.c:5671: warning: 'decode_UCO_SimpleCImage_st' defined but not used
packet-gias.c:5694: warning: 'decode_UCO_CompressedImage_st' defined but not used
packet-gias.c:5836: warning: 'decode_GIAS_ImageSpec_st' defined but not used

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

Fix the need to manually adjust packet-gias.c

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

C12.22: check c1222_baseoid_len before doing a memcpy

Should fix the following runtime error reported by Joerg:
../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 1, which is declared to never be null
../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 2, which is declared to never be null

Change-Id: I2f952815ed81e47b504e6479835a357b7656828e
Reviewed-on: https://code.wireshark.org/review/8251
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Fix some cases where we're shifting a signed 1 left.

Shift 1U instead, to make sure it's unsigned; the result of, for
example, the result of shifting a signed value left is undefined if the
value times 2^{shift count} doesn't fit in the *signed* type of the
shifted value.  That means, in particular, that the result of shifting 1
left by {number of bits in an int - 1} is undefined.  (In *practice*,
it'll probably be -2^32, with the bit you want set, but that's not
guaranteed, and GCC 5.1 seems not to like it.)

Make some other left-hand operands of <<, and some variables holding
results from shifts of that sort, unsigned, while we're at it.

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

Add tshark -z "ncp,srt"

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

Fix some cases where we're shifting a signed 1 left.

Shift 1U instead, to make sure it's unsigned; the result of, for
example, the result of shifting a signed value left is undefined if the
value times 2^{shift count} doesn't fit in the *signed* type of the
shifted value.  That means, in particular, that the result of shifting 1
left by {number of bits in an int - 1} is undefined.  (In *practice*,
it'll probably be -2^32, with the bit you want set, but that's not
guaranteed, and GCC 5.1 seems not to like it.)

This fixes the *other* generator for the X11 header files; we manually
fix the file in question, because life's too short to spend very much of
it trying to debug Perl issues that cause a

Can't use string ("1") as a HASH ref while "strict refs" in use at
../../tools/process-x11-xcb.pl line 675.
 at ../../tools/process-x11-xcb.pl line 1859
 at ../../tools/process-x11-xcb.pl line 1859

failure.

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

Fix some cases where we're shifting a signed 1 left.

Shift 1U instead, to make sure it's unsigned; the result of, for
example, the result of shifting a signed value left is undefined if the
value times 2^{shift count} doesn't fit in the *signed* type of the
shifted value.  That means, in particular, that the result of shifting 1
left by {number of bits in an int - 1} is undefined.  (In *practice*,
it'll probably be -2^32, with the bit you want set, but that's not
guaranteed, and GCC 5.1 seems not to like it.)

This fixes the generator for the X11 header files; we manually fix the
header file in question, because life's too short to spend very much of
it trying to debug Perl issues that cause a

Can't use string ("1") as a HASH ref while "strict refs" in use at
../../tools/process-x11-xcb.pl line 675.
 at ../../tools/process-x11-xcb.pl line 1859
 at ../../tools/process-x11-xcb.pl line 1859

failure.

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

rv is only used in an assert. The assert only evaluates to code if
NDEBUG is undefined. Protect rv and its use accordingly.

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

Revert "Fix warning:"

This reverts commit 39a31c3205ed1f0691f5e55174abe84653bcf7b0.

rv is used in an assert, thus breaking debug builds.

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

Replace deprecated function by not deprecated function.

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

Fix warning:
   /home/jmayer/work/wireshark/git/epan/nghttp2/nghttp2_hd.c: In function ‘hd_inflate_remove_bufs_with_name’:
/home/jmayer/work/wireshark/git/epan/nghttp2/nghttp2_hd.c:1736:10: error: variable ‘rv’ set but not used [-Werror=unused-but-set-variable]
   size_t rv;
          ^
turning error.

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

Fix some cases where we're shifting a signed 1 left.

Shift 1U instead, to make sure it's unsigned; the result of, for
example, the result of shifting a signed value left is undefined if the
value times 2^{shift count} doesn't fit in the *signed* type of the
shifted value.  That means, in particular, that the result of shifting 1
left by {number of bits in an int - 1} is undefined.  (In *practice*,
it'll probably be -2^32, with the bit you want set, but that's not
guaranteed, and GCC 5.1 seems not to like it.)

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

Fix some cases where we're shifting a signed 1 left.

Shift 1U instead, to make sure it's unsigned; the result of, for
example, the result of shifting a signed value left is undefined if the
value times 2^{shift count} doesn't fit in the *signed* type of the
shifted value.  That means, in particular, that the result of shifting 1
left by {number of bits in an int - 1} is undefined.  (In *practice*,
it'll probably be -2^32, with the bit you want set, but that's not
guaranteed, and GCC 5.1 seems not to like it.)

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

Don't shift signed values left.

That's not valid in C99, at least, if the value is negative or if the
shift count is the number of bits in the value - 1, and we might get
compile-time or run-time complaints about that.

Also, make bit masks unsigned; to quote a run-time error reported in

https://www.wireshark.org/lists/wireshark-dev/201504/msg00084.html

"left shift of 1 by 31 places cannot be represented in type 'int'", so
use type "unsigned int" instead, by shifting 1U rather than 1 left.

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

CMake: Always set PROCESSOR_ARCHITECTURE on Windows.

An undefined or invalid PROCESSOR_ARCHITECTURE will produce an invalid
wireshark.exe.manifest. Make sure it's always set.

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

HTTP2: Update to libnghttp2 0.7.13

Change-Id: I69589a90077a9b009f2e1a45531059ebd61a0450
Reviewed-on: https://code.wireshark.org/review/8242
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Add correct decoding of a Il command

That's another one protocol shortcoming - the same parameter used twice:

* https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#createupdatelookup-session
* https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#get-information

Change-Id: I9ccc05579b0a1c28b8180eb56a2eb51fc803c063
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8250
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Clarify command parameters meanings

See these links for a "single file" parameter:

* https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#record-stream
* https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#copy-stream

Change-Id: I23275898f98121215294c3c1a7a0ee727097d250
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8249
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Parse another one missing command modifier

Parse another one missing command modifier - "request New port". See
protocol description for the details:

https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#createupdatelookup-session

Change-Id: I4a49b0715022dca250ef0def75fb2e7983aaca1b
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8248
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Make bit masks unsigned.

To quote a run-time error reported in

https://www.wireshark.org/lists/wireshark-dev/201504/msg00084.html

"left shift of 1 by 31 places cannot be represented in type 'int'", so
use type "unsigned int" instead, by shifting 1U rather than 1 left.

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

CMake for Windows improvements

Allow the wireshark libs directory to be defined by WIRESHARK_LIB_DIR.
Ensure either WIRESHARK_LIB_DIR or WIRESHARK_BASE_DIR is defined.
Ensure the compiler is a supported version (VS2010, 12 or 13).

Change-Id: I0abd371c5773c08ca255abe308d1a59e2e290a02
Reviewed-on: https://code.wireshark.org/review/8247
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 reordercap to the wireshark-common package

Change-Id: I63b1a34458912f5cffe2770522e9d2c3737dbc08
Reviewed-on: https://code.wireshark.org/review/8246
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>

[nettrace_3gpp_32_423] Fix nettrace_3gpp_32_423.c:292: warning:
declaration of 'random' shadows a global declaration.

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

Add the abillity to read 3GPP trace records with format accoding to
TS 32 423(XML)

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

Fix a small typo

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

CMake Windows fixes

Set the minimum version for Windows to 3.1.3
Set the policy for CMP0054 to squelch a few warnings.

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

Update CMake docs for Windows

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

Finish removing VerizonWireless.xml and ChinaTelecom.xml

Change-Id: I7e64ed4a588ecc7ef72288e0fd3bf91f8b31e5e7
Reviewed-on: https://code.wireshark.org/review/8238
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

- Mark some DCE/RPC functions as public do allow calls from plugins

- DCOM:
  * Mark some DCOM functions as public do allow calls from plugins
* Add Support for Additional Variant Types  Money, I8, UI8
* Fix an uint32 overflow when dissecting nwstringz0 where the length is 0
* Use WS_DLL_PUBLIC instead of WS_DLL_PUBLIC_DEF

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

GSM CBS: fix a typo

While we are at it, let's use pinfo memory pool instead of making a copy of the string to be freed afterwards

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

Reorganize some of the Diameter XML files, taking advantage of the fact that
AVPs can be grouped by Vendor now (not just by Application).

Move a bunch of vendor-specific Application IDs to the vendor's XML file.

Delete the (basically empty) SKT.xml, ChinaTelecom.xml, and VerizonWireless.xml
files.

Fix a typo: 16777224 is 3GPP Gx, not 3GPP Cx.

Use (derived) type Enumerated (rather than Unsigned32 or Integer32) when the
AVP is of type Enumerated.

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

cli_service_response_time_table.h: fix api reference

The following parameters of draw_srt_table_data(srt_stat_table *rst, gboolean draw_header, gboolean draw_footer) are not documented: parameter 'draw_header', 'draw_footer'

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

proto.h: fix api reference

argument 'expression' of command @param is not found in the argument list of __DISSECTOR_ASSERT_STRINGIFY(s)
The following parameters of __DISSECTOR_ASSERT_STRINGIFY(s) are not documented: parameter 's'
The following parameters of __DISSECTOR_ASSERT_CMPINT(a, op, b, type, fmt) are not documented: parameter 'type', fmt
The following parameters of proto_tree_add_bitmask_list(proto_tree *tree, tvbuff_t *tvb, const guint offset, const int len, const int **fields, const guint encoding) are not documented: parameter 'len'

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

to_str.h: fix api reference

The following parameters of tvb_address_var_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, address_type type, const gint offset, int length) are not documented: parameter 'length'

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

follow.h: fix api reference warning

The following parameters of follow_index(stream_type stream, guint32 addr) are not documented: parameter 'stream'

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

Address.h : fix api reference warning

The following parameters of WMEM_COPY_ADDRESS(scope, to, from) are not documented:  parameter 'scope'

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

CAPWAP: fix wrong offset length for header length hf

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

Fix typo: we already checked for rcc and rcc-qt5, now it's time to check for
rcc-qt4 (not rcc again).

Fix up indentation: consistently use tabs.

Change-Id: I8e6d5a601f2a28fef5eb705d8bfac0e02a0e02f3
Reviewed-on: https://code.wireshark.org/review/8233
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

When configuring with Wireshark disabled, don't complain if uic, moc, and rcc
aren't found.

This would work before but only if you explicitly disabled Qt.

Bug: 11157
Change-Id: I1e4c2c18277e28c38b1ed2ffcaf45e49926e7a1f
Reviewed-on: https://code.wireshark.org/review/8232
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Fix Windows asciidoc build

Replace some unixisms with CMake equivalents

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

Bugfix string compare length

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

epl: Add support for AMNI frame

The "EPSG Draft Standard 302-A: High Availability" introduces
the new frame "AMNI". This change adds support to correctly
dissect POWERLINK AMNI frames.

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

[GTPv2] Mark a parameter as unused.

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

[GTPv2] Add dissection of IE User CSG Information (UCI)

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

[Diameter] Update Rx interface AVPs

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

Add service_response_time_table for TShark srt stats.

This is a "refactoring part 1" of the srt stats.  This first step is using the service_response_time_table for all (possible) TShark srt stats.  Next step will be combining the GTK and TShark service_response_time_table, so there is more code reuse and the "shared structure names" between GTK and TShark service_response_time_table won't seem as bad.

Maybe it can even go one step farther and handle a dynamic number of columns so this refactoring can apply to all srt stats.

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

Add tshark -z "smb2,srt"

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

Add tshark -z "ldap,srt"

Bug: 9363
Change-Id: Ic64716ef0156607ca40773cef8e76fc4a0825b3c
Reviewed-on: https://code.wireshark.org/review/8196
Reviewed-by: Michael Mann <mmann78@netscape.net>

Implement additional flags for IDR-Flags,DSR-Flags, ULR-Flags and NOR-Flags.

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

S1AP: Add missing protocol IE declaration for E-UTRAN-Trace-ID

Change-Id: I03caf29a5a1889884837fccf366cb35d0ccd6281
Reviewed-on: https://code.wireshark.org/review/8213
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

win-setup.ps1 Make setup script aware of proxies

 This will allow the powershell setup script to utilize the system
 proxy configuration, allowing for a download behind a company
 firewall

Change-Id: Id0bfaf4ded219374be6e60a08d620a519f5e4820
Reviewed-on: https://code.wireshark.org/review/8182
Reviewed-by: Roland Knall <rknall@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: Christoph Schlosser <christoph.schlosser@br-automation.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Fix x64 compilation warning

The build warning:

  C:/buildbot/wireshark/wireshark-master-64/win7x64/build/cmbuild/epan/uat_load.c(1348):
  warning C4267: '+=' : conversion from 'size_t' to 'guint', possible loss of data

is caused by parse_str_pos being a guint and adding a size_t value.
Fix by declaring parse_str_pos as size_t.

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

[RANAP] Heuristics does not work with lenght detremant of 2 bytes.

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

ext_menubar: Add pointer to GUI main structure

 Add a pointer to the callback, which will provide an enum value,
 for each calling GUI entity, as well as a pointer to the main
 structure for that entity.

 For Qt this can be used for instance, to connect to slots of the
 main instance, to update a calling dialog.

Change-Id: Ifa6b04f868512574de53b6bce507e343f6e219d4
Reviewed-on: https://code.wireshark.org/review/8085
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

SSL/TLS: Add support of TLS Fallback Signaling Cipher Suite Value (SCSV) for Preventing Protocol Downgrade Attacks (RFC 7507)

Update comment about TLS_FALLBACK_SCSV
Add new alert Inappropriate Fallback (86)

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

ISIS: Add TLV 149 support (SID/Label Binding)

Also fixing indentation problem

Bug: 10304
Change-Id: I560db0e8cce9fdf796a47e387f2d681abe54a653
Reviewed-on: https://code.wireshark.org/review/8192
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

CAPWAP: Add CAPWAP MAC Profile (RFC7494)

Add 2 Message Element
* IEEE 802.11 Supported MAC Profiles (1060)
* IEEE 802.11 MAC Profile (1061)

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