Add notes about using CMake + Qt Creator.

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

Multicast Statistics (Qt Dialog): Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

Add FOP 2.0 to the search list.

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

IPv6 RPL: "cmprI" should be "cumprE"

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

Remove space from field description for consistency

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

fc: don't THROW() an exception from a dissector

bring up an expert info and exit

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

cigi: don't THROW() an exception from a dissector

stop the dissection instead and bring up an expert info in the main function

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

[Q.2931] Don't use BASE_EXT_STRING for a value_string, fixes the test
suite

** (process:10080): WARNING **: Invalid value_string_ext ptr for: q2931.atm_identifier

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

Fixed typo in hfinfo_remove_from_gpa_name_map

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

ip: fix ip.hdr_len filter value when the header length is too small

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

Eliminate proto_tree_add_text from packet-q931.c and packet-q2931.c

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

Close packet dialogs when reload Lua plugins.

We could keep the dialogs with the current content if postponing
proto_free_deregistered_fields() until all dialogs are closed.
This would give a feature where the user is able to compare packets
before and after a reload.

Or we could add functions in PacketDialog to reload the packet details
in all open dialogs.  This would give a feature to always have a
updated dialog for all interesting packets.

Change-Id: I805352b65844eafafafc54cd61f08b4605416e64
Reviewed-on: https://code.wireshark.org/review/10201
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Disable streamNumberSpinBox while reloading capture

When changing stream in TCPStreamDialog it should not be possible
to change stream again until the capture has reloaded, because
this will give a crash when doing graph_segment_list_free() or
graph_segment_list_get() while already doing this.

Also disable mouseMove event (showing packet details) while reloading,
as this also will give a crash.

We should consider also having a reload progress bar in the
TCPStreamDialog to indicate that this is happening when having
large capture files, as the main window may not be visible.

Change-Id: I622f9e0de8205bc1fd18101dc03100079d7a2d06
Reviewed-on: https://code.wireshark.org/review/10159
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Check if IPv6 payload length exceeds framing byte length

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

Disable apply button while adding the filter

Pressing multiple apply while reloading the capture file will
give a crash.

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

Lua: Support deregister ProtoField with existing abbrev

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

Eliminate proto_tree_add_text from some dissectors

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

Add some symbols to wtap.h so that we can correctly support 802.11ad.
Currently there are a lot of local hacks in the 802.11ad support and
better support can be provided.

Also add a structure to track 802.11ad (DMG) specific features in the phdr
structure as suggested by Guy Harris.

Also, respond to some suggestions by Guy Harris.

Change-Id: I8459e3986a134a08ee2e31f0158b8aa5c9b91d86
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-on: https://code.wireshark.org/review/10204
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Don't assume we have interface information.

Not all capture file formats provide interface information.  Check
whether we have it, and don't fail if we don't have any.

(Note that the current version of the pcapng specification in the Git
repository does not require that there be at least one IDB in a file,
only that there must be an IDB for each interface to which other blocks
in a file refers.)

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

CBOR: get rid of INFINITY and NAN defines

This triggers an "overflow in constant arithmetic" warning with MSVC2013

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

See if this makes MSVC happy.

It's complaining about an "overflow in constant arithmetic".  Neither
INFINITY nor NAN are specified by C90; C99 specifies that they are both
floats.  Until recently, Microsoft had no interest in C99; if the
version we're using supports C99's INFINITY and NAN, it should be OK to
assign them to a variable (no "arithmetic" involved), so I'm guessing
that the "arithmetic" in question is the use of conditional operators ?
and :, so I'm writing it as an if statement instead.

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

Lua: remove unneeded todo comments

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

Use G_GINT64_MODIFIER, not l, in format strings for 64-bit integers.

64-bit integers are *not* guaranteed to be longs and, in fact, are *not*
longs on ILP32 platforms such as 32-bit UN*Xes and 32-bit Windows and on
LLP64 platforms such as 64-bit Windows.

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

Rename variable to avoid collisions with math.h's exp().

Spell out "mantissa" while we're at it.

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

CBOR: add Concise Binary Object Representation (RFC 7049) dissector

This adds a dissector Concise Binary Object Representation (CBOR) (RFC 7049).
CBOR is a binary data format designed for implementations with small
code size as used in the IoT. It uses a structure similar to JSON, but
encodes the data in binary format. This is used on top of CoAP for
example.

Change-Id: I9d7b7d4f7609c899bfc68250cdfebd5dc64e0402
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/9848
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: Pascal Quantin <pascal.quantin@gmail.com>

dtls: do not try to add a zero-length fragment

fragment_add does not like adding zero-length fragments, it causes a
zero-length memcpy to NULL.

According to RFC 6347, fragment_offset=0 and fragment_length=length is
an unfragmented message, so fragment>0 and fragment_length=length=0 is a
fragmented message.

An empty fragment does not extend a previous message, so ignore it.
Such fragments are produced by at least GnuTLS 3.3.7[1], so raise a
warning instead of an error.

Caught by ubsan:

    epan/tvbuff.c:783:10: runtime error: null pointer passed as argument 1, which is declared to never be null

    #0 0x7f5319f6ed64 in tvb_memcpy epan/tvbuff.c:783
    ...
    #13 0x7f5319f27e2b in fragment_add epan/reassemble.c:1394
    #14 0x7f531a5c70a4 in dissect_dtls_handshake epan/dissectors/packet-dtls.c:1257

 [1]: http://comments.gmane.org/gmane.network.gnutls.general/3582

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

Fix ip_try_dissect() boolean return

If dissector_try_heuristic() succeeds return TRUE and vice-versa.

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

packet-mq: Add new Const/Def for WMQ800 FP3

Add new Const/Def for WMQ800 FP3
Improve Detection of EBCDIC String in MQCONN_REPLY
Add Value in comments

Change-Id: I695a3afa64fee7f22918f68540901c97dfd38464
Reviewed-on: https://code.wireshark.org/review/10012
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
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: Pascal Quantin <pascal.quantin@gmail.com>

[Automatic update for 2015-08-23]

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

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

OSPF: Fix indent (use 4 spaces)

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

Remove some svn $Author$ lines that escaped previous cleanups.
git does keep of this in a much better way anyway.

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

Call the MCS field by its correct name.

Yes, it *should* have been called "HT", but hindsight is always 20-20.

If you want less confusingly named information, look at what the "802.11
radio information" dissector puts into the protocol tree; the radiotap
dissection is for people debugging radiotap implementations or looking
for vendor-specific information that's not (yet) put into the generic
802.11 radio information.

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

[CLI, GTK] comparestat: Fix typos, output format, argument parsing

Optional filter argument wasn't correctly parsed.

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

[GTK] Fix crash in comparestat.c

Selecting a row in the statistics table causes a Glib assertion failure.

GLib:ERROR:ghash.c:373:g_hash_table_lookup_node: assertion failed: (hash_table->ref_count > 0)

When the comparestat_draw() function is called, the cs->ip_id_set hash table
is created and then immediately destroyed, but the hash table lookup
to cs->ip_id_set in new_tree_view_selection_changed() can happen anytime
the user clicks on a table row.

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

Correct logic for finding shadow variables.

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

Fix two bugs
  1) Introduced by me in commit c4fe7129d802752aa4cc89a66d2d5d5f2698e020
     where I didn't honor the "print lsa header only" flag properly for
     data highlighting
  2) Introduced in 2001 with commit dd1b7eafafb5748757a0396f4cc6ad6e65f37483
     which moved offset increasing into an "if (tree)" statement with code
     after the if statement continuing to work with offset.
Also make display of v2 and v3 LSAs the same again (forgot one case in
previous commit.

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

Initialize extcap for pipes

Change-Id: Ia731f281ee9af171c759d7f6f7c614c350cbb4e7
Reviewed-on: https://code.wireshark.org/review/10178
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: Stig Bjørlykke <stig@bjorlykke.org>

Add support for IPv6 stats tree statistics

Also add support for alphabetizing stat tree items as the addition of IPv6 stats tree makes it more obvious its needed.

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

Print two reserved elements as reserved instead of skipping them

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

Small cleanups and improvements
  Show the LSA type and length in the summary line
  Improve a message to make it clear when we are talking about a LLS TLV
  Add an expert item for LLS bit set but data block missing
  PI_MALFORMED is an error not a warning.

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

Add the display filter macros dialog.

Add some missing functionality to UatDialog.

Remove what appears to be unused dfilter macro code.

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

OSPF database packets and OSPF hellos in DC mode are unicast. At
least Cisco sends out these packets with a TTL of 1.

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

Statistics dialog fixups.

Fix the "retap on show" behavior in TapParameterDialog. It was filling
in the tree when it shouldn't have.

Set the capture stop flag when WiresharkDialog closes.

Change-Id: I5e85f11cab32e8b958deabb58186a855b5fcaa84
Reviewed-on: https://code.wireshark.org/review/10186
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 packet comments to the properties dialog.

This pulls in missing functionality from the comment summary dialog.

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

[echld common] Call to fcntl() missing a test for a return value < 0,
indicating failure.

Bug: 11056

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

Lua: check sscanf return value

Wslua's Int64.fromhex() and UInt64.fromhex() need to check the sscanf return
value. Found by coverity (CID 1191368 &1191369).

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

Multicast and wireless lan statistics fixups.

Make sure "-z multicast,stat[,filter]" and "-z wlan,stat[,filter]" work.

Add some missing "-z" items to the man page.

Try to fix some MSVC++ warnings.

Change-Id: Ie18e5355d595e351f000f14d82781dcdf33141c3
Reviewed-on: https://code.wireshark.org/review/10184
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 "ip.version" field to bogus IP for filter matching

Change-Id: Ibb05b8742e41c1b16c1335ad97af99324ab95223
Reviewed-on: https://code.wireshark.org/review/10175
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: Hadriel Kaplan <hadrielk@yahoo.com>

[Kerberos] Call to 'fseek()' without a check for a return value < 0,
indicating failure.

Bug: 11056

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

LWM: fix compilation without libgcrypt

Add HAVE_LIBGCRYPT compilation guards.
Move gcrypt-related variables into the scope they're used.

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

Couchbase: dissect sub-document commands

Add support for dissecting Couchbase sub-document commands (those
which operate on a subset of a whole document).

Example pcap file:
  https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=couchbase_subdoc_multi.pcap

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

Make IPv6 extension header protocol names uniform and consistent with RFC 2460

Example from RFC 2460 (page 7):

  IPv6 header
  Hop-by-Hop Options header
  Destination Options header (note 1)
  Routing header
  Fragment header
  Authentication header (note 2)
  Encapsulating Security Payload header (note 2)
  Destination Options header (note 3)

Change-Id: I03c1ebedf581f71047b303856052609574110c61
Reviewed-on: https://code.wireshark.org/review/10173
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

[Expert] Enhance error output to identify the duplicated field.

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

Allow redefining all ports for RADIUS

RADIUS configuration sometimes uses more ports - for example, one for
authentication, another one for accounting. Sometimes it uses the entire
port ranges. In case of FreeRADIUS 2.x.x server it might look like this:

...
listen {
        type = auth
        ipaddr = *
        port = 13812
}
listen {
        type = acct
        ipaddr = *
        port = 13813
}
...

Unfortunately we allow only one port to be redefined, not more. So it
forces a person who's analyzing a traffic from such a RADIUS server
manually select "Decode as" every time for each port.

It was requested at least once to lift this limitation:

* https://ask.wireshark.org/questions/2189/decode-multiple-ports-as-radius

So let's fix it!

With this commit it's possible to set a port ranges for RADIUS dissector
to handle. An example (default) configuration looks like (see
~/.wireshark/preferences):

radius.ports: 1645,1646,1700,1812,1813,3799

Old "alternate_port" preference is marked as obsolete. It won't be shown
to a user but it will still be used if exists (remained from a previous
installations).

*Ver. 2*:
Old alternate_port value is copied to the ports range, thus making
transition even more smooth.

Change-Id: Ibdd6f4f9fa1e0ac186147cec380bbfc62d509b17
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/10015
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

SSL: refine KEX handling and fix _anon KEX dissecting

Dissecting client and server KEX messages requires to precisely distinguish KEX
algos. For example, Server KEX for DH_anon do not contain a signature, while
DHE_DSS and DHE_RSA do. The patch introduces KEX distinction with full
precision and fixes dissecting _anon KEX messages.

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

Try to fix: wlan_statistics_dialog.cpp:466:1: error: unused parameter \91filter\92 [-Werror=unused-parameter]

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

file-pcapng: always set pinfo->fd->num before calling next layer dissectors/file-pcapng

Also fix an off by 1 error for EPB case

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

GSM_map: Fix indent (use 2 spaces) and add modelines

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

Fix bug with MVRP dissection where only one message was dissected.

Fix whitespace and replace tvb_captured_length with tvb_reported_length

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

Preparation Host Flows: Syntax Line Edit (allow longer filter text)

The "Syntax Line Edit" is based on "QLineEdit". By default, the maximum
permitted length of a QLineEdit text is 32767 (16 bits).

As the "Host Flows" extension uses the Wireshark filter syntax to filter
the data, the filter can be become large. To avoid errors, I increased
the maximum permitted length value to the maximum of quint32.

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

gsm map summary (GTK): fix no previous prototype for ‘gsm_map_stat_gtk_sum_cb’ [-Wmissing-prototypes]

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

SPDY: fix no previous prototype for 'dissect_spdy_heur' [-Wmissing-prototypes]

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

GSM/ANSI/CAMEL...: fix no previous prototype for '*_stat_init' [-Wmissing-prototypes]

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

Fix memory leaks of dumper SHB and IDB infos

Change-Id: I6b81d3e853d503c6a81f9793957b48ab34c6808c
Reviewed-on: https://code.wireshark.org/review/10156
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Generate Diameter's expert info's even when there's no tree so that they show
up in the Expert Infos dialog.

Push the if(tree) check down into the basic type dissectors since we can't
generate/fill the label (which won't be used anyway) when we're not building
the tree (since the proto_item will be faked/NULL).

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

Add some Gx AVPs from 3GPP 29.212.

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

lemonflex: fix warning: no previous prototype for 'df_scanner_*' [-Wmissing-prototypes]

lemonflex-tail.inc:44:1: warning: no previous prototype for 'df_scanner_text' [-Wmissing-prototypes]
lemonflex-tail.inc:50:1: warning: no previous prototype for 'df_scanner_file' [-Wmissing-prototypes]
lemonflex-tail.inc:59:1: warning: no previous prototype for 'df_scanner_cleanup' [-Wmissing-prototypes]

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

proto_dlg: fix no previous prototype for ‘heur_*_all_cb’ [-Wmissing-prototypes]

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

Rename 'ip_next_header_dissector_table' to 'ipv6_next_header_dissector_table' in IPv6 dissector

Provides better readability, the dissector table is only used for IPv6
extension headers.

Change-Id: I87d877a89c6465d4475f2f0a40636ccd1b6cdd92
Reviewed-on: https://code.wireshark.org/review/10174
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

There is no wlan_statistics_dialog.ui.

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

Add the WLAN statistics dialog.

Instead of splitting the stats into two lists as with the GTK+ UI, add
everything to an expandable tree. This allows viewing nodes on more than
one network.

Rename the top-level Bluetooth menu item to Wireless and put the WLAN
stats dialog there.

The Qt UI matches SSIDs (WlanNetworkTreeWidgetItem::isMatch) a bit
differently than the GTK+ UI. Try to make the logic as plain as possible
since we'll likely have to update it in the future.

The addition of a custom BSSID address types means that we can't assume
that everything is AT_ETHER. Add routines for checking for broadcast
BSSIDs and comparing only the data portions of addresses.

Move PercentBarDelegate into its own module. Use it in
WlanStatisticsDialog.

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

BOOTP: fix indent (use tab)

Change-Id: I32ea4d1b9cd8aa351cbdb2bab0642e4ed0c191fb
Reviewed-on: https://code.wireshark.org/review/10169
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

ANSI: Add modelines

Change-Id: I641a9525ec5a6315cc4a2d97506a885605b3504b
Reviewed-on: https://code.wireshark.org/review/10170
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

Camel: Fix indent (use 2 spaces) and add modelines

Change-Id: I6fe835e78e58faabd5cfeeb84e39793b48d3df25
Reviewed-on: https://code.wireshark.org/review/10167
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

Translations: fix typo

coversation => conversation

Found by s3erios (Ukrainian translator)

Change-Id: Iaecb4e139d049c212956fa8567ee480d2f2aa0d2
Reviewed-on: https://code.wireshark.org/review/10152
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

CMake: Fixup appending to WS_WIN_LIBS

In the world of CMake calling "set" with multiple values creates a
semicolon-separated list. For WS_WIN_LIBS we want a single string so we
need to call "set" with a single, quoted value.

Change-Id: I96c5085af58adfb97ce16195eb27cc8ddb612d6a
Reviewed-on: https://code.wireshark.org/review/10158
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

Squelch recent display filter warnings.

Try to keep the main display filter editor from emitting warnings when
we populate the recent item list.

Change-Id: Ib0c150093e03d4d2ca2ac6cd72c0e37d041fe98b
Ping-Bug: 11438
Reviewed-on: https://code.wireshark.org/review/10157
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Tap parameter and stats dialog fixups.

If we run into an error when trying to register a tap listener, return
instead of tapping packets. This should fix some (but likely not all)
double frees found by Stig. For now close each statistics dialog if we
find an error. Note that we might want to keep them open instead.

Add checks and cleanups to some of the stats table free routines.

Call fillTree once in TapParameterDialog's constructor instead of each
time it's shown. Make fillTree a slot which lets us use a delay timer so
that the dialog is visible when we retap packets.

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

Make sure we can apply deprecated display filters.

Deprecated filters are still valid. Update display filter checks to make
sure we can apply them.

Bug: 11438
Change-Id: Ib5e009c070b40912434e0ffd771203ed1e1ba093
Reviewed-on: https://code.wireshark.org/review/10154
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Check for IP version errors in dissect_ip()

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

Link setargv.obj for Windows in CMake so mergecap works

Try it again.

Change-Id: I511dd3d7d70fa33e246085c8cb79925e92945ebc
Reviewed-on: https://code.wireshark.org/review/10148
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

pcapng: Fixed copying if_filter_bpf_bytes

Bug: 11455
Change-Id: Ic99ff1bcd7dad65b3ade5a9f46ce0f64573cb059
Reviewed-on: https://code.wireshark.org/review/10147
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

UDP jumbogram expert info fix

Change-Id: Ifa6170622bc8331097bc3fe9c567c97ce826c340
Reviewed-on: https://code.wireshark.org/review/10140
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-pcapng: differentiate captured length and reported length when calling next dissector and catch bound errors

Otherwise dissection will fail when analyzing a capture with a snap length set

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

file-pcap: differentiate captured length and reported length when calling next dissector and catch bound errors

Otherwise dissection will fail when analyzing a capture with a snap length set

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

file-pcapng: fix dissection of options in blocks

- fix the loop logic
- flags in EPB include link-layer-dependent errors

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

Added a missing break

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

IO Graphs: Don't show unchecked graphs in legend

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

Make empty filter valid in checkFilter

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

Clear display filter when filterPackets with empty filter

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

Link setargv.obj for Windows in CMake so mergecap works

Mergecap needs setargv.obj in order to get wildcard support. This is linked
in nmake but not cmake.

Bug: 10354
Change-Id: Icccf6b36495ac4b376f651d689b4a1f9e2c6042d
Reviewed-on: https://code.wireshark.org/review/10143
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

Get the windows buildbot working for mergecap test suite

Change-Id: Ic9351b9bb8df85086eee3ab21908a2f9a04db767
Reviewed-on: https://code.wireshark.org/review/10141
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

Remove unused struct member from wtap

The 'number_of_interfaces' member of struct wtap is not used - nor is it
needed since the interface_data is a GArray with its own 'len' member.

Change-Id: Id0fb25248dea4bea9fc88a8ea35c09ba55029d89
Reviewed-on: https://code.wireshark.org/review/10138
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Pcap: wtap does not set interface timestamp precision when reading pcap

Like bug 11447, when wiretap reads a legacy PCAP file it needs to
set the interface description's tsprecision member. And like bug
11447, I'm wondering why we have the field to begin with. But I'm
fixing this so that the Windows buildbots can get going again.

Change-Id: I71d0fe2e999ee7d11f1f5cc424681a99e17b1b1b
Reviewed-on: https://code.wireshark.org/review/10139
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

Add more debug infor for windows buildbot test suite failure

Down the rabbit hole we go...

Change-Id: I8371b95b85128209b56960eb6e54648a6babbb84
Reviewed-on: https://code.wireshark.org/review/10137
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

PNRP: capitalize protocol name

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

file-pcapng: remove useless hf_pcapng_timestamp_data entry

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

Try to debug merge test suite failure on windows buildbot

This change will be undone once the problem is found.

Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1
Reviewed-on: https://code.wireshark.org/review/10136
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>

Use system's GeoIP database by default on Debian

Change-Id: I58c1cbb242c20737dd16a0477858b0225c0b5d14
Reviewed-on: https://code.wireshark.org/review/10051
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>

Use system's OpenLayers.js on Debian

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