Age | Commit message (Collapse) | Author | Files | Lines |
|
Since CMake 3.15.0, CMAKE_BUILD_PARALLEL_LEVEL=0 is rejected. Set an
empty value to achieve the desired behavior (enabling parallelism).
Change-Id: I6d32bc7286d32c2f2a3605b42ef82e28342da440
Reviewed-on: https://code.wireshark.org/review/34686
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
|
|
'iso14443.write_block.number' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT16
Change-Id: I1e92e470acf1bda89b894dd8603309f7168bb069
Reviewed-on: https://code.wireshark.org/review/34681
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
'homeplug_av.st_iotecha.mfct.length' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT16
Change-Id: I77c2ae0568ecca9246e62fcca95aba28433d1b35
Reviewed-on: https://code.wireshark.org/review/34680
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Favor asynchronous show() as it does not create new event loop.
Change-Id: I01982806f87705f04138f15ae8eb084f1d4f9b2c
Reviewed-on: https://code.wireshark.org/review/34677
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Use signaling channel and command identifier to match CoC request
and response, and then use scid and dcid later to match SDUs.
Change-Id: If599d216aa9eb4c81db6eebdc4087afa696840a2
Reviewed-on: https://code.wireshark.org/review/34675
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I7ff9ca683ba085f05b948c069eaeab9dffaf6605
Reviewed-on: https://code.wireshark.org/review/34676
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
pytest 5.2.0 added support for callable scopes. In order to distinguish
those (`@pytest.fixture(scope=fn)`) from decorators (`@pytest.fixture`),
it added extra arguments which was not expected by our wrapper. See
https://github.com/pytest-dev/pytest/pull/5776 for the change.
Fixes the following error:
ImportError while loading conftest 'test/conftest.py'.
test/conftest.py:42: in <module>
from fixtures_ws import *
test/fixtures_ws.py:198: in <module>
@fixtures.fixture
test/fixtures.py:36: in fixture
return pytest.fixture(scope, params, autouse, ids, name)
E TypeError: 'bool' object is not iterable
We do not use non-keyword arguments, so it is safe to use `*` instead of
`*args` in the prototype.
Change-Id: I96220e0e85249ad58880e5de75f8987a0fdc16ef
Reviewed-on: https://code.wireshark.org/review/34672
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
|
|
On Linux we support CMake 3.5 so we cannot use cmake_parser_arguments()
with PARSE_ARGV option that was added in CMake 3.7.
Change-Id: I84e7b679c2a73e5a7a29ac83a3283aedf542f9a4
Reviewed-on: https://code.wireshark.org/review/34674
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
|
|
Bug: 16098
Change-Id: I194612102149ddf4e026b9a588ad80257bfb1d7d
Reviewed-on: https://code.wireshark.org/review/34673
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I156585f196918426786297309047598bb3a7fe82
Reviewed-on: https://code.wireshark.org/review/34667
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
The model index is unused as setData is used to initialize the editor.
Change-Id: If42bf59cd3f1f5e208bfff26b569c5c29d2013fd
Fixes: v3.1.1rc0-415-g149521d3de ("Qt: Do not call exec() when editing color preferences")
Reviewed-on: https://code.wireshark.org/review/34671
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
|
|
Make color value AdvancedPrefDelegate instances properly handle
QStyledItemDelegate setEditorData() and setModelData().
Change-Id: I1e289d124f7fc06f42fca9c0c4de572204214fcd
Reviewed-on: https://code.wireshark.org/review/34669
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Bug: 16099
Change-Id: I2b0b1a5578e384d5d71aa1aa4c417a7e86cb2616
Reviewed-on: https://code.wireshark.org/review/34668
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
|
|
Show the dialogs asynchronously so no new event loops are created. This
not only simplifies stack traces (reduces the nesting level) but also
prevents hard to debug problems (eg. Bug 15743) from happening.
Change-Id: I85821a1403839a5baca504b40efce0ede2f1e0cb
Reviewed-on: https://code.wireshark.org/review/34646
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
For a GRE protocol type of 0x008E, check the "sequence number present"
bit in the GRE header, if it's available, to see if the packet has an
ERSPAN header or not, rather than checking the entire header to see if
it's zero. (If the GRE header isn't available, assume no ERSPAN
header.)
For a GRE protocol type of 0x22EB, always treat the packet as having an
ERSPAN header.
That matches more closely what the most recent I-D for ERSPAN said.
Bug: 16089
Change-Id: I21119411e8485854fca85fa701b994bfa4e73941
Reviewed-on: https://code.wireshark.org/review/34664
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Change-Id: I6d455f93405718b26abfcda6bac756b0874450f0
Reviewed-on: https://code.wireshark.org/review/34658
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
|
|
Change-Id: Icf3df4f82f43df51b6ce416f3a159229cbe80351
Reviewed-on: https://code.wireshark.org/review/34656
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
|
|
Bug: 16086
Change-Id: I9904a75dd4c8e14f848f7977d5cb17aa0cc5fd4e
Reviewed-on: https://code.wireshark.org/review/34655
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: Ib6a4020eac5cc148823534bdd1260de4ade5db35
Reviewed-on: https://code.wireshark.org/review/34654
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
|
|
Bug: 16012
Dissector call-back function was initially added only for L2 LSP while it's
needed for both.
Change-Id: I9191da6c3ee6ac27daa698bddf0a2d2d99ea8f08
Reviewed-on: https://code.wireshark.org/review/34648
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
The "Follow Stream" button did not have any effect due to:
QObject::connect: No such slot MainWindow::openFollowStreamDialog(follow_type_t, guint) in /tmp/wireshark/ui/qt/main_window_slots.cpp:3034
QObject::connect: (sender name: 'TrafficTableDialog')
QObject::connect: (receiver name: 'MainWindow')
Change-Id: If9ecae9a971bdc31358d95af33a8245aa5df5911
Fixes: v3.1.1rc0-352-g9fff62e2a8 ("Qt, http2: Add Follow HTTP/2 Stream functionality")
Reviewed-on: https://code.wireshark.org/review/34653
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
Use a correct right value_string table.
Change-Id: I75ca54dc040b123a460d67fc1b6d49d9e062a49e
Reviewed-on: https://code.wireshark.org/review/34651
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Show the value symbolically, and don't dissect the payload as an
Ethernet packet if the value isn't 0, meaning "Ethernet".
This gets rid of the mis-dissection of the payload in the capture
atttached to bug 16089, although it doesn't dissect it any further, as
we don't know how to dissect it.
Change-Id: I97fce0f7a4f4336339bc90271aa7b19c97831abe
Ping-Bug: 16089
Reviewed-on: https://code.wireshark.org/review/34649
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
|
|
Fedora 30 changed the minizip-devel package from the old unsupported
minizip library from zlib to a fork[1].
The new minizip headers don't include zlib.h anymore.
[1]https://github.com/nmoinvaz/minizip
Change-Id: I29fdf1c0445138b86a012bfc79287a480977b0a6
Reviewed-on: https://code.wireshark.org/review/34637
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
5/5 developers of QUIC implementations favor decimal over hex, so change
it. This matches the display of the quic.stream.stream_id field.
Change-Id: I67bfe481f3066f9b99c13b24e413d41f3f59dc1f
Reviewed-on: https://code.wireshark.org/review/34647
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Ib209a9f055a20692324d0155a0fec9ca30102f93
Reviewed-on: https://code.wireshark.org/review/34643
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
RFC8205 specifies the BGPsec extension. The extended Wireshark dissector
consists of:
- BGPsec Capability
a capability that holds the BGPsec version, a direction and reserved
bits.
- BGPsec_PATH
a BGP path attribute. Such a path contains Secure Path Segments and
Signature Segments.
Change-Id: Iba5e17b9139bcac378adf2bcc2dfb369064f7a08
Reviewed-on: https://code.wireshark.org/review/34639
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
|
|
Change-Id: I0957a8ce104c5ff81680e722c564337eff052c2f
Reviewed-on: https://code.wireshark.org/review/34642
Reviewed-by: João Valverde <j@v6e.pt>
|
|
This prevents the mix of debug/release Universal CRT library in a Wireshark.
Bug: 16030
Change-Id: I2961541824caf3bef0a08c72b242427b5406a9bd
Reviewed-on: https://code.wireshark.org/review/34444
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
|
|
Change-Id: Iabaeff9b7653291043412cc28bc85ee91b06daa1
Reviewed-on: https://code.wireshark.org/review/34638
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Accept foo_ROOT CMake and environment variables to influence
the search path for find_package(foo).
See https://cmake.org/cmake/help/v3.15/policy/CMP0074.html
Change-Id: Ifa70fbc37a9d7a6da15eda4474d08fe45a1724ad
Reviewed-on: https://code.wireshark.org/review/34636
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
|
|
Change-Id: I4eff2e7b75f3dd896ebd63e50a83f90da6a910b6
Reviewed-on: https://code.wireshark.org/review/34606
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
|
|
Change-Id: I0527a8ce19838c15811471eddce65310286eddb6
Reviewed-on: https://code.wireshark.org/review/34641
Reviewed-by: João Valverde <j@v6e.pt>
|
|
Seems to be just a toy program without any build rules.
Change-Id: I331a55b1af63290f352c9ae71e4add52ee70d474
Reviewed-on: https://code.wireshark.org/review/34607
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
QUIC needs to read the ALPN to select the dissector for STREAM
dissection.
Change-Id: I3c3a2d5a6fe2f8f127b31287ed4ad3e3b4b0e56c
Reviewed-on: https://code.wireshark.org/review/34633
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change the STREAM frame to include more details:
- STREAM Stream ID: 11
+ STREAM id=0xb fin=0 off=0 len=1 uni=1
The output is roughly inspired by the ngtcp2 debug logs.
Change-Id: If0d3aaa3f3731da1ea032b162aa5b9c5b4b34247
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/34632
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: I628395a761291a105fdc1ef79ce05db0b00a4ab3
Reviewed-on: https://code.wireshark.org/review/34630
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Update the macOS packaging sections to reflect current reality.
Change-Id: I6795787c0d4d3c9a85da14bdb69a31fc74e9ddf2
Reviewed-on: https://code.wireshark.org/review/34624
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Add osx-dmg.sh back and make it a simple wrapper around dmgbuild and
codesign.
Change-Id: I0baa21fd971aa1b06e1a6700881cd7625dffff35
Reviewed-on: https://code.wireshark.org/review/34629
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Use G_GUINT64_FORMAT for uint64.
Change-Id: Id5f686f0fcfcd2f1ee31b7e76b0a8028919e1a63
Reviewed-on: https://code.wireshark.org/review/34628
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
The Scalable service-Oriented MiddlewarE over IP (SOME/IP) is the
standard communication middleware for IP and Ethernet based
communication. It supports Service Discovery, RPC, Pub/Sub, and more.
Bug: 16014
Change-Id: Ifd6549818ccc87f376a5fb9ba1d6c335818c6e00
Signed-off-by: Dr. Lars Völker <lars.voelker@bmw.de>
Reviewed-on: https://code.wireshark.org/review/34497
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|
|
Change-Id: If2e28e4708f1d71fa4e7b549a2ba021557711d4e
Reviewed-on: https://code.wireshark.org/review/34627
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I273eb5174ef92146aa48eda8a2e37a13828d73f4
Reviewed-on: https://code.wireshark.org/review/34626
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I7388ee926ebd31988279a0dbdc21e08c0d127171
Reviewed-on: https://code.wireshark.org/review/34625
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Scripting the Finder in order to lay out our disk image assumes that we
have access to the Finder. This might not be the case on our builder,
and it arguably shoudn't be.
Switch from using a Bash script + AppleScript to build and lay out our
.dmg to using dmgbuild, which creates our .DS_Store directly using
Python's ds_store module.
Change-Id: I2e4a9dd89bc8297c9cbd9df7aa8d3a44447bde85
Reviewed-on: https://code.wireshark.org/review/34623
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: I6ac18a0379c4366c12dfb7dc00970e68451563a1
Reviewed-on: https://code.wireshark.org/review/34605
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
|
|
arrange_dmg.applescript is failing on the macOS builder, so comment it
out for now.
Change-Id: Ibe7bf249623832954e9f67d241513b549dff990c
Reviewed-on: https://code.wireshark.org/review/34621
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Create ChmodBPF installer and uninstaller packages using pkgbuild and
productbuild. Place them in Wireshark.app/Resources/Extras.
Add a path_helper installer and uninstaller which respectively add and
remove /etc/*paths.d/Wireshark.
Remove the PackageMaker and utility-launcher assets and build targets.
Show a message in the main welcome screen if we don't have capture
permissions. Add an link which launches the ChmodBPF installer.
Add a "macOS Extras" item to About → Folders.
Migrate "Read me first" from RTF to Asciidoctor, which lets us add links
and looks like our other documentation.
Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain
text. Always run it in osx-dmg.sh.
Bug: 6991
Bug: 12593
Bug: 11399
Ping-Bug: 16074
Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90
Reviewed-on: https://code.wireshark.org/review/31047
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
|
|
Change-Id: Iedcc6480e1cd0cf2dc0461affd41fffb29daac08
Reviewed-on: https://code.wireshark.org/review/34616
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
|
|
S-NSSAI was not dissected correctly.
Change-Id: I715f3c4af6a92dfec3e2a3a7ad4b45bb7227aa68
Reviewed-on: https://code.wireshark.org/review/34617
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
|