metze/wireshark/wip.git
3 years agoAUTHORS: More column alignment improvements
João Valverde [Mon, 7 Mar 2016 16:39:16 +0000 (16:39 +0000)]
AUTHORS: More column alignment improvements

Change-Id: I29d08ca213df44c1d6d437135c45a3d6e45efa7d
Reviewed-on: https://code.wireshark.org/review/14386
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoRemove ADNS support
João Valverde [Wed, 16 Mar 2016 22:11:17 +0000 (22:11 +0000)]
Remove ADNS support

Relevant mailing list message:

  https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html

Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2
Reviewed-on: https://code.wireshark.org/review/14519
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoFix building without extcap enabled
João Valverde [Fri, 18 Mar 2016 17:31:09 +0000 (17:31 +0000)]
Fix building without extcap enabled

Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap.

Some documentation fixes too.

Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99
Reviewed-on: https://code.wireshark.org/review/14522
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoBugfix "typo" from I9b04837f93
Michael Mann [Sun, 20 Mar 2016 21:53:59 +0000 (17:53 -0400)]
Bugfix "typo" from I9b04837f93

Change-Id: Iafc67ced1af0fbb27545acb0e1569b8b8ccd9451
Reviewed-on: https://code.wireshark.org/review/14544
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>
3 years agoENIP: Add request/response arrows for related packets
D. Ulis [Sun, 20 Mar 2016 19:56:15 +0000 (15:56 -0400)]
ENIP: Add request/response arrows for related packets

Change-Id: I0fbaa0569be3aafa85156cea6b7f5220c2d5e118
Reviewed-on: https://code.wireshark.org/review/14542
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoURL for the document in question.
Guy Harris [Sun, 20 Mar 2016 20:36:17 +0000 (13:36 -0700)]
URL for the document in question.

Change-Id: Id92c484099bdcd71c0ff194abeefda4bab8dcd6e
Reviewed-on: https://code.wireshark.org/review/14543
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoAdd missing auth switch values to value_string
Daniël van Eeden [Sun, 20 Mar 2016 10:12:06 +0000 (11:12 +0100)]
Add missing auth switch values to value_string

Change-Id: Ie602d76dfd2366294f2599f6c4d8634d37c6531c
Reviewed-on: https://code.wireshark.org/review/14535
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoAdd CLIENT_DEPRECATE_EOF flag
Daniël van Eeden [Sun, 20 Mar 2016 14:42:38 +0000 (15:42 +0100)]
Add CLIENT_DEPRECATE_EOF flag

This is used in MySQL 5.7
https://dev.mysql.com/doc/internals/en/capability-flags.html#flag-CLIENT_DEPRECATE_EOF

Change-Id: I8e00c966628233181e7145d8ed80d51f2acd9517
Reviewed-on: https://code.wireshark.org/review/14536
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFix response ok packet with no session tracking info but flag set
Daniël van Eeden [Sun, 20 Mar 2016 15:26:49 +0000 (16:26 +0100)]
Fix response ok packet with no session tracking info but flag set

Change-Id: I901ebc2128c92ef758b6b400cc8d86488a2115cb
Reviewed-on: https://code.wireshark.org/review/14537
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoCreate call_data_dissector() to call data dissector.
Michael Mann [Sun, 20 Mar 2016 00:33:14 +0000 (20:33 -0400)]
Create call_data_dissector() to call data dissector.

This saves many dissectors the need to find the data dissector and store a handle to it.

There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.

Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFix incorrect table being used to store Session Tickets
Adam Schwalm [Thu, 17 Mar 2016 00:12:14 +0000 (19:12 -0500)]
Fix incorrect table being used to store Session Tickets

A regression was introduced at f4580ac9edc8b5351 where an additional
hash table was introduced to store TLS Session Tickets separately
from Session IDs. However, the New Session Ticket dissector was
still storing the the Session Ticket in the ID table, causing lookups
to fail.

Change-Id: Iff49202f50afb8cb6ef62c774f6155682b8e48a6
Reviewed-on: https://code.wireshark.org/review/14499
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoRTPS: Added new filters rtps.guidPrefix.src and rtps.guidPrefix.dst
Juanjo Martin [Mon, 14 Mar 2016 11:22:10 +0000 (12:22 +0100)]
RTPS: Added new filters rtps.guidPrefix.src and rtps.guidPrefix.dst

As well as in the rest of network protocols, in RTPS we have senders
and receivers of data. The atomic unit is not the host address (IP)
or the host address and port (UDP) but the guidPrefix. The guidPrefix
represents a single DomainParticipant, that very likely will be an
application. I have added filters to be able to differentiate from
source of information and destination of information. Before, the
only filter available was rtps.guidPrefix

Change-Id: I810d8b043796119c6e381bdbcb6061e0525ea272
Reviewed-on: https://code.wireshark.org/review/14466
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years ago[Automatic update for 2016-03-20]
Gerald Combs [Sun, 20 Mar 2016 15:09:39 +0000 (08:09 -0700)]
[Automatic update for 2016-03-20]

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

Change-Id: I1c1b5c902782d9250eab3341ff56e09f79c4c0e3
Reviewed-on: https://code.wireshark.org/review/14532
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoPKTC must be stricter with its Kerberos application choices.
Michael Mann [Sat, 19 Mar 2016 01:06:51 +0000 (21:06 -0400)]
PKTC must be stricter with its Kerberos application choices.

The PKTC dissector calls the Kerberos dissector assuming certain application values.  Because different application values can have different "private" data, corruption can occur.
Ensure the Kerberos application values match the preceding comments by checking the ber identifier before calling the Kerberos dissector.

Bug: 12206
Change-Id: I9b04837f93a56681cae3816278315cf01da17544
Reviewed-on: https://code.wireshark.org/review/14520
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>
3 years agoFix CMake target FOLDER properties
Graham Bloice [Sat, 19 Mar 2016 23:36:22 +0000 (23:36 +0000)]
Fix CMake target FOLDER properties

Add FOLDER properties to targets to clean up the presentation
in Visual Studio.

Change-Id: I35a175175db055443572c58a069879061fdcf0a3
Reviewed-on: https://code.wireshark.org/review/14528
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoManually add protocol dependencies derived from find_dissector.
Michael Mann [Wed, 16 Mar 2016 13:02:52 +0000 (09:02 -0400)]
Manually add protocol dependencies derived from find_dissector.

Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector.  Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector.
"data" dissector was not considered to be a dependency.

Change-Id: I15d0d77301306587ef8e7af5876e74231816890d
Reviewed-on: https://code.wireshark.org/review/14509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoStart work on API to generate protocol dependency tree.
Michael Mann [Sun, 13 Mar 2016 03:11:03 +0000 (22:11 -0500)]
Start work on API to generate protocol dependency tree.

Dissector and heuristic tables now setup protocol dependencies.
"Manual" dependencies in separate patch.

Ping-Bug: 1402
Change-Id: I8da1239306de8676dcb05f8807914376816fc44f
Reviewed-on: https://code.wireshark.org/review/14447
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFix compiling with CTDEBUG=1
Daniël van Eeden [Sat, 19 Mar 2016 19:33:47 +0000 (20:33 +0100)]
Fix compiling with CTDEBUG=1

Change-Id: Idf36ebd7ceb3f87ceb6a68774f5b2810f8cf7b58
Reviewed-on: https://code.wireshark.org/review/14527
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>
3 years agoRemove unused header field.
Jaap Keuter [Sat, 19 Mar 2016 12:06:37 +0000 (13:06 +0100)]
Remove unused header field.

Removing setting up and decoding for a header field which
never can be used anyway.

Change-Id: Ieed7810dd654df944a5bd16a7b84d3367bf9fa14
Reviewed-on: https://code.wireshark.org/review/14524
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoMake sure first byte in ACAP packet is printable.
Michael Mann [Sat, 19 Mar 2016 02:31:33 +0000 (22:31 -0400)]
Make sure first byte in ACAP packet is printable.

Saves some false positives for protocols using port 674.

Bug: 12265
Change-Id: I7cb8aa9318639db0822b05b8c5b6f6563d8d4afc
Reviewed-on: https://code.wireshark.org/review/14521
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>
3 years agoDocBook: Don't require xmllint.
Gerald Combs [Fri, 18 Mar 2016 00:19:18 +0000 (17:19 -0700)]
DocBook: Don't require xmllint.

Remove dependencies on xmllint. We don't write DocBook by hand any more
and we haven't used it in a long time in the CMake builds.

Change-Id: Ic07f03b00c4554c058eece0462b0925d565b6da1
Reviewed-on: https://code.wireshark.org/review/14506
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years ago6lowpan: proto_tree_add_item() can be used directly for an FT_UINT64
Martin Kaiser [Fri, 18 Mar 2016 13:47:18 +0000 (12:47 -0100)]
6lowpan: proto_tree_add_item() can be used directly for an FT_UINT64

Change-Id: I3f43fc9b0951822dd2ec3aba85af993e20c549d3
Reviewed-on: https://code.wireshark.org/review/14515
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agocmake: Remove extcap from include directories
João Valverde [Fri, 18 Mar 2016 17:54:12 +0000 (17:54 +0000)]
cmake: Remove extcap from include directories

Change-Id: Ia521aaa6ace14df5a6c02e0dd1c8336df41ac180
Reviewed-on: https://code.wireshark.org/review/14517
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years ago6lowpan: remove a ton of if (tree) checks
Martin Kaiser [Fri, 18 Mar 2016 13:37:41 +0000 (12:37 -0100)]
6lowpan: remove a ton of if (tree) checks

Change-Id: Idff3eda741e62bfe5b00f30760bcc8af0e8e5df5
Reviewed-on: https://code.wireshark.org/review/14514
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
3 years agoiso14443: fix the dissection of ATQA
Martin Kaiser [Sun, 6 Mar 2016 16:35:39 +0000 (17:35 +0100)]
iso14443: fix the dissection of ATQA

the two bytes are sent LSB first
all fields are defined relative to the entire 16bit value

Change-Id: Iaea2b98fcb1f57224fbbd1c4c58473a7f810055d
Reviewed-on: https://code.wireshark.org/review/14513
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
3 years agoIEEE 802.1Q/VLAN: Resolve ID to a describing name
Uli Heilmeier [Sun, 13 Mar 2016 22:16:20 +0000 (23:16 +0100)]
IEEE 802.1Q/VLAN: Resolve ID to a describing name

A vlans file in the personal preference directory add an option to resolve
VLAN IDs to a describing name.

Format of vlan file is
123\tName of VLAN

To enable the resolving the preference nameres.vlan_name must be set
to TRUE.

Bug: 11209
Change-Id: I3f00b4897aace89c03c57b68b6c4b6c8b7d4685a
Reviewed-on: https://code.wireshark.org/review/14471
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoQt: Use single-dash option for Qt4 compatibility
João Valverde [Fri, 18 Mar 2016 03:42:29 +0000 (03:42 +0000)]
Qt: Use single-dash option for Qt4 compatibility

Change-Id: Ib8a52eca74ac63704a31b4b48da936abb6a6331b
Reviewed-on: https://code.wireshark.org/review/14511
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoINAP (ASN1): fix indent (use 2 spaces) and modelines info
Alexis La Goutte [Thu, 17 Mar 2016 18:54:39 +0000 (19:54 +0100)]
INAP (ASN1): fix indent (use 2 spaces) and modelines info

Change-Id: I45b48c1e89ff68b1d990cd7cff9dd180cf4a1f7f
Reviewed-on: https://code.wireshark.org/review/14505
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>
3 years agoClamp down on address data structure usage and AT_NONE semantics
João Valverde [Mon, 29 Feb 2016 16:51:18 +0000 (16:51 +0000)]
Clamp down on address data structure usage and AT_NONE semantics

Catch errors like bug 12205 with an assertion.

Change-Id: I17381c92dfb22912e53eb20f6436adfa15d67e71
Reviewed-on: https://code.wireshark.org/review/14251
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoautotools: Generate Qt Resource Compiler source in /ui/qt dir
João Valverde [Sat, 12 Mar 2016 19:10:59 +0000 (19:10 +0000)]
autotools: Generate Qt Resource Compiler source in /ui/qt dir

Change-Id: I0acdc1ea4d2110111a5506104e5075962f580bd5
Reviewed-on: https://code.wireshark.org/review/14438
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoASTERIX: fix for wrong RE and SP fields in CAT048.
Marko Hrastovec [Thu, 17 Mar 2016 16:12:50 +0000 (17:12 +0100)]
ASTERIX: fix for wrong RE and SP fields in CAT048.

Bug: 12267
Change-Id: I4871da19cb8b11e2df0de13993350a71168f7ab4
Reviewed-on: https://code.wireshark.org/review/14502
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years ago[INAP] In dissect_returnErrorData in the .cnf file the parameter_pdu
AndersBroman [Thu, 17 Mar 2016 16:14:16 +0000 (17:14 +0100)]
[INAP] In dissect_returnErrorData in the .cnf file the parameter_pdu
calls must return offset.
Fixes https://ask.wireshark.org/questions/50998/issue-decoding-inap-systemfailure-parameter

Change-Id: Idceb5f2576f8249d4a04b0a3612b5b1ef67f7093
Reviewed-on: https://code.wireshark.org/review/14501
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>
3 years agowsutil: Split locale information into tokens and format it
João Valverde [Sat, 12 Mar 2016 15:59:10 +0000 (15:59 +0000)]
wsutil: Split locale information into tokens and format it

The locale information returned by setlocale() can be a very long unbroken
string. This makes the text dialog too wide without line wrapping and in
some cases it spans outside the screen border.

Add some commas to improve readability and help GTK+ render it properly.

Change-Id: Ia7913550ada3ebaac9c783e9ac1b202dbe1563fc
Reviewed-on: https://code.wireshark.org/review/11961
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>
3 years agoextcap-base: remove print of version if no interfaces present.
Dario Lombardo [Wed, 2 Mar 2016 13:58:52 +0000 (14:58 +0100)]
extcap-base: remove print of version if no interfaces present.

When no interfaces are available (as with androiddump when adb
is not running) version is not printed anymore, for a cleaner
output.

Change-Id: Ia150a58ff1c04e412ff29a540f18e1fe9612f633
Reviewed-on: https://code.wireshark.org/review/14289
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoAssociate dissector tables and heuristic subdissector lists with a protocol.
Michael Mann [Sun, 13 Mar 2016 11:51:45 +0000 (07:51 -0400)]
Associate dissector tables and heuristic subdissector lists with a protocol.

This will make it easier to determine protocol dependencies.

Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used)

Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d
Reviewed-on: https://code.wireshark.org/review/14446
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agossl: add more TLS extensions
Hauke Mehrtens [Thu, 3 Mar 2016 23:02:51 +0000 (00:02 +0100)]
ssl: add more TLS extensions

These extensions were added in the last time.
This just adds the basic part, wireshark is now able to translate the
number into a string. these numbers are defined here:
https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml

Change-Id: I9d1f1a04318aa116930202aa0fadb59648bed78d
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/14484
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoMore control frame dissection cleanups.
Guy Harris [Wed, 16 Mar 2016 21:43:19 +0000 (14:43 -0700)]
More control frame dissection cleanups.

Get rid of most tests of tree, so we always step through the packet.

Change-Id: I0b54aecd7e871d9d48fc03f387131f0f6034b42f
Reviewed-on: https://code.wireshark.org/review/14496
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoFix dissection of control frames.
Guy Harris [Wed, 16 Mar 2016 19:36:38 +0000 (12:36 -0700)]
Fix dissection of control frames.

Don't conditiionalize stuff that should always be done with a test of
whether the protocol tree is being constructed or not.

Don't add an extra bogus address field to CF-End frames.

Bug: 12266
Change-Id: I0840d63480f9d7d8ffa434d984082a4a46a00d12
Reviewed-on: https://code.wireshark.org/review/14493
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoIndicate where ACAP is specified.
Guy Harris [Wed, 16 Mar 2016 08:05:25 +0000 (01:05 -0700)]
Indicate where ACAP is specified.

Change-Id: I5a153b6d340f468b9835c3a0adee195807d7cae1
Reviewed-on: https://code.wireshark.org/review/14489
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoNo need to operate on full bit width (CID 1355344 / 1355348)
Jaap Keuter [Mon, 7 Mar 2016 21:21:35 +0000 (22:21 +0100)]
No need to operate on full bit width (CID 1355344 / 1355348)

When giving the full bit width to sign extend there's nothing
left, so return the value straight away (a NULL op).

Change-Id: I48e6612b6a7c89c0a9ddad0974bb83e7c8e0c22d
Reviewed-on: https://code.wireshark.org/review/14390
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agossl: add extra supported ECC/DH groups
Hauke Mehrtens [Thu, 3 Mar 2016 23:03:55 +0000 (00:03 +0100)]
ssl: add extra supported ECC/DH groups

These new groups are defined by IANA here:
https://www.iana.org/assignments/tls-parameters/tls-parameters.xml

Change-Id: I29e0710d853e172c27b8989b21f7b29535bfc521
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/14485
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agossl: update tls protocol number for draft-ietf-tls-chacha20-poly1305
Hauke Mehrtens [Thu, 3 Mar 2016 22:48:48 +0000 (23:48 +0100)]
ssl: update tls protocol number for draft-ietf-tls-chacha20-poly1305

This updates the protocol number to the latest draft.
These numbers are now defined by the IANA here:
https://www.iana.org/assignments/tls-parameters/tls-parameters.xml

Change-Id: Ibb7eb532da86c092ec1476451fb85c1656163e13
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/14483
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years ago[RADIUS] Fix up formatting.
Jeff Morriss [Tue, 15 Mar 2016 00:39:37 +0000 (20:39 -0400)]
[RADIUS] Fix up formatting.

Remove a couple useless if(tree)'s while in there.

Change-Id: Ie8de360f4590806eab0a4704b410341918251586
Reviewed-on: https://code.wireshark.org/review/14488
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agoMore "FT_BOOLEAN is 64-bit" fixes.
Guy Harris [Tue, 15 Mar 2016 23:08:06 +0000 (16:08 -0700)]
More "FT_BOOLEAN is 64-bit" fixes.

Change-Id: Iaacd492858ca2fb98c4947d587fbbd26fc102a7d
Reviewed-on: https://code.wireshark.org/review/14486
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoFT_BOOLEAN is now stored as a 64-bit value; treat it as such.
Guy Harris [Tue, 15 Mar 2016 21:20:02 +0000 (14:20 -0700)]
FT_BOOLEAN is now stored as a 64-bit value; treat it as such.

Always look and set the uinteger64 member of the union for FT_BOOLEAN
values.

Bug: 12236
Change-Id: I7b0166e564b9d6cbb80051a81714a4b4c5f740a2
Reviewed-on: https://code.wireshark.org/review/14481
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years ago[nmake GTK] Use GENERATED_FILES, GENERATED_C_FILES is no more.
AndersBroman [Tue, 15 Mar 2016 12:35:32 +0000 (13:35 +0100)]
[nmake GTK] Use GENERATED_FILES, GENERATED_C_FILES is no more.

Change-Id: I94aebf396c219f89f73cd3857de7145b2d79b09f
Reviewed-on: https://code.wireshark.org/review/14478
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years ago[ASN1] Fix the nmake clean target.
AndersBroman [Tue, 15 Mar 2016 11:37:02 +0000 (12:37 +0100)]
[ASN1] Fix the nmake clean target.

Change-Id: Ia18cc03a4339cf4c9b43cb8d897c8c47382605c5
Reviewed-on: https://code.wireshark.org/review/14477
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agou3v: set interface class/subclass by first clearly identified packet
Moeller, Thies [Tue, 15 Mar 2016 06:56:57 +0000 (07:56 +0100)]
u3v: set interface class/subclass by first clearly identified packet

In case no descriptors are in the trace, payload packets can
only be identified, if a clearly identified STREAM or CONTROL packet sets
class/subclass of the conversation

Change-Id: I30be30df908ede468fadf56fdef20f9869ce6b56
Reviewed-on: https://code.wireshark.org/review/14467
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoGTK: Revert most of g11b058e
João Valverde [Sun, 13 Mar 2016 21:19:10 +0000 (21:19 +0000)]
GTK: Revert most of g11b058e

Don't distribute gresource, it's redundant binary data, make the distribution
more similar to Qt instead.

We may want to check that glib-compile-resources is in the PATH during
configure.

Change-Id: I82c57f8169be0cbcac14d4ca79df8dece6c4d7ff
Reviewed-on: https://code.wireshark.org/review/14455
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoQt: Make sure the proto tree handles all of its timers.
Gerald Combs [Mon, 14 Mar 2016 20:29:21 +0000 (13:29 -0700)]
Qt: Make sure the proto tree handles all of its timers.

Call QTreeWidget::timerEvent from ProtoTree::timerEvent, otherwise we
turn into the candy factory episode in I Love Lucy.

Do the equivalent in WirelessFrame while we're here. Neither QFrame or
QWidget use timers, but there's no guarantee that this will be the case
in the future.

Bug: 12258
Change-Id: I3cb0096fe2ed87176fec8d7361260b5388d75530
Reviewed-on: https://code.wireshark.org/review/14470
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoDump out abi_logs/log.txt if abi-compliance-checker fails.
Guy Harris [Tue, 15 Mar 2016 04:04:37 +0000 (21:04 -0700)]
Dump out abi_logs/log.txt if abi-compliance-checker fails.

That seems to be where we're telling it to send its logs.

Change-Id: Ic15370bc1af858b82f0964fcc35189039061ccb7
Reviewed-on: https://code.wireshark.org/review/14476
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoIAX2: fix an infinite loop
Pascal Quantin [Mon, 14 Mar 2016 22:35:56 +0000 (23:35 +0100)]
IAX2: fix an infinite loop

Bug: 12260
Change-Id: I29b23ff2d862027fd44c6dd4de3cbb304664fd05
Reviewed-on: https://code.wireshark.org/review/14473
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>
3 years agoAdd EditorConfig reference to README.developer
João Valverde [Mon, 14 Mar 2016 14:40:06 +0000 (14:40 +0000)]
Add EditorConfig reference to README.developer

Change-Id: I595e94bd0274e3ee3c1d8764fc6c93f28993c30f
Reviewed-on: https://code.wireshark.org/review/14468
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoWhat a difference a comma makes. CID-1355680
Jaap Keuter [Mon, 14 Mar 2016 21:30:51 +0000 (22:30 +0100)]
What a difference a comma makes. CID-1355680

Split two media type strings with the properly placed comma.

Change-Id: Ia6026879b63b9f51c3f2e61d8709f43716f0c6e2
Reviewed-on: https://code.wireshark.org/review/14472
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoCIP: Restore path information to Info column
D. Ulis [Mon, 14 Mar 2016 03:47:38 +0000 (23:47 -0400)]
CIP: Restore path information to Info column

When the "Display enhanced Info column data" preference is set, ensure that:
1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages
2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy)

This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct.

Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1
Reviewed-on: https://code.wireshark.org/review/14458
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoTry to suppress a compiler feature that goes wrong.
Guy Harris [Mon, 14 Mar 2016 16:56:31 +0000 (09:56 -0700)]
Try to suppress a compiler feature that goes wrong.

-Warray-bounds + the macros for strcmp() = pain.  Either the macro is
doing something wrong or the compiler is confused, because

if( strcmp(argv[i],"--")==0 ) dashdash = 1;

should not produce

array index 3 is past the end of the array (which contains 3
elements)

Either 1) the macro is blithely running past the end of "--", which
does, indeed, contain only 3 elements, or 2) the compiler mistakenly
believes that the code generated by the macro is running past the end of
"--" when it isn't.

Change-Id: I4183e29272ba9e05b3b370efd90102f2226df7c3
Reviewed-on: https://code.wireshark.org/review/14469
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoOS X: Remove GTK+ packaging.
Gerald Combs [Fri, 11 Mar 2016 21:45:54 +0000 (13:45 -0800)]
OS X: Remove GTK+ packaging.

Remove the GTK+-specific bits from packaging/macosx.

Change-Id: I8f7d909f971e60723e421005fdf46de967c69533
Reviewed-on: https://code.wireshark.org/review/14431
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoParallelize fuzz-test.sh
Gerald Combs [Sat, 12 Mar 2016 01:01:29 +0000 (17:01 -0800)]
Parallelize fuzz-test.sh

Run each "argument" test (e.g. "-nVxr" and "-nr") simultaneously in
the background. This should speed up our tests without reducing the
amount of fuzzing that we do.

Change-Id: I737d1dc09b31e07910d56632bec62da0f35fe222
Reviewed-on: https://code.wireshark.org/review/14432
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoAdd EditorConfig settings for epan/*.[ch]
João Valverde [Mon, 14 Mar 2016 01:57:30 +0000 (01:57 +0000)]
Add EditorConfig settings for epan/*.[ch]

Change-Id: Idf53845158e1c112984bee895b91a39475f8c110
Reviewed-on: https://code.wireshark.org/review/14454
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoSet EditorConfig hard tab width to 8 for C
João Valverde [Mon, 14 Mar 2016 01:27:16 +0000 (01:27 +0000)]
Set EditorConfig hard tab width to 8 for C

Our check scripts require 8 columns when using tab indentation with modelines
so use the same setting for EditorConfig.

Change-Id: I5a5a7c22a03866ee77c8fdc98d6582366950ce77
Reviewed-on: https://code.wireshark.org/review/14453
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoMore sorting.
Guy Harris [Mon, 14 Mar 2016 10:24:56 +0000 (03:24 -0700)]
More sorting.

Change-Id: Id74c065ef2151d4b9fe2d8275838ebe12c83b6ad
Reviewed-on: https://code.wireshark.org/review/14465
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMore sorting.
Guy Harris [Mon, 14 Mar 2016 10:23:08 +0000 (03:23 -0700)]
More sorting.

Change-Id: Iad364a735d348913d7bc8936dbb2c8543801fe7e
Reviewed-on: https://code.wireshark.org/review/14464
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMore sorting.
Guy Harris [Mon, 14 Mar 2016 10:20:38 +0000 (03:20 -0700)]
More sorting.

Change-Id: I562c95b6b081d50e9b7c0c743a9ad01bcaf5b1f0
Reviewed-on: https://code.wireshark.org/review/14463
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMore sorting.
Guy Harris [Mon, 14 Mar 2016 10:14:34 +0000 (03:14 -0700)]
More sorting.

Change-Id: Ia1b2cef56ae1ca16598ab757a730c80bb20beca5
Reviewed-on: https://code.wireshark.org/review/14462
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMove some non-ASN.1 dissectors out of the ASN.1 dissectors list.
Guy Harris [Mon, 14 Mar 2016 10:09:50 +0000 (03:09 -0700)]
Move some non-ASN.1 dissectors out of the ASN.1 dissectors list.

Sort the list of PIDL dissectors while we're at it.

Change-Id: Ice90bf9b14b440fdfe59d1639fc0674e326a9923
Reviewed-on: https://code.wireshark.org/review/14461
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMove some non-ASN.1 dissectors out of the ASN.1 dissectors list.
Guy Harris [Mon, 14 Mar 2016 10:00:52 +0000 (03:00 -0700)]
Move some non-ASN.1 dissectors out of the ASN.1 dissectors list.

Sort the list of PIDL dissectors while we're at it.

Change-Id: I1425046d6feaded7af94f4a852d8f0984bd0b736
Reviewed-on: https://code.wireshark.org/review/14460
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agopacket-u3v.c lost after cmake build cleanup
Moeller, Thies [Mon, 14 Mar 2016 09:28:27 +0000 (10:28 +0100)]
packet-u3v.c lost after cmake build cleanup

fixes 6b54fbf3bfb7a3b0519637d01fa36bba8cec9c98

Change-Id: If3b911dd8124a53b91d1ac2b35ea1dad0eec4802
Reviewed-on: https://code.wireshark.org/review/14459
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoQt: Add FunnelTextDialog geometry state
Stig Bjørlykke [Sun, 13 Mar 2016 18:16:22 +0000 (19:16 +0100)]
Qt: Add FunnelTextDialog geometry state

Use "Funnel <title>" as dialog name to avoid a user defined dialog
title to be equal to a existing dialog title.

Change-Id: I3d21c87de8fe5852f37a18b4751fb4d4428ce6ea
Reviewed-on: https://code.wireshark.org/review/14450
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>
3 years agoAnother fix for the Info column.
Guy Harris [Mon, 14 Mar 2016 02:50:11 +0000 (19:50 -0700)]
Another fix for the Info column.

Bug: 12257
Change-Id: I1859aa11c79f82060ab6051f702e69794f82c0ea
Reviewed-on: https://code.wireshark.org/review/14457
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoDon't let the existence of a protocol tree affect what's in the Info column.
Guy Harris [Mon, 14 Mar 2016 02:35:20 +0000 (19:35 -0700)]
Don't let the existence of a protocol tree affect what's in the Info column.

A dissector must never assume that it will, or won't, be called with a
protocol tree; it's up to the Wireshark/TShark/etc. core to decide
whether to do it, and it can change its behavior over time or even
change it from release to release.

Have dissect_epath() take an argument that explicitly indicates whether
to add the CIP class to the Info column, rather than assuming that you
do so only if the tree pointer passed to it is null.

Bug: 12257
Change-Id: Ide8a6fc21252880f849a8d0aa4659a675bb3ae04
Reviewed-on: https://code.wireshark.org/review/14456
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoHandle RADIUS ident reuse better.
Jeff Morriss [Sun, 13 Mar 2016 19:33:30 +0000 (15:33 -0400)]
Handle RADIUS ident reuse better.

Rather than storing RADIUS calls in a map keyed by the ident and conversation
store a tree of calls (using the the same key).  Store each (non-duplicate)
call (request) in the tree, keyed by frame number.  When looking for a match
(or a duplicate) look for the most-recently-seen frame in the tree (i.e., the
most recent frame with the same ident + conversation).  Only declare a request
a duplicate if the authenticator is identical (as per RFC 5080 section 2.2.2).

Only store things in the map/tree on the first pass.

Remove the 'request_ttl' preference: it's better to show the user when the
response came back even if it was "late."  (This also allows duplicate request
detection inside of the TTL.)

When telling the user about a duplicate don't tell them the ident again: they
already know that.  Tell them the frame number of the original.

Use the FT_FRAMENUM_REQUEST/FT_FRAMENUM_RESPONSE hints.

Move a couple structures from the header file to the C file: they're only used
in the RADIUS dissector anyway.

Bug: 4096
Change-Id: I0e8bc0d23cd6b219cecd82f5c4cd765d28a14d98
Reviewed-on: https://code.wireshark.org/review/14451
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agowmem-ify the Radius call table.
Jeff Morriss [Sun, 13 Mar 2016 17:48:49 +0000 (13:48 -0400)]
wmem-ify the Radius call table.

This includes not making assumptions about the order in which a GHashTable or
wmem_map implementation provides the keys to the GEqualFunc function
(apparently the former's order is different than the latter).

Change-Id: Ifbcb0f4f2c38b2ce6e44bf66c7246575af6299fa
Reviewed-on: https://code.wireshark.org/review/14448
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoClean asn1 make/cmake whitespace
João Valverde [Thu, 10 Mar 2016 00:34:54 +0000 (00:34 +0000)]
Clean asn1 make/cmake whitespace

Add missing newline or remove extra newlines at the end of the file.

Trim trailing whitespace.

Change-Id: I73b7a4e20969bc13f72bf97e981fd5de89d8bb17
Reviewed-on: https://code.wireshark.org/review/14400
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoMove /asn1 to /epan/dissectors
João Valverde [Wed, 9 Mar 2016 03:17:51 +0000 (03:17 +0000)]
Move /asn1 to /epan/dissectors

Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
3 years ago[Automatic update for 2016-03-13]
Gerald Combs [Sun, 13 Mar 2016 20:31:39 +0000 (13:31 -0700)]
[Automatic update for 2016-03-13]

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

Change-Id: I9a80e0c443496a65e6ef34c6a329c92dd48a803d
Reviewed-on: https://code.wireshark.org/review/14452
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoFix a FIXME: remove an if(tree).
Jeff Morriss [Sun, 13 Mar 2016 18:09:42 +0000 (14:09 -0400)]
Fix a FIXME: remove an if(tree).

The reason the notice in the INFO column disappeared when a display filter was
added is because the column operation was wrapped in an if(tree).

Change-Id: Ic8ff929d7ef601458b8650f8095f87282f9fde40
Reviewed-on: https://code.wireshark.org/review/14449
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoISO 8583-1 dissector initial import
Paulo Roberto Brandão [Thu, 3 Mar 2016 02:53:13 +0000 (23:53 -0300)]
ISO 8583-1 dissector initial import

Initial import of source code for the dissector of the ISO 8583-1
'financial transaction card originated messages - Interchange
message specification' standard.

Bug: 12244
Change-Id: I24804cab4a93131ec9afa307844ad62eb2e01089
Reviewed-on: https://code.wireshark.org/review/14311
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years ago[Automatic update for 2016-03-13]
Gerald Combs [Sun, 13 Mar 2016 15:08:50 +0000 (08:08 -0700)]
[Automatic update for 2016-03-13]

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

Change-Id: Id764cddac44715977f4abbd1f55bfc961a1973a4
Reviewed-on: https://code.wireshark.org/review/14443
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoLua: Remove heur dissectors when reload Lua plugins
Stig Bjørlykke [Fri, 11 Mar 2016 19:54:26 +0000 (20:54 +0100)]
Lua: Remove heur dissectors when reload Lua plugins

When reloading Lua plugins all registered heuristic dissectors
must be removed.

Bug: 12251
Change-Id: Ib7da6df347fb9294f5394ae531b582bf6d2730bb
Reviewed-on: https://code.wireshark.org/review/14429
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>
3 years agoLua: Apply prefs when reload Lua plugins
Stig Bjørlykke [Sun, 13 Mar 2016 10:30:25 +0000 (11:30 +0100)]
Lua: Apply prefs when reload Lua plugins

Change-Id: I9003fd8c4eb52a868ad88b7ea00b6cf0e70e5c90
Reviewed-on: https://code.wireshark.org/review/14440
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
3 years agoLua: Check for duplicate heuristic short name
Stig Bjørlykke [Sat, 12 Mar 2016 11:46:47 +0000 (12:46 +0100)]
Lua: Check for duplicate heuristic short name

A Proto may be only be registered with a heuristic dissector once,
because we check this in heur_dissector_add().

Change-Id: I524fa832b647d557f13aedcb870f7789058d2180
Reviewed-on: https://code.wireshark.org/review/14436
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>
3 years agoandroiddump 1.0.2: Fix a lot of usage of recv()
Michal Labedzki [Sat, 6 Feb 2016 18:14:20 +0000 (19:14 +0100)]
androiddump 1.0.2: Fix a lot of usage of recv()

recv() can return negative value or 0 in "error cases".
There is need to check it. This also solved empty interfaces
list if there is unauthenticated device.

Bug: 12080
Change-Id: If6cd0e0933b64e9ac9bbb66b3b8138f7177451d1
Reviewed-on: https://code.wireshark.org/review/14316
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>
3 years ago[docsis->mdd] Add support for TLV 1.6
Adrian [Sat, 12 Mar 2016 10:39:09 +0000 (21:39 +1100)]
[docsis->mdd] Add support for TLV 1.6

Change-Id: I5c7529bc630ad7312011b04ce101ba3608041d35
Reviewed-on: https://code.wireshark.org/review/14435
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>
3 years agos7comm: fix 's7comm.cpu.msg.events.modetrans' exists multiple times with NOT compatib...
Alexis La Goutte [Fri, 11 Mar 2016 15:59:44 +0000 (16:59 +0100)]
s7comm: fix 's7comm.cpu.msg.events.modetrans' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8

Change-Id: I1fea29ab8813ec69339550a477eb3203f3b5f3aa
Reviewed-on: https://code.wireshark.org/review/14421
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoAssa (R3): fix 'r3.forceoptions.state' exists multiple times with NOT compatible...
Alexis La Goutte [Fri, 11 Mar 2016 16:01:57 +0000 (17:01 +0100)]
Assa (R3): fix 'r3.forceoptions.state' exists multiple times with NOT compatible types: FT_UINT16 and FT_BOOLEAN

Change-Id: I6bae0af90fd9604dbc9c484d119580adbb11b914
Reviewed-on: https://code.wireshark.org/review/14422
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoQUIC: Add new tag found with version Q29
Alexis La Goutte [Fri, 11 Mar 2016 11:25:44 +0000 (12:25 +0100)]
QUIC: Add new tag found with version Q29

* XLCT: Expected leaf certificat
* NONP: Client Proof Nonce

Change-Id: I91713545a995e7f28735373fabc644508193a519
Reviewed-on: https://code.wireshark.org/review/14419
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>
3 years agoWalk up the tree view of Protocol Hierarchy Statistics to look for protocol matches.
Michael Mann [Wed, 9 Mar 2016 22:23:22 +0000 (17:23 -0500)]
Walk up the tree view of Protocol Hierarchy Statistics to look for protocol matches.

Things like [Reassembled TCP segments] can add superfluous leaves so just walking down the tree from current location, so walk up the tree as well.

Bug: 1734
Change-Id: I91af554b59e1a6867dba9189ba37db5e396d892a
Reviewed-on: https://code.wireshark.org/review/14393
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoQt: Defer proto tree column content resizing.
Gerald Combs [Thu, 10 Mar 2016 20:43:59 +0000 (12:43 -0800)]
Qt: Defer proto tree column content resizing.

Try to avoid the following call graph:

ProtoTree::expandAll
  ...
    ProtoTree::expand
      ...
        QTreeView::resizeColumnToContents

QTreeView::resizeColumnToContents calls sizeHintForColumn, which
iterates over a number of items (default 1000). Calling it from
ProtoTree::expand can lead to excessive wheel-spinning.

Add a single-shot timer for resizeColumnToContents. This is similar to
what QTreeView does internally when columns are resized.

Bug: 12228
Change-Id: I7b50c1486b3a25817efae58efbb8c9e961dbdab0
Reviewed-on: https://code.wireshark.org/review/14411
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoRemove the last remnants of U3 support.
Gerald Combs [Fri, 11 Mar 2016 17:15:12 +0000 (09:15 -0800)]
Remove the last remnants of U3 support.

Change-Id: Ide4c177e67a77c5f9495b3b4c0f817f40e6dde30
Reviewed-on: https://code.wireshark.org/review/14425
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoAdd IAX2 and Skinny calls to VoIP calls window
Pascal Quantin [Fri, 11 Mar 2016 16:36:11 +0000 (17:36 +0100)]
Add IAX2 and Skinny calls to VoIP calls window

Bug: 12254
Change-Id: Ibaddfaf8018be673d8f2cf642b1127062d7d507d
Reviewed-on: https://code.wireshark.org/review/14423
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>
3 years agoOS X packaging: Remove some unused files.
Gerald Combs [Fri, 11 Mar 2016 17:09:20 +0000 (09:09 -0800)]
OS X packaging: Remove some unused files.

Change-Id: Id01af6460828338bd3d0ac59e20000e93999ca7b
Reviewed-on: https://code.wireshark.org/review/14424
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agocmake: Copy docs to build datafile dir for NSIS packaging.
João Valverde [Thu, 10 Mar 2016 15:50:39 +0000 (15:50 +0000)]
cmake: Copy docs to build datafile dir for NSIS packaging.

Change-Id: Icc1f6dadc8bb082c4049cafc6a7e6c2d030ec85e
Reviewed-on: https://code.wireshark.org/review/14409
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agotrmac: fix 'trmac.group_address' exists multiple times with NOT compatible types...
Alexis La Goutte [Wed, 9 Mar 2016 07:46:22 +0000 (08:46 +0100)]
trmac: fix 'trmac.group_address' exists multiple times with NOT compatible types: FT_ETHER and FT_UINT32

Change-Id: I5289022752513e84783a8c65ab8f2327a7023597
Reviewed-on: https://code.wireshark.org/review/14414
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoSCSI: Fix conflict for hf fields
Alexis La Goutte [Fri, 11 Mar 2016 09:08:28 +0000 (10:08 +0100)]
SCSI: Fix conflict for hf fields

'scsi.blockdescs.no_of_blocks' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'scsi.naa.vendor_specific' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT32

Change-Id: Iaa512c02b99f0a103bb5015e92d900dae2932843
Reviewed-on: https://code.wireshark.org/review/14418
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agosigcomp: fix 'sigcomp.decompression_failure' exists multiple times with NOT compatibl...
Alexis La Goutte [Fri, 11 Mar 2016 08:15:01 +0000 (09:15 +0100)]
sigcomp: fix 'sigcomp.decompression_failure' exists multiple times with NOT compatible types: FT_NONE and FT_UINT32

Change-Id: I45a1c26dd7f8822faeed62dd82b5ecdcca16be41
Reviewed-on: https://code.wireshark.org/review/14417
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agosysex: fix 'sysex.digitech.parameter_data' exists multiple times with NOT compatible...
Alexis La Goutte [Fri, 11 Mar 2016 08:14:24 +0000 (09:14 +0100)]
sysex: fix 'sysex.digitech.parameter_data' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT8

Change-Id: I3692c6465f6d8e4ce6c9a0f6e4bb851b83713757
Reviewed-on: https://code.wireshark.org/review/14416
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years ago[SGsAP] Wrong tag used for IE Erroneous message, dissect the failing
AndersBroman [Fri, 11 Mar 2016 12:36:36 +0000 (13:36 +0100)]
[SGsAP] Wrong tag used for IE  Erroneous message, dissect the failing
message too.

Change-Id: I6d10d41366795e59396c238cf620c43a3d96217b
Reviewed-on: https://code.wireshark.org/review/14420
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoTDS: Fix conflict for hf fields
Alexis La Goutte [Fri, 11 Mar 2016 08:07:35 +0000 (09:07 +0100)]
TDS: Fix conflict for hf fields

'tds.done.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'tds.doneproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'tds.doneinproc.donerowcount' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'tds.envchange.newvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
'tds.envchange.oldvalue' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING

Change-Id: I87d713aaa722d7ab9e8d19955f3820e9040446c1
Reviewed-on: https://code.wireshark.org/review/14415
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoRename a variable for clarity.
Jeff Morriss [Fri, 11 Mar 2016 02:03:52 +0000 (21:03 -0500)]
Rename a variable for clarity.

It's confusing to have 'pdus_tree' mean both the map of pdu_trees and the pdu
trees themselves.

Change-Id: Ie875798eb140b60a1309ddc0c0bf885b48c0407c
Reviewed-on: https://code.wireshark.org/review/14413
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agoFix NSIS installer
João Valverde [Thu, 10 Mar 2016 13:43:44 +0000 (13:43 +0000)]
Fix NSIS installer

Broken by gb7f6cf9.

Change-Id: I21a91cf56c16b7ffdf72da7bf68a556feb6a6c17
Reviewed-on: https://code.wireshark.org/review/14408
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>