In proto_tree_add_item_ret_time_string, we should return the result of
proto_tree_add_node directly like other similar functions.
Change-Id: I5f0cdc32ee3e69ecf3c62f1d56cb8278c91c9c45
Reviewed-on: https://code.wireshark.org/review/36716
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
Check is enabled by #ifdef ENABLE_CHECK_FILTER
Remaining issues found by this check are fixed here,
along with a documentation note that the entries
are checked in order and the first match is used.
The only issue not yet fixed is in packet-isup.c,
where the spec was not available to me.
Change-Id: Ife747cda9b91a265bc2b81ce0a53f55f3389919e
Reviewed-on: https://code.wireshark.org/review/36708
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Commit 3398c2898d duplicated the '-i'
option in the synopsis. Remove this again.
Change-Id: I85fb78515910b11e9dff9b3aa876746b2ff11fa4
Reviewed-on: https://code.wireshark.org/review/36678
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Updated the displayed protocol information according the latest version
of the standard - IEEE Std C37.118.2-2011
Refactored phasors dissection for a more complete display of information
Change-Id: I03c477b02236d667401c9e883947de47ad776278
Reviewed-on: https://code.wireshark.org/review/36675
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Coverity Scan reports an out-of-bounds acccess on memcopy from addr1
of 802.11 mac header. This out-of-bounds access is a controlled access
knowing that addr2 and addr3 is located in memory right after addr1.
Type cast to a guint8 pointer to indicate that there's no fix length.
This should silent the Coverity Scan error reported.
Coverity CID 1460754
Change-Id: Ief2280f1b686deebf3aba74f19a5730c66d4d313
Reviewed-on: https://code.wireshark.org/review/36706
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This fixes a -Wused-but-marked-unused compiler warning.
Change-Id: I44a04e60020b392d4d2c700e157617938a6164db
Reviewed-on: https://code.wireshark.org/review/36704
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This fixes a -Wused-but-marked-unused compiler warning.
Change-Id: I85d92954821feda80f1189a0e1b2c2071a25610a
Reviewed-on: https://code.wireshark.org/review/36702
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This fixes a -Wused-but-marked-unused compiler warning.
Change-Id: I6a4b5a98237bdb1573bb893eeea2b510d7780f06
Reviewed-on: https://code.wireshark.org/review/36701
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Remove some if and switch statements that do nothing.
Change-Id: I3de6aaa5a67c96864d6d532e44841bf7d20ec038
Reviewed-on: https://code.wireshark.org/review/36700
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This fixes -Wused-but-marked-unused compiler warnings.
Change-Id: I7edaf1a0da62d8534718a66c7c5ad8ab8112ccec
Reviewed-on: https://code.wireshark.org/review/36699
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Newer version of CMake complains with warnings like the one below:
The package name passed to `find_package_handle_standard_args` (MINIZIP)
does not match the name of the calling package (Minizip). This can lead to
problems in calling code that expects `find_package` result variables
(e.g., `_FOUND`) to follow a certain pattern.
Change the capitalization of the variables to match the filename.
Change-Id: Ic3c88f33f5a2bfeba3fa3479df60210e67d25ff0
Reviewed-on: https://code.wireshark.org/review/36695
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
python ssl has some conflict with installed packages. Installing pip
stuff before other packages fixes it.
Bug: 16478
Change-Id: Iba5a5eceb5e27a435544aa65e0fad683f798f3f3
Reviewed-on: https://code.wireshark.org/review/36669
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
If we're not going to distinguish between "Loading" and "Reloading" in
the progress bar here, we don't need to check, when creating the
progress bar, whether we're loading or reloading.
Should fix Coverity CID 1461194.
Change-Id: Ib58799c3a43a7ff549006034e2a47cce1ea87a98
Reviewed-on: https://code.wireshark.org/review/36689
Reviewed-by: Guy Harris <gharris@sonic.net>
Action v1 is buggy and has been fixed in v1.1.1.
Error:
sudo ln -sf /Users/runner/hostedtoolcache/Ruby/2.6.5/x64/bin/ruby /usr/bin/ruby
ln: /usr/bin/ruby: Operation not permitted
(node:1010) UnhandledPromiseRejectionWarning: Error: The process 'sudo' failed with exit code 1
at ExecState._setResult (/Users/runner/runners/2.165.2/work/_actions/actions/setup-ruby/v1/node_modules/@actions/exec/lib/toolrunner.js:547:25)
at ExecState.CheckComplete (/Users/runner/runners/2.165.2/work/_actions/actions/setup-ruby/v1/node_modules/@actions/exec/lib/toolrunner.js:530:18)
at ChildProcess.<anonymous> (/Users/runner/runners/2.165.2/work/_actions/actions/setup-ruby/v1/node_modules/@actions/exec/lib/toolrunner.js:430:27)
at ChildProcess.emit (events.js:210:5)
at maybeClose (internal/child_process.js:1021:16)
at Process.ChildProcess._handle.onexit (internal/child_process.js:283:5)
Change-Id: I2b715291265d4675b46850006bd3fbecaaf9f4be
Reviewed-on: https://code.wireshark.org/review/36667
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
From
commit 3affdac9d2de60a848b299d6bbb0bb94e6b6042b
Author: Brent Cook <brent@boundary.com>
Date: Fri Apr 19 11:12:19 2013 -0500
nic IE decode
in https://github.com/boundary/wireshark, with some fixes made.
Change-Id: I006d118c5dfa4f716aa185b71b2bcc80b7c0cb7e
Reviewed-on: https://code.wireshark.org/review/36679
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
From
commit 9df4aaea9dc3005682527cedef14520a9df1a981
Author: Brent Cook <brent@boundary.com>
Date: Fri Apr 19 10:02:39 2013 -0500
decode Boundary bprobe meter ID IEs
in https://github.com/boundary/wireshark, with some fixes made.
Change-Id: Ia77c28807ac7165e0e1e590442129fe67a942e07
Reviewed-on: https://code.wireshark.org/review/36674
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
Fix subtree ett for COI
Change-Id: I3050a2fe797318947253efcdd4b310f98b691a14
Reviewed-on: https://code.wireshark.org/review/36670
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Pass to the routines that handle particular ISIS PDU types a tvbuff for
the *full* PDU; some PDU types may have a checksum CLV type that
checksums the *entire* PDU.
Pass an isis_data_t * around to various routines, rather than passing
some individual bits of information around.
Add to that structure:
the PDU length from the common-to-all-PDU-types part of the ISIS
header;
a proto_item * for the header length field;
an expert_field * for a "the header length is bad" error.
Use the PDU length from that structure when handling the aforementioned
checksum CLV.
When dissecting the PDU-type-specific part of the ISIS header, check to
make sure we're not going past the header length and, if we are, report
it with an expert info, using the header length field proto_item * and
expert_field * from that structure.
Show the type field in sub-TLVs of the Group Address TLV (RFC 7176
section 2.1) and, if the type is unknown, add a top-level item with the
type and length fields under it.
This fixes some bugs.
Bug: 16477
Change-Id: I875306d9d4fd8f65a60b7a6d3be7e356afabe851
Reviewed-on: https://code.wireshark.org/review/36671
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
packet-usbll.c:557:1: warning: no previous prototype for function 'proto_register_usbll' [-Wmissing-prototypes]
packet-usbll.c:678:1: warning: no previous prototype for function 'proto_reg_handoff_usbll' [-Wmissing-prototypes]
Change-Id: I407397ebaa4f60674d52ccd066e1e79d00371d6d
Reviewed-on: https://code.wireshark.org/review/36656
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
packet-rtps.c:1878:6: warning: no previous prototype for ‘rtps_util_add_coherent_set_general_cases_case’ [-Wmissing-prototypes]
packet-rtps.c:1969:6: warning: no previous prototype for ‘rtps_util_detect_coherent_set_end_empty_data_case’ [-Wmissing-prototypes]
Change-Id: If9c559f4ee341d0268e34cad51f11e8a9115961e
Reviewed-on: https://code.wireshark.org/review/36655
Reviewed-by: Juan Jose Martin Carrascosa <juanjo@rti.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
packet-cfdp.c:1404:1: warning: no previous prototype for ‘dissect_cfdp_as_subtree’ [-Wmissing-prototypes]
Change-Id: I671c94bf1557ceef8a87d6da859c1e6ee76b2fca
Reviewed-on: https://code.wireshark.org/review/36654
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Change-Id: Ia076582c30a1763a531f8fc3bc13ebd88d7aa728
Reviewed-on: https://code.wireshark.org/review/36666
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Adding back progress titles in g3069129fe5 revealed the fact that we had
duplicate messages in the Qt UI and in file.c. Remove the ones in file.c
in favor of the Qt UI, since the latter are translated.
Change-Id: I5ff8f1bd34e963e9e66c01420ad8c5fe9c2f0caa
Reviewed-on: https://code.wireshark.org/review/36646
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
- Complete list of possible sub elements for beacon measurement
request/report (as of IEEE P802.11REVmd/D3.2)
For sub elements that are also regular elements (request, extended
request, AP channel report and wide bandwidth channel switch) use
the "regular" dissect function instead of duplicating the code.
- Create a sub-tree for each sub element
- Just like request part, add warning for unknown sub elements in
report and properly skip them.
- Correct offset used to read fixed size fields in 'reported frame
body' and skip those fields if the frame is reported with several
fragment
- Used already defined "display functions" for RCPI and RSNI fields in
beacon report (slightly update RSNI function).
- Update TIM element parsing to allow a size of 2 as TIM might be
truncated in frame reported body.
Bug: 16469
Change-Id: If339cf4990b2bf8ec049ce23aa9461c8a9d85be2
Reviewed-on: https://code.wireshark.org/review/36643
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>
dot11decrypt_util.c:34:6: warning: no previous prototype for ‘dot11decrypt_construct_aad’ [-Wmissing-prototypes]
Change-Id: Ideda2d18de88aed9d3fd045a02ead6446b0dbfce
Reviewed-on: https://code.wireshark.org/review/36653
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Have ws80211_init() return an indication that channel setting isn't
supported on those platforms.
In dumpcap, try to set up ws80211 before checking the channel argument
and, if it fails, report the failure, rather than failing because the
"convert channel name to channel code" routine fails.
See
https://ask.wireshark.org/question/15535/dumpcap-k-is-not-accepting-channel-type-values/
for an example of confusion caused by the previous behavior.
Change-Id: I303f560704700bbcd4f0ecea041f8632744212f3
Reviewed-on: https://code.wireshark.org/review/36659
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
Martin Kaiser