aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-06[BT Mesh] Add Bluetooth Mesh dissector.Anders4-0/+1244
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-06Fix white space.Guy Harris1-1/+1
Change-Id: I8a50391dcfb113c251f24f64486828d5d8a1d0c0 Reviewed-on: https://code.wireshark.org/review/24260 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-06print: add fi check.Dario Lombardo1-1/+1
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-06Convert PT_EXCHG into using conversation endpointsMichael Mann6-12/+4
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-06IEEE1905: Add a break to fix a malformed packet issue and dissect Multi-APRichard Sharpe2-1/+47
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-06ieee802.11: Add support for the Measurement Pilot Interval IE andRichard Sharpe1-3/+40
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-06Tools: json2pcap script updateMartin Kacer1-93/+183
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-05Remove epan win32 x86 assemblyJoão Valverde8-360/+23
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-05Add conversation/endpoint statistics for Linux SLLMichael Mann1-0/+80
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-05Convert TIPC to use endpoint conversationsMichael Mann6-16/+7
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-05zbee zcl se: Fix Dead Store (Dead assignement/Dead increment) Warning found ↵Alexis La Goutte1-1/+1
by Clang Change-Id: I169f7815eecfcdfbbdca78d4ab038fb032c3b691 Reviewed-on: https://code.wireshark.org/review/24250 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05RLC: Replaced g_malloc with tvb_memdupDarien Spencer1-16/+5
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-05CMake: Remove "compress" remnantJoão Valverde1-4/+1
Change-Id: I6feeb2f5873562a09159cf55446652628aa97e78 Reviewed-on: https://code.wireshark.org/review/24255 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05packet-infiniband: Proper parsing of ClassPortInfo attributeHal Rosenstock1-1/+198
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-05autotools: Eliminate spurious libwireshark_asmopt libraryJoão Valverde1-12/+4
Change-Id: I96e03f136efd90892fbcf812ea37e36a2bed5ab9 Reviewed-on: https://code.wireshark.org/review/24253 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05conversation_table(.h): fix parameter 'ptype/port_type_val' not found in the ↵Alexis La Goutte1-3/+3
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-05autotools: Use pkg-config to configure LibsmiJoão Valverde4-132/+24
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-05autotools: Try to be clearer about --with-ssl and remove cruftJoão Valverde5-68/+24
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-05CMake: Don't offer unsupported optionsJoão Valverde1-24/+17
Change-Id: I45872dad3c7133453790fb284121fb4eaf9fac67 Reviewed-on: https://code.wireshark.org/review/24240 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05Qt: Fix drag-n-drop in toolbarRoland Knall1-6/+16
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[Automatic update for 2017-11-05]Gerald Combs10-32/+234
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-04TCP: cleanup Riverbed optionUli Heilmeier1-10/+1
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-04Better instructions on building with Qt on macOS.Eliot Lear1-3/+16
Change-Id: I23bb91970dd7e3f59166310114cca84846d7164d Reviewed-on: https://code.wireshark.org/review/24165 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-04oss-fuzzshark: force direct mallocMichael Mann1-0/+3
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-04TCP: Fix Riverbed probe option tvb handlingUli Heilmeier1-21/+60
With commit f30b1e3b3bc4cec85296c280cdae88d3d17fae04 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-04packet-infiniband: SM class does not support ClassPortInfo or InformInfo ↵Hal Rosenstock1-2/+0
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-04packet-infiniband: Make unknown GS class attributes show up in wireshark ↵Hal Rosenstock1-0/+6
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-04packet-infiniband: Better variable namingHal Rosenstock1-18/+18
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-04packet-infiniband: DETH Queue Key should be hex rather than decimalHal Rosenstock1-1/+1
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-04packet-infiniband: Make unknown PerfMgt attributes show up as PERF in ↵Hal Rosenstock1-0/+1
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-04packet-infiniband: Fix commentary typo (for consistency)Hal Rosenstock1-2/+2
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-04packet-infiniband: Add missing SA methods into mad_method_strHal Rosenstock1-0/+7
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-04packet-infiniband: Fixed some PortInfo:CapabilityMask bit namesHal Rosenstock1-10/+10
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-04packet-infiniband: Add first and last to RMPP_FlagsHal Rosenstock1-0/+1
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-04packet-infiniband: Fix some SM class attribute IDsHal Rosenstock1-4/+4
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-04packet-infiniband: Fix SA MCMemberRecord attribute nameHal Rosenstock1-1/+1
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-04packet-infiniband: Use SA rather than SMA as Subnet Administration headerHal Rosenstock1-1/+1
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-04packet-infiniband: Removed erroneous MadHeader commentsHal Rosenstock1-50/+26
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-04Add Decode As support for RTP payloadMichael Mann1-8/+54
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-04Add backslashes to definition of WSUG_TOOLS_HELP_FILES in docbook/Makefile.amThomas Dreibholz1-9/+9
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-04DOCSIS: RNGRSP: formatting of equalization coefficientsBruno Verstuyft1-6/+10
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-03Exported PDU: apply EXP_PDU_TAG_COL_PROT_TEXT whatever the next_prot_type tagPascal Quantin1-4/+13
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-03Ensure endpoint members of packet_info structure are initialized in packet.cMichael Mann1-0/+4
Change-Id: I4c7a4f9888c8bdc87ded88fa997aa2aad9530fd7 Reviewed-on: https://code.wireshark.org/review/24218 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-03mqtt: Simplify message decode matchingStig Bjørlykke1-38/+20
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-02Fix Elasticsearch hex dumpChristoph Wurm1-1/+1
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-02Remove eroneous DoD association by deleting IANA entry.Eliot Lear1-1/+0
Change-Id: Ib623391235c1cbbfadd540d2ae24fdc36c2b0b96 Reviewed-on: https://code.wireshark.org/review/24214 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-02Do not register proto_reg_handoff_XXX callback when not requiredPascal Quantin2-2/+2
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-02ZigBee ZCL Sub-Ghz Cluster dissectorIvan Ermakov4-0/+260
Added Sub-Ghz cluster dissector. Change-Id: I6d189400298def693969004b6fc2942fd8b70ba0 Reviewed-on: https://code.wireshark.org/review/24199 Reviewed-by: Martin Boye Petersen <mbpflonidan@gmail.com> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-01[GTPv2] Add dissection of 8.127 Header Compression Configuration.Anders1-4/+106
Change-Id: Iace27ebf536cad73d9aaf4abceb6d235f34d68f6 Reviewed-on: https://code.wireshark.org/review/24208 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-01ZigBee ZCL Keep-Alive Cluster DissectorIvan Ermakov4-0/+156
Added Keep-Alive Cluster dissector. Change-Id: I5a2c24a4f13171b26efc860470b4d9c42f54ef89 Reviewed-on: https://code.wireshark.org/review/24198 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>