The default VCSVERSION from make-version.pl is based on the "git
archive" information (for tarballs) or uses "git describe" to discover
the version. Distributors such as Debian who directly build from a Git
repository might want to include a deterministic value, therefore add a
new option to achieve this.
Change-Id: I5a39670519f4d846020d917b124fc4d548d00137
Reviewed-on: https://code.wireshark.org/review/34100
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Incorrect token index being passed to Thread CoAP dissector.
Change-Id: Ic64060134c655a5e7cfdee0cd0b78b98b60f090e
Reviewed-on: https://code.wireshark.org/review/34154
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Make sure, that the main window only recognizes drop events containing
text/uri-list mime-types, as those are the only ones containing file
drops. All other mime-types (e.g. display filter drops) will be ignored
Bug: 15986
Change-Id: Id4338f75c563d2d177d858d2de470db1ab3499f7
Reviewed-on: https://code.wireshark.org/review/34248
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
TLS requires unique conversations for every TLS session. With EAP-TTLS
over EAPOL, only a single conversation was created, breaking TLS.
Force a new conversation at the start of the EAP protocol to fix this.
This alone was not sufficient, the right conversation was not always
matched. This happened due to wildcard matching in EAP (NO_PORT_B) while
TLS does not use NO_PORT_B. TLS ended up setting a dummy port via
"conversation_set_port2" because PT_NONE is considered connection-less.
Even after treating PT_NONE as *not* connection-less in conversation.c,
the EAP Success message was not correctly matched against a conversation
and resulted into creation of another conversation.
To avoid all of that mess, just use the same conversation matching logic
as TLS, without NO_PORT_B. The original conversation tracking logic in
EAP was presumably added to avoid multiple conversations for EAP over
RADIUS (UDP), but that requirement does not seem necessary.
Verified with `tshark -2r eap-tls-bug-cert.pcap -otls.log_file:out.txt`,
two different `conversation =` values exist for the two sessions.
Bug: 15983
Change-Id: I3376624ee3ea627eaa6233d39ae3c1d19bdc98bb
Reviewed-on: https://code.wireshark.org/review/34247
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
A frequent question is what Wireshark version to use for a particular
QUIC draft version. These are documented on the QUIC Tools wiki, add a
reference to help users looking at the source code.
Change-Id: Ieb008d1fa5bfb91e11cb64613336b8bf3e98a5e8
Reviewed-on: https://code.wireshark.org/review/34239
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: Anders Broman <a.broman58@gmail.com>
Some of these links are broken, but most of the information is severely
outdated. Replace it my a more up-to-date list of references.
Change-Id: I2a7a6041317c281f56ee86fe720a63332d493943
Reviewed-on: https://code.wireshark.org/review/34238
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: Anders Broman <a.broman58@gmail.com>
With libnl1 its not possible to get from the message the same notice of
the interface being added or removed as with libnl3. This code has to be
reserved for libnl3 only. Make compilation of this code conditionsal.
Bug: 15981
Change-Id: I2588fd2ba6508a8544bdd4eac46436b4f78ee524
Reviewed-on: https://code.wireshark.org/review/34242
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This avoids multiple dissections on the second pass which could
potentially break decryption and TLS handshake reassembly.
Bug: 15982
Change-Id: I9f83fbd51c732140b831f7d5f29f46e9694e405c
Reviewed-on: https://code.wireshark.org/review/34237
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The new approach for radiotap headers is TLVs. Let people know there
are no more bits available for headers and point them to the correct
place: www.radiotap.org.
Change-Id: I8393c6ea32edd3cb09bcbf8c5e624c222b422c06
Reviewed-on: https://code.wireshark.org/review/34233
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The f5ethtrailer TLS diagnostic information is able to provide
TLS state information from the clientssl and serverssl profiles.
Render the correct info to properly formatted keylog entries
that could in turn be used to decrypt the TLS session in Wireshark.
Preference added to f5ethtrailer to allow disabling the
generation of keylog records
Bug: 15948
Change-Id: I69c02f45827f71d4dd26b733cdd87f99e71bc00d
Reviewed-on: https://code.wireshark.org/review/34141
Reviewed-by: Jason Cohen <kryojenik2@gmail.com>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Workaround a Qt 5.13 bug that made QTreeView::sortByColumn(-1)
ineffective and results in sorting rows by the first column in reverse
order.
This must be called before setModel since that already triggers sorting.
Bug: 15979
Change-Id: I86c26959d3cb9dd4118193dcda4b1308cc911290
Reviewed-on: https://code.wireshark.org/review/34226
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
The title names of each section are not presented correctly
Bug: 15977
Change-Id: I68ab0fb6fc7131f9d2af67fa38c509ed6808c7d3
Reviewed-on: https://code.wireshark.org/review/34218
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
(That's the master and 3.0.x buildbots; the 2.6 Mac buildbot is running
an older version of Apple's UNIX-for-Macs - sufficiently older that
Apple's name for it was different back then.)
While we're at it, note that it's been updated past VS 2013.
Change-Id: I063daa7c38ff58aed0c77950d4265b5544783f2c
Reviewed-on: https://code.wireshark.org/review/34217
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Various issues rose during restructuring which are now being
fixed with the help of unittests. Mainly also renaming new
profiles and createing copies from them, as well as deleting
profiles and keeping copies names
Change-Id: I39e1772c7be586fe07ea0613fa9e23d40d864012
Reviewed-on: https://code.wireshark.org/review/34214
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Do not call showHideMainWidgets() in initShowHideMainWidgets() because
this will override loaded recent values on startup.
Setting checked and visible based on recent values is done in layoutPanes()
and updateRecentActions().
This affects the following View settings: Main Toolbar, Filter Toolbar,
Wireless Toolbar, Status Bar, Packet List, Packet Details and Packet Bytes.
Also always hide empty_pane because it's never useful to show this.
Bug: 15976
Change-Id: Id63b8a5fdd263793a283137134f424d7cb4caf82
Reviewed-on: https://code.wireshark.org/review/34209
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Restructures dataPath for PROF_STAT_COPY to ensure correct labeling of
the hintLabel
Bug: 15974
Change-Id: I69f61f4f8db74ca52c3b72d32af2b2bb8b19957d
Reviewed-on: https://code.wireshark.org/review/34202
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Updates short frames commands and added read/write for Type 2 tags.
Change-Id: Ief7069cba8f6543290a246eda439b39c20c3079a
Reviewed-on: https://code.wireshark.org/review/34190
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Improve text for translation in the profile model
Change-Id: If1cb7f4e83c9a45729391ce8a69029d6bc95d87b
Reviewed-on: https://code.wireshark.org/review/34188
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Before the unzipped files are being copied from the temp directory,
they are checked against the stored list of profile names, to ensure,
that only allowed files are being imported.
Also ensures, that no empty directory exists for the skipped one
Bug: 15969
Change-Id: I6ae8c9fb5f63d089d42fc0ef18dbe84baec515a2
Reviewed-on: https://code.wireshark.org/review/34184
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Use hf_gsm_a_tmsi instead of hf_gsm_a_rr_tmsi_ptmsi. This allows easy
filtering of all messages that contains a given TMSI/PTMSI using a
filter with only one field name instead of two.
Change-Id: I356865ebdac9691abd8d14d44aac7ccf4e22e70c
Reviewed-on: https://code.wireshark.org/review/33990
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
And minor UI changes
Change-Id: Ieed1e5090c0f5adc6e41b386d9950443b30eb2da
Reviewed-on: https://code.wireshark.org/review/34180
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Add an item about marking packets using the middle mouse button to the
release notes.
Update the "Marking Packets" section of the User's Guide accordingly.
Use "menu:...[]" to mark up menu items in a bunch of places. It looks
like we need to a add a "guimenu" class to ws.css.
Change-Id: Ide99112f7643e509d8af8a4aa6ddb4287f3585cf
Reviewed-on: https://code.wireshark.org/review/34182
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Always store the last used directory when doing profile import,
even if no profiles where imported. A new directory may have been
used and the user may have selected the wrong .zip file.
Change-Id: I7ed9de8b62fa7a57623ffb3e737186f072a82255
Reviewed-on: https://code.wireshark.org/review/34183
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
https://cdn.f5.com/product/bugtracker/ID464934.html
F5 BIGIP v15.0.0 added the ability to provide debug
TLS key information when capturing on BIGIP. This is
provided as part of the f5ethtrailers. This dissector
decodes this data and will display it in the protocol
tree. Some of the data is useful for decryption, while
other data is state data to troubleshoot hadshake failures.
This change set is limited to dissection and display of
data available in the trailer.
Bug: 15948
Change-Id: I21398f9d9e46100a9906d1bcf49f41f9ea9bb1bc
Reviewed-on: https://code.wireshark.org/review/34140
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
If a graph does not contain any visible data (for example, "TCP Errors"
in a capture without TCP packets), the start offset is bogus. Ignore it
to avoid Time of Day being displayed as 01.01.1970.
Bug: 15247
Change-Id: I0e0a113dac6aebd42a4b48b89bbf563e96a8807a
Reviewed-on: https://code.wireshark.org/review/34129
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Change-Id: Ib0e4f8343d4acbdde956e35ac37dcf6a2937421f
Reviewed-on: https://code.wireshark.org/review/34181
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>