Commit Graph

69123 Commits

Author SHA1 Message Date
Flavio Santes 19b2ddcce1 dissector/mqtt: Update license notice
Change-Id: Iefd0bead04cc54c55d39b682b7879620c022afb1
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24262
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07 06:14:35 +00:00
Flavio Santes e2179a2ac5 dissector/mqtt: Add partial support for MQTT v5.0
This patch adds partial support for the MQTT v5.0 protocol.
The relevant changes are:

- A new MQTT control packet: AUTH (15)
- The Variable Header is extended with a new section: 'Properties'

Currently, the 'Properties' section is not dissected although
its length is parsed.

Change-Id: I059b91304e953d69e4781b170e61057cb38dde19
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24261
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07 06:13:53 +00:00
Michael Mann ea97b3364c Add AMR WB pino to make Decode As happy.
Change-Id: I7150db30ce52ab4398ed977197f200070fca1d8c
Reviewed-on: https://code.wireshark.org/review/24270
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-07 03:58:50 +00:00
Anders 1e707e33fa [BT Mesh] Add Bluetooth Mesh dissector.
Bug: 14161

Change-Id: Ia76d283c6c8e00526948a0ee9cda9e35b4ca0e2a
Reviewed-on: https://code.wireshark.org/review/24216
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-06 23:36:10 +00:00
Guy Harris 4405c5d769 Fix white space.
Change-Id: I8a50391dcfb113c251f24f64486828d5d8a1d0c0
Reviewed-on: https://code.wireshark.org/review/24260
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-06 21:27:14 +00:00
Dario Lombardo 9705f653da print: add fi check.
Change-Id: Ica20efe7122476af55b70c72d8af40244c25f902
Reviewed-on: https://code.wireshark.org/review/24259
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-06 16:09:20 +00:00
Michael Mann 147e491025 Convert PT_EXCHG into using conversation endpoints
Change-Id: Id5857a58513c38dd0ab5b30b61113bcc14e1ecee
Reviewed-on: https://code.wireshark.org/review/24258
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-06 15:19:15 +00:00
Richard Sharpe 0dfff8c4b4 IEEE1905: Add a break to fix a malformed packet issue and dissect Multi-AP
Extension types in EAPWPS.

Change-Id: Ib7dca0f83897839072eaaeb9c95f406f6ad5c8e6
Reviewed-on: https://code.wireshark.org/review/24256
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-06 14:03:11 +00:00
Richard Sharpe 8b79187b66 ieee802.11: Add support for the Measurement Pilot Interval IE and
fix dissection of the actual measurement pilot interval. It is an
8-bit field according to IEEE802.11 2016.

Change-Id: I44c9a732ae3074e865f7ad63b554f7a031542e5a
Reviewed-on: https://code.wireshark.org/review/24257
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-06 13:33:37 +00:00
Martin Kacer 156a0b62eb Tools: json2pcap script update
Updated script to support duplicated json fields
and --no-duplicate-keys tshark flag.

Bug: 12958
Change-Id: Id20885baacbfd26124cb82716df6829225be6de8
Reviewed-on: https://code.wireshark.org/review/24236
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-06 06:17:49 +00:00
João Valverde ba6dd97081 Remove epan win32 x86 assembly
Not used. Remove also weird pre-hash hash optimization in proto.c.

Change-Id: Ibebc12dbe90ac1d05fb1ba601d32fe98797fbd56
Reviewed-on: https://code.wireshark.org/review/24254
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-05 23:20:20 +00:00
Michael Mann 93bda0b18d Add conversation/endpoint statistics for Linux SLL
Bug: 14048
Change-Id: I320380c492b83f0e45bfbf20505deb3c5f11ae67
Reviewed-on: https://code.wireshark.org/review/24243
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-05 23:18:47 +00:00
Michael Mann 23afd28daf Convert TIPC to use endpoint conversations
Change-Id: Iab03ebbfc982bf7182851f63c17fa59bc71d7709
Reviewed-on: https://code.wireshark.org/review/24219
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-05 23:17:32 +00:00
Alexis La Goutte 08bf89f487 zbee zcl se: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I169f7815eecfcdfbbdca78d4ab038fb032c3b691
Reviewed-on: https://code.wireshark.org/review/24250
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05 14:46:33 +00:00
Darien Spencer 10cc91f83d RLC: Replaced g_malloc with tvb_memdup
Also updated some comments and a string

Change-Id: Ib8c079a34f21614047262900b0a4c1547d5df0b3
Reviewed-on: https://code.wireshark.org/review/24237
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05 14:45:30 +00:00
João Valverde 2ef00337c4 CMake: Remove "compress" remnant
Change-Id: I6feeb2f5873562a09159cf55446652628aa97e78
Reviewed-on: https://code.wireshark.org/review/24255
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 14:17:52 +00:00
Hal Rosenstock dc18da434b packet-infiniband: Proper parsing of ClassPortInfo attribute
ClassPortInfo is a common attribute for general service (GS)
management classes.

SA ClassPortInfo is currently parsed as PortInfo although
these are different attributes.

Also, added support for PerfMgt ClassPortInfo.

Bug: 14164
Change-Id: I652ba8ed2e0222db41ce2eb2e01a9c4b446e5bd4
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24235
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05 13:34:37 +00:00
João Valverde f891603a47 autotools: Eliminate spurious libwireshark_asmopt library
Change-Id: I96e03f136efd90892fbcf812ea37e36a2bed5ab9
Reviewed-on: https://code.wireshark.org/review/24253
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 13:31:29 +00:00
Alexis La Goutte ff3bd8c7ce conversation_table(.h): fix parameter 'ptype/port_type_val' not found in the function declaration [-Wdocumentation]
Oups not good fix last time...

Change-Id: I55f565a8d4dde83304a8437be3dc35c2fad1fb07
Reviewed-on: https://code.wireshark.org/review/24249
Tested-by: Petri Dish Buildbot
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05 13:30:25 +00:00
João Valverde 72c2e53981 autotools: Use pkg-config to configure Libsmi
Change-Id: Icecea743739aa7e1a65753f623f311514260d373
Reviewed-on: https://code.wireshark.org/review/24252
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 13:02:11 +00:00
João Valverde 62f705e844 autotools: Try to be clearer about --with-ssl and remove cruft
Change-Id: Iaf8c8a83ead1d6671bb9cadb6add56481ed98aaa
Reviewed-on: https://code.wireshark.org/review/24242
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 10:39:38 +00:00
João Valverde 711f69c807 CMake: Don't offer unsupported options
Change-Id: I45872dad3c7133453790fb284121fb4eaf9fac67
Reviewed-on: https://code.wireshark.org/review/24240
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 10:39:25 +00:00
Roland Knall 68ead1d025 Qt: Fix drag-n-drop in toolbar
Fixing two crashes in the toolbar, first one only appeared on mac,
the second one happens every time the toolbar is removed or updated

Change-Id: Ic3075a5af1b4a566e09bbce9712c968c053cc727
Reviewed-on: https://code.wireshark.org/review/24244
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-05 08:28:10 +00:00
Gerald Combs aed3e66672 [Automatic update for 2017-11-05]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I4abb96429b1ad8c6d78a129efd453f3019669f4f
Reviewed-on: https://code.wireshark.org/review/24245
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-05 08:16:13 +00:00
Uli Heilmeier 7e6f6562fa TCP: cleanup Riverbed option
Remove duplicate length field to adjust to the other options.
tcp.options.rvbd.probe.len has already reported by tcp.option_len

Add missing space between "Transparency" and IP address.

Change-Id: I8b4260b34d760b73ee529a687418c4b6adcfaa0e
Reviewed-on: https://code.wireshark.org/review/24239
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 23:43:59 +00:00
Eliot Lear fc318e6a1f Better instructions on building with Qt on macOS.
Change-Id: I23bb91970dd7e3f59166310114cca84846d7164d
Reviewed-on: https://code.wireshark.org/review/24165
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-04 16:12:19 +00:00
Michael Mann 1741b6b23c oss-fuzzshark: force direct malloc
Set two environment variables (needs to be done before epan_init and
before the first g_slice_alloc call) to force direct memory allocation
without another layer that could hide bugs.

Change-Id: I0d72092c239e2e7f42b0b7849c01471407e785e2
Reviewed-on: https://code.wireshark.org/review/21195
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 13:14:23 +00:00
Uli Heilmeier d11f5dff8e TCP: Fix Riverbed probe option tvb handling
With commit f30b1e3b3b TCP options are handled
in an own dissector table. Therefore we can't read ahead or behind to get
the SYN flag or the CFE flag.

Bug: 14150
Change-Id: Ibbf1836104d32216ddfa2d4e07dccbcf948bb26c
Reviewed-on: https://code.wireshark.org/review/24181
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 12:28:27 +00:00
Hal Rosenstock 802517e917 packet-infiniband: SM class does not support ClassPortInfo or InformInfo attributes
Change-Id: I1fbe7a93e8a208a1a4abaf0b64e674536b642733
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24229
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-04 07:45:07 +00:00
Hal Rosenstock 834c65a1f8 packet-infiniband: Make unknown GS class attributes show up in wireshark Info column
The following GS classes are now displayed there:
BM
DEV_MGT
SNMP
VENDOR
APP
RESERVED

Change-Id: I94822784a7027afa1d5e99ca20467721a98cfe0a
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24234
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-04 07:44:53 +00:00
Hal Rosenstock 0cd40887d4 packet-infiniband: Better variable naming
Rather than use PERF_header_item for all classes,
use acronym for class appended with _header_item

Change-Id: I52ac46000c20b7f51c87c8dc4a8dfc85c20f31f3
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24233
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:21:32 +00:00
Hal Rosenstock b4856927eb packet-infiniband: DETH Queue Key should be hex rather than decimal
as it is in other places where there is Q_Key

Was:
    DETH - Datagram Extended Transport Header
        Queue Key: 2147549184
Now:
    DETH - Datagram Extended Transport Header
        Queue Key: 0x0000000080010000

Change-Id: I64d4b485e2a511c30b0e4a2849f529438591a122
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24232
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:20:45 +00:00
Hal Rosenstock 002133c606 packet-infiniband: Make unknown PerfMgt attributes show up as PERF in wireshark Info column
Change-Id: I9f6a60adaa0744d13d6c000d1a4e20f3b526355b
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24231
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:20:24 +00:00
Hal Rosenstock b70429427f packet-infiniband: Fix commentary typo (for consistency)
Change GuidInforecord -> GuidInfoRecord
Also, change VLArbitrationTableRecord comment to be consistent

Change-Id: Ia7cc844779a8751bd7675354b71239922327d0e8
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24230
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:19:33 +00:00
Hal Rosenstock 3c2f217940 packet-infiniband: Add missing SA methods into mad_method_str
so they are not indicated as Method: Unknown under
MAD Header - Common Management Datagram

Change-Id: I8e8fe918eea86e7095967d0b82772a813eafe2a5
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24228
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:18:27 +00:00
Hal Rosenstock 9b82c6b21e packet-infiniband: Fixed some PortInfo:CapabilityMask bit names
to be consistent with IBA volume 1 spec

IsOptionalIPDSupported
IsCommunicationManagementSupported

Change-Id: I55b29b7f291f49a9d0c3e104bda4d7d7aa78b42b
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24227
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:18:05 +00:00
Hal Rosenstock c04c92fbf9 packet-infiniband: Add first and last to RMPP_Flags
RMPP flags 7 indicates that packet is both first and last
packet in transfer

Change-Id: Idf0e8783372296a7c276c8c0c80e4905afbe6c9a
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24226
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:17:36 +00:00
Hal Rosenstock b3f4ca6077 packet-infiniband: Fix some SM class attribute IDs
LinkSpeedWidthPairsTable is 0x001C
SMInfo is 0x0020
VendorDiag is 0x0030
LedInfo is 0x0031

Change-Id: I93197590930a97c8538ef69d08213b1076a9f66a
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24225
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:17:17 +00:00
Hal Rosenstock 92dc84cff9 packet-infiniband: Fix SA MCMemberRecord attribute name
rather than MCMembersRecord

Change-Id: I96bf3ac45255295cf85b9faf0547df4df26f11c3
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24222
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 06:48:11 +00:00
Hal Rosenstock 8894195a47 packet-infiniband: Use SA rather than SMA as Subnet Administration header
SMA is acronym for Subnet Management Agent not Subnet Administration
so change this from SMA to SA

Change-Id: I1a293fff5de4796fe337daa133943bfa059cc9ff
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24224
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 06:47:46 +00:00
Hal Rosenstock b9c5601dd8 packet-infiniband: Removed erroneous MadHeader comments
as it is not parameter in these APIs

Also, fixed commentary typo

Change-Id: I1ce53b9aae9837688e756b2e665f3b1df74b572c
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24223
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 06:46:25 +00:00
Michael Mann 71389177e4 Add Decode As support for RTP payload
Change-Id: I568c0e6980d7649f9cd82ac46420e7db70722fc6
Reviewed-on: https://code.wireshark.org/review/24150
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 03:24:02 +00:00
Thomas Dreibholz cd3948f99e Add backslashes to definition of WSUG_TOOLS_HELP_FILES in docbook/Makefile.am
Bug: 14152
Change-Id: If1d89afd5dbf62adae4cd84e3fc44bd37a8a2176
Reviewed-on: https://code.wireshark.org/review/24221
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 03:08:55 +00:00
Bruno Verstuyft 6f382fed37 DOCSIS: RNGRSP: formatting of equalization coefficients
Change-Id: I6745bee84b096a7008d258a39d99370b1fea29a0
Reviewed-on: https://code.wireshark.org/review/24217
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 01:25:22 +00:00
Pascal Quantin b227943e66 Exported PDU: apply EXP_PDU_TAG_COL_PROT_TEXT whatever the next_prot_type tag
The include file suggests that it will always fill the protocol column if
present. Let's make that happen.

Change-Id: I265e2f4d1c2dcd7cf2ff121499694cde14a595f3
Reviewed-on: https://code.wireshark.org/review/24220
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-03 17:46:23 +00:00
Michael Mann e00162301b Ensure endpoint members of packet_info structure are initialized in packet.c
Change-Id: I4c7a4f9888c8bdc87ded88fa997aa2aad9530fd7
Reviewed-on: https://code.wireshark.org/review/24218
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-03 13:59:29 +00:00
Stig Bjørlykke f6edbcd643 mqtt: Simplify message decode matching
Change-Id: I93da46808de8a978d49ad0aa3f78c4a1790e7952
Reviewed-on: https://code.wireshark.org/review/24210
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-03 05:19:58 +00:00
Christoph Wurm be625b9be7 Fix Elasticsearch hex dump
Change-Id: I5b2006a74e95759afce518aaadfe47c54978476a
Reviewed-on: https://code.wireshark.org/review/24215
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-02 20:49:45 +00:00
Eliot Lear 5d9c8ecbc1 Remove eroneous DoD association by deleting IANA entry.
Change-Id: Ib623391235c1cbbfadd540d2ae24fdc36c2b0b96
Reviewed-on: https://code.wireshark.org/review/24214
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-02 17:10:43 +00:00
Pascal Quantin 78ee8c419f Do not register proto_reg_handoff_XXX callback when not required
None of those protocols need to be notified of a preference change and
their proto_reg_handoff_XXX functions do not differentiate the initial
call from susequent ones, leading to an assert

Bug: 14157
Change-Id: Iac4d88ebef7688bced8daae857eb5c836a6babd6
Reviewed-on: https://code.wireshark.org/review/24211
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-02 14:57:50 +00:00