aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-08Have circuit functionality more closely mirror conversation functionalityMichael Mann3-78/+40
This will allow for a smoother transition for refactoring because circuit functionality can now be represented as a strict subset of conversation functionality. Change-Id: I323d7facad707c81b8e35b33143fa1102d6b5976 Reviewed-on: https://code.wireshark.org/review/24290 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-08proto.c: fix field display test in hfinfo_number_value_format_display64()Pascal Quantin1-21/+21
While we are at it, let's use the FIELD_DISPLAY() macro everywhere. Bug: 14169 Change-Id: I685cb7eb4b9c52f836762c92baeb636570a6d12f Reviewed-on: https://code.wireshark.org/review/24285 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-08Fix typo: Heatbeat --> HeartbeatJeff Widman1-1/+1
Change-Id: I864850b29f9c816a4d1592cd5bba2b9d0159b139 Reviewed-on: https://code.wireshark.org/review/24289 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-07CMake: Detection of HTMHelpGraham Bloice1-0/+7
CMake erroneously reports that HTMLHelp wasn't found The override of FindHTMLHelp.cmake now uses FIND_PACKAGE_HANDLE_STANDARD_ARGS to do this correctly. Change-Id: I1bd24964365dea00af213092872e24cbfb5ee07d Reviewed-on: https://code.wireshark.org/review/24281 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-07fcp: create conversation if it doesn't exist.Dario Lombardo1-4/+3
Change-Id: I0bcc17900a9379d9f9d1828b834c2116e1199bf6 Ping-Bug: 14168 Reviewed-on: https://code.wireshark.org/review/24277 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07Open Windows CHM Help from Help menu.Graham Bloice1-1/+5
Renable the link between the Menu help command and the locally installed CHM help file. This allows the user to acces the appropriate help built for their specific version rather than the latest version on the Wireshark web site. Change-Id: I7bb3d418ba405d6c7614ab6d52f7b0eda843d0de Reviewed-on: https://code.wireshark.org/review/24276 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-11-07tshark/tfshark: Do not apply console.log.level before it is setOrgad Shaneh2-8/+7
The user has no way to apply this setting while loading dissectors in order to enable g_debug messages during init for example. Change the behavior to be as documented in the comment. Change-Id: I9317f12b207d4621508212b02ca1ebd46b55aadc Reviewed-on: https://code.wireshark.org/review/24184 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-07isobus-vt: make sure to close the id file (CID-1413873)Jaap Keuter1-0/+2
Part of dissector init is reading the object ID file. This file should be closed afterwards to not leak the resource. Change-Id: Icf5e229315a2c1c61a169e576ec51d38a1c350a1 Reviewed-on: https://code.wireshark.org/review/24275 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-07packet-ieee80211: all frames have address 1 = RASimon Barber1-96/+52
Change-Id: Ie4785376eae278713e998e23c96d8435e4dc07f2 Reviewed-on: https://code.wireshark.org/review/23526 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07Fix Elasticsearch hex dumpMartin Kacer1-1/+1
Removing duplicated double quote. Bug: 12958 Change-Id: I17f443efd8572e1d17ced5b8ec8f743253be859b Reviewed-on: https://code.wireshark.org/review/24273 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-11-07dissector/mqtt: Disconnect and Auth variable headerFlavio Santes1-2/+6
Apply 'Disconnect' (3.14.2) and 'Auth' (3.15.2-1) notes to simplify and fix the variable header :). Change-Id: I169a69a0da5b2d5ee338c0f45af978217986f37a Signed-off-by: Flavio Santes <flavio.santes@1byt3.com> Reviewed-on: https://code.wireshark.org/review/24274 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-07Improvement to plugin_if_get_ws_info(...) functionalityPaul Offord3-12/+69
A plugin can register an initialisation function to be called each time Wireshark opens a new capture file. If plugin_if_get_ws_info(...) is called from within the initialisation function it does not return the name of the file being opened. This is because plugin_if_get_ws_info(...), through calls to a number of other functions, gets the file name details from a capture_file structure. At the time of the call to the plugins initialisation function, the capture_file structure in question has not yet been created. This change ensures that if plugin_if_get_ws_info(...) is called from a plugin's initialisation function, the name of the file to be open is correctly returned. The change also fixes a bug where plugin_if_ws_get(...) returns an incorrect file state if called from a plugin initialisation function. Bug: 14165 Change-Id: I28c85e480db96852e11bbaa14fb1f434b457ed52 Reviewed-on: https://code.wireshark.org/review/24251 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07wireless_timeline: fix blank displaySimon Barber1-11/+2
Sometimes when a file opens the timeline does not display, also sometimes when zooming it disappears. Change-Id: I141eaef5f332a1de9af133abbeccede7c1cf5502 Reviewed-on: https://code.wireshark.org/review/24209 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-11-07dissector/mqtt: Update license noticeFlavio Santes1-0/+2
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-07dissector/mqtt: Add partial support for MQTT v5.0Flavio Santes1-8/+126
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-07Add AMR WB pino to make Decode As happy.Michael Mann1-1/+3
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-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 12:58:29 +0000