Commit Graph

69177 Commits

Author SHA1 Message Date
Gerald Combs 775bbbcded Start using SPDX license identifiers.
A while back Graham pointed out the SPDX project (spdx.org), which is
working on standardizing license specifications:

https://www.wireshark.org/lists/wireshark-dev/201509/msg00119.html

Appendix V of the specification describes a short identifier
(SPDX-License-Identifier) that you can use in place of boilerplate in
your source files:

https://spdx.org/spdx-specification-21-web-version#h.twlc0ztnng3b

Start the conversion process with our top-level C and C++ files.

Change-Id: Iba1d835776714deb6285e2181e8ca17f95221878
Reviewed-on: https://code.wireshark.org/review/24302
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-09 20:03:51 +00:00
Dario Lombardo 50b91d0b4d qt: add constructor to proto_tree (CID: 1420705).
Change-Id: I60a07ef6c8006ad8f4b6a5f25c2b4f2b1cb32766
Reviewed-on: https://code.wireshark.org/review/24326
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-09 19:57:54 +00:00
Uli Heilmeier 784ad7297e UI: Use configured language for software update dialog
The software update dialog should use the language configured
with preferences.

Change-Id: If7a4b39d47ce9af505540555a653eb4a3aed8b94
Reviewed-on: https://code.wireshark.org/review/24325
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 19:32:19 +00:00
Flavio Santes 645dff11e1 dissector/mqtt: Replace proto_tree_add_uint64 by proto_tree_add_uint
Change-Id: I51d5dfdcbf13cca79ca354d0a63bf7dc328e5dc9
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24312
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-09 18:41:27 +00:00
Dario Lombardo 414a63f160 extcap: rename interface names.
The new names better reflect the utility.

Change-Id: I54105fc8be6735d3febbcc68837990758a5e52c3
Reviewed-on: https://code.wireshark.org/review/24320
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-11-09 17:27:41 +00:00
João Valverde 3bc743a9fd autotools: Fix build for unknown Qt interface
Change-Id: Ibba717da1fa6cf9b87fc1972e83b0e637e54fd80
Reviewed-on: https://code.wireshark.org/review/24324
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-09 17:19:08 +00:00
João Valverde 3996701183 Replace inet_addr() with our inet_pton() wrapper
Error checking omitted like in original code.

Change-Id: If8b4181d30ddf5717951aaf7ec61db25c0bc5322
Reviewed-on: https://code.wireshark.org/review/24309
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-09 16:08:25 +00:00
Matej Tkac 2ebc41050e [PFCP] Dissect Node ID and minor fixes
Fixed FQDN Field in Dissect Node ID according to 3GPP 29.244 Section 8.2.38
        Added "Encoding error" message if the value in field is in dotted form contrary to the doc.

        Minor fix: Decreased F-TEID Flags spare bits (fix of dc269fcd6f)

Change-Id: I7e9ba53a7deed7af1305f5c445bf4b2a9212e115
Reviewed-on: https://code.wireshark.org/review/24321
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 15:49:24 +00:00
bat e7e4dc5d98 gvcp:
- Added support for new registers:
 - GVCP_IEEE_1588_EXTENDED_CAPABILITY (0x00000974)
 - GVCP_IEEE_1588_SUPPORTED_PROFILES (0x00000978)
 - GVCP_IEEE_1588_SELECTED_PROFILE (0x0000097C)
- Added support for missing/new error codes (0x8013 - 0x8017)
- Added dissector code for 'current link configuration' part of device mode register
- Added support for proper event dissection with the length field in event commands is used as recommended by the GEV 2.1 specification
- Added dissector code for new capability/configuration bits (iee1588 profile, multi-part, large leader/trailer, ieee extended capabilities)
- BUGFIX: In multi-zone mode, zone directions where decoded as 'Receiver' and 'Transmitter' instead of 'Bottom Up' and 'Top-Down'
- BUGFIX: Commands that received at least one 'PENDING_ACK' before the final acknowledge where always reported with '(Failed)' in the Wireshark main window
- Fixed some typos
gvsp:
- Added full multi-part dissection support
- Replaced some hard-coded numbers by numerical constants
- Added support for missing/new error codes (0x8013 - 0x8017)
- BUGFIX: In multi-zone mode, zone directions where decoded as 'Receiver' and 'Transmitter' instead of 'Bottom Up' and 'Top-Down'
- Combined 'AddressOffsetHigh/Low' for multi-zone/part into a single more readable 64-bit value

Change-Id: I55862204ef71f69bc88c79fe2259f7cb8365699a
Reviewed-on: https://code.wireshark.org/review/24299
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-09 13:57:06 +00:00
Richard Sharpe 74936320a4 802.11: Correctly handle Wi-Fi Alliance Multi-AP subtype decoding.
Introduce a dissector table and fix a bug so that it now works
by calling through a dissector table.

Change-Id: Ifa3f01b3f306101b3144604a51806eaccc436373
Reviewed-on: https://code.wireshark.org/review/24319
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 12:06:35 +00:00
Matej Tkac dc269fcd6f [PFCP] Improvements to Dissect F-TEID function
Added Bit 4 - CHID as described in 3GPP 29.244 Section 8.2.3.
    Added "Encoding error" msg if documentation conditions aren't met.

Change-Id: Ia5e6d8bb2bf635fa695a2bfcba3877c2ecf52d87
Reviewed-on: https://code.wireshark.org/review/24318
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 11:39:02 +00:00
Anders f2727b571a TWAMP dissector for RFC 5357
From https://github.com/demirten/twamp-dissector cleaned up a bit.

Change-Id: I3736e2ef09bd84ba30a63fee8bf07771f07bfe6c
Reviewed-on: https://code.wireshark.org/review/24283
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 11:38:50 +00:00
Flavio Santes 4367855163 dissector/mqtt: Rewrite the SUBSCRIBE payload size computation
- FIX: subtract the property length from the message length
- Replace the 'for' loop by a 'while' loop, now that the
  arithmetic is done before.

TODO: It's a protocol error (v5.0)/violation (v3.1.1) not to
include the payload in the SUBSCRIBE control packet. It would
be nice to display a "malformed packet legend" in such that
case.

Change-Id: I99ef3862aa19b3a31ea03d1c194e54f489674115
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24313
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-09 08:45:04 +00:00
Michael Mann afb252355b ISDN: Convert circuit API to conversation API
Change-Id: I8752123a740c47f9328e0144624d4fbf4e200165
Reviewed-on: https://code.wireshark.org/review/24314
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 07:50:09 +00:00
Michael Mann 78665f5211 ISO 14443: Convert circuit API to conversation API
Change-Id: Id007a3df5442cf4d21263acb17303b6d735aaa7d
Reviewed-on: https://code.wireshark.org/review/24311
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 07:48:38 +00:00
Michael Mann 82891e37e9 DVB-CI: Convert circuit API to conversation API
Add the few necessary conversation APIs to make conversion possible.

Change-Id: I775f23005c48cacd2be342bdc704af4738f0789c
Reviewed-on: https://code.wireshark.org/review/24310
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 07:47:41 +00:00
Stig Bjørlykke c57ab694ec Qt: Give focus to preference value in PreferenceEditorFrame
Select the preference value text and give focus when editing
a single preference.

Ping-Bug: 14191
Change-Id: I8d5f91c40118b9d74f1a65f5311aa92dfeb3e1b7
Reviewed-on: https://code.wireshark.org/review/24306
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-09 07:36:20 +00:00
Stig Bjørlykke 25c5d830c9 Qt: Give focus to Title in ColumnEditorFrame
Select the title text and give focus to the title when Edit Column.

Bug: 14191
Change-Id: I04fc5f6bcc830a15ef43fa2d06a1a729df52e370
Reviewed-on: https://code.wireshark.org/review/24305
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-09 07:35:48 +00:00
Peter Wu 35a1907fe6 iograph: Use default graph values if io_graphs UAT file doesn't pass validation
Change-Id: I70c8ca7b5b31d284a12220fc6ce2a764ea9fbe6b
Fixes: v2.5.0rc0-631-g5b3e3ee587 ("Use UAT model for I/O graph")
Reviewed-on: https://code.wireshark.org/review/23366
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-08 22:07:44 +00:00
Stig Bjørlykke 1c25b71c7b mqtt: Rename mqtt_conv to mqtt_conv_t
This will clarify that it's a type.  Also remove unneeded init values.

Change-Id: If61b32a264ff60a26e775dc99f1c06d0aa555a4d
Reviewed-on: https://code.wireshark.org/review/24307
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 22:01:09 +00:00
Stig Bjørlykke 428b354f0d btmesh: Remove a debug g_warning
Change-Id: Ifc822efccfff5de32a54ca1f148a09ac3be4d0e3
Reviewed-on: https://code.wireshark.org/review/24308
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 21:04:30 +00:00
Roland Knall 8a6ea0e454 Qt: Further cleanup ByteView
This further separates ByteView and the rest of the system.

Using FieldInformation and DataPrinter, this is the final cleanup
of the ByteViewTab

Change-Id: If41521167527cf5664c2564cdd0d45fea0f3f612
Reviewed-on: https://code.wireshark.org/review/22783
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-08 20:20:31 +00:00
Flavio Santes 87431fef28 dissector/mqtt: Add 'Subscription Options/Retain Handling' text descriptions
Change-Id: I6dea2e9c190095105dc1441197ad00c9b3a66f89
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24272
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 17:26:47 +00:00
Flavio Santes af285603ee dissector/mqtt: Dissect the User Property field
Change-Id: I0a0e484a814a11b785d20fda6eba5c251db98188
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24269
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 16:50:32 +00:00
Flavio Santes 9f67e0a0d6 dissector/mqtt: Dissect MQTT v5.0 String/Binary Properties
Add routines to dissect the following MQTT v5.0 String/Binary Data
Property fields:

- Content Type
- Response Topic
- Correlation Data
- Assigned Client Identifier
- Authentication Method
- Authentication Data
- Response Information
- Server Reference
- Reason String

Change-Id: Ia0ad0597d32bacc58228376bb738b7092f4a1ad6
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24268
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 16:27:18 +00:00
Flavio Santes d5759b72e6 dissector/mqtt: Add the 'Subscription Options' dissector
Change-Id: I400430ca59c7492ae64dba6c4cca2485553988b9
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24271
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 16:26:27 +00:00
Dario Lombardo 36faf3203a udpdump: don't call inet_addr() for every packet.
Change-Id: Id3d9229f5d61390f2f4127c8dfdf445935297e85
Reviewed-on: https://code.wireshark.org/review/24300
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 15:36:09 +00:00
Orgad Shaneh 8730b2037a tshark/tfshark: Replace global prefs with a boolean
This partially reverts dc0e6ccc9f in favor
of a cleaner solution.

Change-Id: Ie57329020b5a7d15eb7d99aad3103843a14f07a6
Reviewed-on: https://code.wireshark.org/review/24278
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-11-08 15:00:04 +00:00
Richard Sharpe 2125275c7c smb2: Fix bug 6027 to correct SRT computations.
Fix a problem where SMB2 cancel and break messages
are included in SRT computations when it should not be.

Bug: 6027
Change-Id: I690fe6d9e14f26d85fe5c71830869780046d5d12
Reviewed-on: https://code.wireshark.org/review/24295
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-08 14:55:45 +00:00
Flavio Santes 3f189bed2f dissector/mqtt: Dissect the Subscription Identifier Property
Change-Id: Ia60b9c344fd572193374f57299b1829f17dfa24e
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24267
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 14:45:47 +00:00
Anders ca7bffbfc3 [Diameter 3GPP] Sub dissect AVP Code: 1677 Group-PLMN-Id.
Change-Id: I69ac8210dfcb43f9fc15e49c75dfb917976f0770
Reviewed-on: https://code.wireshark.org/review/24294
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 12:56:16 +00:00
Matej Tkac 6565923eb3 [PFCP] Fixed apply action flags bits referenced in register info.
In accordance with 3GPP 29.244 8.2.26 Apply Action.

Change-Id: Icef9bc9807efc255ece8fbde5e4c244d5f1fc525
Reviewed-on: https://code.wireshark.org/review/24301
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 12:41:38 +00:00
Stig Bjørlykke 1a3bd52e91 btmesh: Fix building without gcrypt
Change-Id: If77b36d764c07acd87a553134cebff246b8368fe
Reviewed-on: https://code.wireshark.org/review/24296
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-08 10:56:36 +00:00
Pascal Quantin 465f75b529 MQTT: add a missing break
Change-Id: I0a17fd44607a5a7452a7c2789140cce7cdcbd17b
Reviewed-on: https://code.wireshark.org/review/24298
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 10:52:18 +00:00
Roland Knall 4a1f8f5f27 Qt: ReleaseNotes and reformatting of Drag n' Drop
Added ReleaseNotes and changed the representation

Change-Id: Ica927368ef6c5d912a29e06733ad0a95e1886077
Reviewed-on: https://code.wireshark.org/review/24291
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 08:58:29 +00:00
Flavio Santes bf8d8ebfa4 dissector/mqtt: DISCONNECT and AUTH may not include the Property field
From the spec:

3.14.2.2.1 Property Length: The length of Properties in the DISCONNECT
packet Variable Header encoded as a Variable Byte Integer. If the
Remaining Length is less than 2, a value of 0 is used

In this commit we also assume that AUTH may not include the Property
field, given that DISCONNECT and AUTH share the same structure.

Change-Id: I5f55151df6b2066d924b2c16fb08a63b0903ef46
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24288
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 08:32:52 +00:00
Flavio Santes 76eab87c7d dissector/mqtt: Dissect MQTT v5.0 Four Byte Properties
Add routines to dissect the following MQTT v5.0 Four Byte
Property fields:

- Publication Expiry Interval
- Session Expiry Interval
- Will Delay Interval
- Maximum Packet Size

Change-Id: Ie902f679c5424f85f98c9ed113951ed0ee6411be
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24266
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 08:24:20 +00:00
Flavio Santes 9e7cfd32dd dissector/mqtt: Dissect MQTT v5.0 Two Byte Properties
Add routines to dissect the following MQTT v5.0 Two Byte
Property fields:

- Server Keep Alive
- Receive Maximum
- Topic Alias Maximum
- Topic Alias

Change-Id: I90b43cd315f31a34b10bf6065ea51549307e95f3
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24265
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 08:20:41 +00:00
Flavio Santes 458f97b1eb dissector/mqtt: Dissect MQTT v5.0 Byte Properties
Add routines to dissect the following MQTT v5.0 Byte
Property fields:

- Payload Format Indicator
- Request Problem Information
- Request Response Information
- Maximum QoS
- Retain Available
- Wildcard Subscription Available
- Subscription Identifier Available
- Shared Subscription Available

Change-Id: I28b95174ce811a92d8f22bf51c331169b5e4b925
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24264
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 07:54:34 +00:00
Roland Knall 96735846be Qt: Clean Drag-n-Drop Mimetype for toolbar
Cleans up the mime type to use a class instead of a mimetype
string

Change-Id: I122ba9b39de86d8e263f2204715911a2b0ac75cd
Reviewed-on: https://code.wireshark.org/review/24286
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-08 07:26:03 +00:00
Roland Knall 4d6454e180 Qt: Drag n Drop Filter expression from Packet Tree
Drag and Drop a field from the packet tree to the displayfilteredit
or the toolbar and drop it there to either apply the filter (or prepare
it by holding down the Shift key) or create a new toolbar button

Change-Id: I42645a02223c71315e91e0d58eb1b54ebab4fd58
Reviewed-on: https://code.wireshark.org/review/24280
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-08 07:25:54 +00:00
Michael Mann 371b5c526b Have circuit functionality more closely mirror conversation functionality
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-08 07:25:25 +00:00
Pascal Quantin f8a1878202 proto.c: fix field display test in hfinfo_number_value_format_display64()
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-08 06:59:40 +00:00
Jeff Widman 0e85c0ad1e Fix typo: Heatbeat --> Heartbeat
Change-Id: I864850b29f9c816a4d1592cd5bba2b9d0159b139
Reviewed-on: https://code.wireshark.org/review/24289
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 03:31:25 +00:00
Graham Bloice b6d6eb9097 CMake: Detection of HTMHelp
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-07 23:01:44 +00:00
Dario Lombardo 0c1ea1cee1 fcp: create conversation if it doesn't exist.
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-07 15:52:31 +00:00
Graham Bloice 62e81c5846 Open Windows CHM Help from Help menu.
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-07 15:36:43 +00:00
Orgad Shaneh dc0e6ccc9f tshark/tfshark: Do not apply console.log.level before it is set
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-07 13:51:38 +00:00
Jaap Keuter 5dd6a9cef9 isobus-vt: make sure to close the id file (CID-1413873)
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-07 13:45:56 +00:00
Simon Barber 99a53b2b95 packet-ieee80211: all frames have address 1 = RA
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-07 13:38:09 +00:00