Show progress in the Supported Protocols dialog.

Make sure we update the UI when building our tree.

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

debian: Build .debs with Qt 5

Change-Id: I085d5332a0a1c8151b5781c0a94cffe2fe32aeb7
Reviewed-on: https://code.wireshark.org/review/10800
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

Initialize 2.1.

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

Fix capitalization in MATE's "you need to restart to reconfigure" message.

Fix up some formatting and white space while we're there.

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

MATE: Add ~ operator support

Bug: 9025
Change-Id: Ica92a7026ba8a89a8970b76e4e7d27f9e6288eb6
Reviewed-on: https://code.wireshark.org/review/10760
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

Qt: fix crash when double clicking on a row in 'Decode As' dialog

No need to register for the destroyed() signal: it is emitted after the new
QComboBox object is created and resetting pointers to NULL is useless as they
are locals initialized in the constructor

Bug: 11532
Change-Id: Ie707cafa370053df846a4732aed20c182e030c40
Reviewed-on: https://code.wireshark.org/review/10792
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Add BASE_PT_ field display types

Avoid displaying duplicate port numbers with transport name resolution disabled and
make some dissector code simpler.

Introduces port_with_resolution_to_str_buf() function and amends UDP/TCP/DCCP/SCTP to
use the new field display type.

Change-Id: Ifb97810b9c669ccbb1a310a2c0ffd6e2b63af210
Reviewed-on: https://code.wireshark.org/review/10625
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

SCTP I-DATA support

Change-Id: I459942b9e3287d500dda517568252d4cb56d3216
Reviewed-on: https://code.wireshark.org/review/10802
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michael Tüxen <tuexen@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>

Make the capture comment icon more Wireshark-y.

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

Fix initialization order.

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

H225, H245 over IPv6

This commit extends h225 and h245 dissectors to support dissection
of ipv6 packets.

Change-Id: Id8c045344711a96f15d619ddd72065aa3712c429
Reviewed-on: https://code.wireshark.org/review/10799
Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com>
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>

Move utf8_entities.h to wsutil

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

Don't count packets twice for average using avg_stat_node_add_value_notick.

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

file.c: fix resource leak reported by Coverity (CID 1159387)

Change-Id: I24f85f41bcb0c3a0dda0b6658dbfdb4098eb64b9
Reviewed-on: https://code.wireshark.org/review/10796
Reviewed-by: Dario Lombardo <lomato@gmail.com>
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: Michael Mann <mmann78@netscape.net>

Qt: fix uninitialized members (UNINIT_CTOR) reported by Coverity (CID 1228882)

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

Qt: fix control flow issues (UNREACHABLE) reported by Coverity (CID 1224614)

Change-Id: I5e59490e0c913f4648fd1024bcf1792a936a39dd
Reviewed-on: https://code.wireshark.org/review/10795
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: Michael Mann <mmann78@netscape.net>

AMQP: Fix warnings and the OSX 10.5 x86 build

The AMQP channel number is 16-bit only.

packet-amqp.c: In function 'dissect_amqp_0_9_method_channel_close':
packet-amqp.c:8481: warning: cast to pointer from integer of different size
packet-amqp.c: In function 'get_conversation_channel':
packet-amqp.c:10512: warning: cast to pointer from integer of different size
packet-amqp.c:10518: warning: cast to pointer from integer of different size

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

Allow use of variadic macros

Remove variadic macros restriction (c99, c++11 feature) from
README.developer. GCC, Clang, MSVC 2005 all support it.

Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when
-Wpedantic is enabled (which would enable -Wvariadic-macros).

For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by
"FOO" and adjust the macro definition accordingly. The nbap dissector
was regenerated after adjusting its template and .cnf file. The
generated code is the same since all files disabled the debug macros.

Discussed at:
https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html
https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html

Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2
Reviewed-on: https://code.wireshark.org/review/10781
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: Guy Harris <guy@alum.mit.edu>

Fix warnings introduced by "Qt: Initial RTP playback"

Change-Id: I28ae077be535f32ef81ac370d6782033f219017d
Reviewed-on: https://code.wireshark.org/review/10777
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix typos in rtp_player_dialog files

Change-Id: I0df33dc156601187a6a180d8786ef18c5c05467a
Reviewed-on: https://code.wireshark.org/review/10787
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

AMQP: Navigation between publish/delivery and related ack/nack

This patch adds cross-references between publish/delivery and
ack/nack frames. This improves user comfort when inspecting the traffic.

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

Qt: Don't update the recent list while capturing.

If a recent file is on a network share we'll create traffic which can
show up in the capture.

This doesn't fix the issue entirely, e.g. if you're capturing in one
instance of Wireshark and have another one open. The proper fix in that
case is to switch to QFileSystemWatcher as described at the top of
::WiresharkApplication.

Ping-Bug: 11546
Change-Id: If21f1bb213fe1d862c09b1b2edd78c8baf983461
Reviewed-on: https://code.wireshark.org/review/10774
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

Remove tr() for setObjectName

Change-Id: I4561ded123df3c2152da543e8a6786cb8b386dd5
Reviewed-on: https://code.wireshark.org/review/10790
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: Michael Mann <mmann78@netscape.net>

UDP: Make port column info similar to TCP, add length information

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

wslua: fix crash when a LUA error is raised in TRY block

The dissect_tcp_pdus function in LUA is passed two LUA functions that
get the PDU length and the dissect a PDU. When one of these functions
fail, a longjmp is made to the the caller of lua_pcall.

This is no problem for the PDU length function, but the PDU dissect
function is wrapped in a TRY/CATCH/ENDTRY block which also uses longjmp
and need to be fully executed. Without doing so, LUA exceptions will
crash on a weird location (except_pop).

Fix the crash by not using luaL_error, but throw dissector errors which
properly breaks out of the tcp_dissect_pdus C function and then convert
it to a LUA error such that the dissector can handle it.

Test with `tshark -X lua_script:crash.lua -r ssl.pcap`:

    trivial_proto = Proto("trivial", "Trivial Protocol")
    function dissect_foo(tvb, pinfo, tree)
        error("triggering a LUA error");
    end
    function get_pdu_len(tvb, pinfo, tree) return 5; end
    function trivial_proto.dissector(tvb, pinfo, tree)
        dissect_tcp_pdus(tvb, tree, 5, get_pdu_len, dissect_foo)
    end
    tcp_table = DissectorTable.get("tcp.port")
    tcp_table:add(443, trivial_proto)

It should not crash and will print this:

    Lua Error: dissect_tcp_pdus dissect_func: [string "crash.lua"]:3: triggering a LUA error

Change-Id: Ibd079cc5eb3a2e4d2e62ea49a512fa2cc8e561ea
Reviewed-on: https://code.wireshark.org/review/10685
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>

bacapp: attempt to fix windows build

Reported by Graham:

    packet-bacapp.c(5299) : warning C4146: unary minus operator applied to unsigned type, result still unsigned

Regression in v1.99.10rc0-330-g71ec57a ("bacapp: fix
-Wshift-negative-value").

Change-Id: Ia3ea3acad3afdf7b8a449224c815ea45d7fdbc2b
Reviewed-on: https://code.wireshark.org/review/10785
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

UDP: Rename UDPlite to UDP-Lite

Keep "UDPLite" in ipproto.c in accordance with the IANA Considerations
section of RFC 3828.

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

Expand, correct, and otherwise improve comments.

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

qt: fix crash when dragging RTP player out of view

Fix invalid memory access when dragging the RTP player out of view when
a stream is selected. lowerBound() returns QMap.end() when no item is
found, use that instead.

Found using ASAN.

Change-Id: I5444a047bc242dfe481bd0581c5217030fca28f1
Reviewed-on: https://code.wireshark.org/review/10778
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

[isns]: use proto_tree_add_bitmask() for the iscsi node type

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

Fix various memleaks

Found by starting Wireshark within an empty profile, opening
Preferences, search for Protocol "IEEE 802.11" (because it has radio
buttons), then close everything again.

Many fixes are trivial, but the various recent_read_* functions in
recent.c were changed to return a boolean such that the result can
always be checked even if errno==0.

QButtonGroup leak was hinted by Clang Static Analyzer, all other
memleaks were found using ASAN/LSan.

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

[Automatic update for 2015-10-04]

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

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

Fix shortening error introduced by commit f28e23f1

Change-Id: I6cab511f65a8ec89e7fa05cdacc9bb11ca0901ce
Reviewed-on: https://code.wireshark.org/review/10779
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

bacapp: fix -Wshift-negative-value

Shifting a negative signed value is undefined. Found by Clang.

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

Add preference to dissect DHCPv6 option 18 as a CableLab option.

Bug: 9877
Change-Id: I84fbfb0ae2dcfc98b005b0f4243d07bd929bb195
Reviewed-on: https://code.wireshark.org/review/10773
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 NTP authentication dissection.
It just dissects the fields, it doesn't do any decryption.

Also general cleanup while in the neighborhood.

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

Added cotp_is to heuristic dissector list for ISO transport.

S7 communication is also possible without TCP/IP.
This ISO transport uses the following protocols:
LLC->ISO8473->ISO8073->s7comm.
The cotp dissector has two subdissector lists.
cotp is uses with ISO-on-TCP, cotp_is with ISO transport.

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

IPv6: don't call expert_info on if(tree)

Change-Id: Ie915a60aba3190bdb7acb4dc364fbe58f3e90007
Reviewed-on: https://code.wireshark.org/review/10673
Reviewed-by: João Valverde <j@v6e.pt>
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: Evan Huus <eapache@gmail.com>

COMPOSE_FRAME_TYPE(fcf) is stored in frame_type_subtype.

At that point, we've calculated COMPOSE_FRAME_TYPE(fcf) and stored it in
frame_type_subtype; use that variable.

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

Expand some comments.

Fix some indentation while we're at it.

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

Remove incorrect comment.

(-1 means "we don't know whether there's an FCS", not "there's no FCS".)

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

Fill in some 11ac fields in the pseudo-header.

But don't look for any VHT stuff unless FLAGS_CHAN_VHT is set.

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

Windows: add missing folders to uninstaller

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

IPv6: store address in pinfo->pool instead of putting it on the stack

Otherwise memory is no more available when printing fields
Regression introduced in gf693b4d

Bug: 11566
Change-Id: I51bd4d813363663c7f99ab8edf6439d87130e279
Reviewed-on: https://code.wireshark.org/review/10761
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>

ixveriwave: initialize vw_msdu_length

Remove an unused field while we are at it

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

If we don't have an NDP flag, make it 0.

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

Clean up whitespace.

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

Fix some issues with Series III.

The packet data in some records has an FCS and in some records doesn't.
It appears that only the Series III packets do.  Handle that.

Handle HT and VHT information supplied by Series III.

Get rid of an unused include while we're at it, and make the checks for
whether the protocol tree is being built a bit clearer, by testing the
tree pointer we'll actually be using.  Make some style cleanups.  Get
rid of some unused cruft.

Fix FPGA version checks.

This is based on Ixia's patches to an older version of Wireshark, but is
much cleaned up.

Bug: 11464

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

arp: fix typo in switch (CID 1250809)

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

Add another speex cast.

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

Use QVector::size instead of ::length.

Qt < 5.2 doesn't have ::length.

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

Revert "CMake: Don't feed -fPIC to Visual C++."

This doesn't appear to fix the issue unfortunately.

This reverts commit fd5eafa50a77bc319a240727600be38307e54f86.

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

Add casts to the speex resampler.

Try to fix

speex/resample.c:294: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:294: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:324: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:419: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:536: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:632: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:638: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:645: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:697: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:699: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:817: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:818: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:819: warning: implicit conversion shortens 64-bit value into a 32-bit value

on the 64-bit OS X builder.

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

Fix indentation after previous change.

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

Rename vwr_read_s2_W_rec - it handles both series II and III records.

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

Distcheck fixes.

Add more speex files to the distribution.

Comment out a for-now-unused variable.

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

More formatting cleanups (no space between "no" and comma).

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

Get rid of unused variable.

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

Clean up formatting.

Fix "a ,b" to "a, b" in both code and displayed output.

Indent continuation lines of multi-line statements.

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

Qt: Show the QtMultimedia status.

Show the QtMultimedia status in the compiled version info instead of
PortAudio.

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

Qt: Initial RTP playback.

Note the "initial". This is woefully incomplete.  See the "to do" lists
below and in the code.

This differs a bit from the GTK+ version in that you specify one or more
streams to be decoded.

Instead of showing waveforms in individual widgets, add them all to a
single QCustomPlot. This conserves screen real estate and lets us more
easily take advantage of the QCP API. It also looks better IMHO.

Change a bunch of checks for QtMultimediaWidgets to QtMultimedia. We
probably won't use the widgets until we make 5.0 our minimum Qt
version and plain old QtMultimedia lets us support Qt 4 more easily
(in theory at least).

Add resampling code from libspeex. I initially used this to resample
each packet to match the preferred rate of our output device, but this
resulted in poorer audio quality than expected. Leave it in and use to
create visual samples for QCP and to match rates any time the rate
changes. The latter is currently untested.

Add some debugging macros.

Note that both the RTP player and RTP analysis dialogs decode audio data
using different code.

Note that voip_calls_packet and voip_calls_init_tap appear to be dead
code.

To do:

- Add silence frames where needed.
- Implement the jitter buffer.
- Implement the playback timing controls.
- Tapping / scanning streams might be too slow.

Change-Id: I20dd3b66d3df53c9b1f3501262dc01458849f6b4
Bug: 9007
Reviewed-on: https://code.wireshark.org/review/10458
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

CMake: Don't feed -fPIC to Visual C++.

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

[isns] replace THROW() with an expert info

this removes 37 THROW() calls
do some minor reformatting while at it

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

Conversation filter address types for IEEE 802.11 should include WLAN Address types

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

Add support for the FSCTL_QUERY_FILE_REGION FSCTL.

Found when looking at support for HyperV under Samba.

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

CMake: Fix the dmg_package target.

We don't have Wireshark.pkgproj so don't try to copy it.

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

Try to fix the NMake + QMake build.

Add supported_protocols_dialog.cpp to Wireshark.pro.

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

Set the minimum Qt version to 4.7.

We've been using QElapsedTimer for a while now with no complaints. It
was introduced in Qt 4.7, which was first released in September 2010.

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

Add the supported protocols internals dialog.

Includes a bonus search field.

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

CMake: OS X packaging updates.

Add a dmg_package_prep target as an alias to app_bundle. Rename the
osx-dmg target to dmg_package. This matches the Windows packaging
target names.

In osx-app.sh, make sure we rpathify the bundle plugin directory.

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

Treat IPv4 subnet masks as distinct from addresses

While IPv4 subnet masks are obviously related and similar to IPv4
addresses, they are distinct enough that they need to be treated
seperately in some aspects.  For instance, there is no value in
attempting to resolve a subnet mask.

This change creates a new display type: BASE_NETMASK, which allows distinction from FT_IPv4
(and possible name resolution) where appropriate.

Change-Id: I99e19c9a58eb613f8e58d481af84c30e2e5e14d7
Reviewed-on: https://code.wireshark.org/review/10438
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix crashes related to RTP Streams analysis

The data that describes RTP streams become invalid when packets are
re-dissected. This results in a crash in GTK when the "RTP Analyse"
option is used and and a crash in Qt when the display filter is changed
while the RTP Streams dialog is open.

Fix this by adding a tap_reset callback (modelled after mcaststream) to
the RTP tap listener that allows the GTK+ and Qt dialogs to clear the
displayed list of RTP streams.

Bug: 10016
Change-Id: I7478678db63d7ac8110c44c163844e9f66fad9e9
Reviewed-on: https://code.wireshark.org/review/10728
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: Michael Mann <mmann78@netscape.net>

Revert "gtk: Fix crash on Analyze RTP stream"

Qt is affected by a similar issue, a different approach is needed.

This reverts commit 01bd832b9df9570ddfd81ab4985f71ff6abd9b12.

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

IPv6: Remove two offsetof()s

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

Add the conversation hash tables internals dialog.

The GTK+ version dumps "new" and "old" hash values. It looks like
neither are valid since the code in conversation.c and
conversation_hashtables_dlg.c have diverged.

For now just dump the addresses and ports for each hash table in the Qt
UI.

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

Add dissection of 3GPP AVP 655 refactor to use proto_tree_add_bitmask_with_flags() in some cases.

Part 2

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

OS X: Integrate CMake and osx-dmg.sh

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

[Diameter] Add dissection of 3GPP AVP 655 refactor to use
proto_tree_add_bitmask_with_flags() in some cases.

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

Revert "SCTP: Add I_DATA support"

This reverts commit 4e9361dc88eefef27d031e29e2f8ca9891cc03eb.

Change-Id: Ia7aee9ffbe5bc5d3ae88e957c234cbee7b65f457
Reviewed-on: https://code.wireshark.org/review/10723
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>

Revert "Fix typos."

This reverts commit e47ea6d7493c60e1761da4f5fbb6bee68fdb5847.

Change-Id: Ia5b7f5cdb1f17705010ac60bd2105156014f6d00
Reviewed-on: https://code.wireshark.org/review/10721
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>

ZigBee: fix dissection of Link Status Address field

Bug: 11564
Change-Id: I4320c794a0b6ba1693e2729eea424a0a43cf54d8
Reviewed-on: https://code.wireshark.org/review/10715
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: Alexis La Goutte <alexis.lagoutte@gmail.com>

Fix typos.

Change-Id: I3c03cbb064d1d7ffd579982b2e670b84b1768db2
Reviewed-on: https://code.wireshark.org/review/10717
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>

SCTP: Add I_DATA support

Change-Id: Ib8566b7d94fdafdb9735b356d129f378c94af3cf
Reviewed-on: https://code.wireshark.org/review/10716
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>

[Diameter] Add 3GPP AVP 652-655

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

It's "-Wno-XXX", not "-WnoXXX".

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

Another big hammer to shut Apple's deprecation squealing up.

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

Add more CORBA dissectors back to the dirty list.

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

[isns] refactor the attribute parsing code

* go through the data only once, increment offset along the way
* remove tag, length dissection from the payload functions
* handle all undecoded elements in the default case
* don't bring up an exception for an invalid ip address length,
  proto_tree_add_item() already does this for us
* replace the payload functions for string, integer, ip address
  with proto_tree_add_item()

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

DNS: Replace cinfo by pinfo->cinfo (no longer need to check if cinfo is not NULL)

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

DNS: Fix Col Info display (Missing space between rcodes)

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

Use a 'recent' setting to persist the checkbox controlling the source of PDUs to use in LTE RLC statistics

Change-Id: I20234c3a3bf7761f70b0db5a6acbbf54ffbfcef5
Reviewed-on: https://code.wireshark.org/review/10699
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

qt: warn when jumping to an invalid packet number

I was confused when double-clicking a packet number did not work. It
turns out that the display filter was hiding the destination.

Check the packet number for sanity, just like GTK+ does.

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

wslua: do not pop from empty stack on newer LUA versions

Fixes this failure:

    tshark: lapi.c:175: lua_settop: Assertion `(-(idx+1) <= (L->top - (func + 1))) && "invalid new top"' failed.

Found using LUA 5.2 compiled with -DLUA_USE_APICHECK. Note that the
value returned by luaopen_bit does not affect the size of the stack
after using lua_call; if there are excess return values, then these will
be dropped after calling lua_call. See http://www.lua.org/pil/26.2.html

I also verified that the stack is still empty after calling all
wslua_reg_module functions.

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

gtk: Fix crash on Analyze RTP stream

When updating the RTP streams list, the data associated with the current
selection becomes invalid when the old list is cleared.
gtk_list_store_clear somehow triggers the selection callback which
attempts to access the invalid memory.

Avoid this by disabling selectability while clearing the list.

Bug: 10016
Change-Id: Id5126ec5ffa41fa6a65339f4453546223124ed67
Reviewed-on: https://code.wireshark.org/review/10690
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: Peter Wu <peter@lekensteyn.nl>

nwp: add support for NWP packets

Neighborhood Watch Protocol (NWP) is an XIA protocol for resolving network
addresses to link-layer addresses. Hosts on a LAN send NWP Announcement
packets with their host identifiers (HIDs), and neighbors in the LAN respond
with NWP Neighbor List packets containing their HIDs and associated link-layer
addresses.

Bug: 11492
Change-Id: Ib1e801474b1aa72f5dd3d8303eeec36b96ee0a99
Reviewed-on: https://code.wireshark.org/review/10316
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>

automake: get docbook builds working for out of (source) tree builds.

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

IPv6: Remove extra spacing from info arrays.

Internal formatting: remove extra spacing from 'hf_register_info' array
(as suggested during review), plus indentation changes. Do the same
for expert info array.

External formatting: Minor cleanups.

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

[ieee80211] Fix: "DSCP Range description user priority" off by 1

Bug: 11555
Change-Id: Ic12c7882dbe4f6eca72f7eed3ee8d0e5618afdd8
Reviewed-on: https://code.wireshark.org/review/10695
Reviewed-by: Bill Meier <wmeier@newsguy.com>

file.c: do not rescan packets is no capture file is opened

Otherwise we will end up calling cf_cb_file_rescan_started and cf_cb_file_rescan_finished callbacks while no capture file is available

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

Add back DIRTY_CORBA_IDL_DISSECTOR_SRC.

Add DIRTY_CORBA_IDL_DISSECTOR_SRC back to our various makefiles and move
packet-cosnaming.c back to it.

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