Commit Graph

77657 Commits

Author SHA1 Message Date
Pascal Quantin f48a62f4ef CMake: fix some warnings reported by CMake 3.17
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>
2020-04-05 07:56:57 +00:00
Gerald Combs 8bf6c7b3bf WSDG: Migrate the asn2wrs content from the wiki.
Asn2wrs generates quite a bit of our dissector code, so convert some of
our asn2wrs wiki pages to a WSDG chapter. Conversion was done using the
script below and editing as needed.

----
OUT_ADOC="docbook/wsdg_src/WSDG_chapter_asn2wrs.adoc"

cp /dev/null "$OUT_ADOC"

PAGES="
    Asn2wrs
    Asn2wrs_Handmassaging_the_ASN_file
    ASN1_sample
    Asn2wrsAuxiliary
    #.END
    #.EXPORTS
    #.FN_BODY
    #.INCLUDE
    #.MODULE_IMPORT
    #.NO_EMIT
    #.PDU
    #.PDU_NEW
    #.REGISTER
    #.REGISTER_NEW
    #.USER_DEFINED
"

for PAGE in $PAGES ; do
    PAGE=${PAGE/\#/%23}
    curl "https://wiki.wireshark.org/$PAGE" \
        | xmllint --html --format --xpath '//div[@id="content"]' - \
        | pandoc -f html -t asciidoctor \
        | sed -e 's/\[\#[^ ][^ ]* .anchor\]##*//g' -e 's/\[content\]//g' \
        | cat -s \
        >> "$OUT_ADOC"
done
----

Change-Id: Ibc02b7b463dfc37abf5c2fd0a4e66f6161d290f6
Reviewed-on: https://code.wireshark.org/review/36707
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>
2020-04-05 07:02:42 +00:00
Pascal Quantin a3cf955113 X2AP: upgrade dissector to v15.9.0
Change-Id: I3a3c73eac9a576f4c494986b19332330523a9883
Reviewed-on: https://code.wireshark.org/review/36698
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-04 17:30:10 +00:00
Pascal Quantin 64daf0136c LTE RRC: upgrade dissector to v15.9.0
Change-Id: I214a985e5d421070d931eb90d5f0848998dfdca2
Reviewed-on: https://code.wireshark.org/review/36697
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-04 17:29:53 +00:00
Pascal Quantin 7fb4ae4c34 NAS 5GS: add dissection og multiple payloads container
Change-Id: If2fb7916e757cdbba445a7cd3a41208cab208c9f
Reviewed-on: https://code.wireshark.org/review/36696
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-04 16:16:50 +00:00
Alexis La Goutte 6b87ea0562 zbee_se: fix typ found by range_string checking
Notification Scheme (zbee_zcl_se.met.mirror_report_attribute_response.notification_scheme) hidden by earlier entry (prev="For MSP Requirements":  129 -> 255)  (this="Reserved":  255 -> 255)
Notification Scheme (zbee_zcl_se.met.configure_mirror.notification_scheme) hidden by earlier entry (prev="For MSP Requirements":  129 -> 255)  (this="Reserved":  255 -> 255)
Notification Scheme (zbee_zcl_se.met.configure_notification_scheme.notification_scheme) hidden by earlier entry (prev="For MSP Requirements":  129 -> 255)  (this="Reserved":  255 -> 255)
Notification Scheme (zbee_zcl_se.met.configure_notification_flags.notification_scheme) hidden by earlier entry (prev="For MSP Requirements":  129 -> 255)  (this="Reserved":  255 -> 255)
Notification Scheme (zbee_zcl_se.met.get_notified_msg.notification_scheme) hidden by earlier entry (prev="For MSP Requirements":  129 -> 255)  (this="Reserved":  255 -> 255)

Change-Id: If288052e7d02f6c4360f458e0496d9c05a245916
Reviewed-on: https://code.wireshark.org/review/36690
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-04 11:54:07 +00:00
Martin Mathieson d9c5c59f50 EISS: Fix a typo in range_string (Application Id)
Change-Id: If0f7052067e5ad6932360ce29d584d997ee87c91
Reviewed-on: https://code.wireshark.org/review/36693
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-04-04 10:34:27 +00:00
Martin Mathieson 6c7583fc93 WiFi NAN: Fix range_string typos (ranging setup type)
Change-Id: I5999cbb964e75309c7c310014a2064626cf562f2
Reviewed-on: https://code.wireshark.org/review/36692
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-04-04 10:04:41 +00:00
Martin Mathieson e97ba4b489 TN5250: Fix issue with range_string entry hiding those below.
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PIP See Through On":  520093697 0x1f000001 -> 520093697 0x1f000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PIP SeeThrough Off":  520093696 0x1f000000 -> 520093696 0x1f000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Freeze PIP":  536870913 0x20000001 -> 536870913 0x20000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Resume After Freeze":  536870912 0x20000000 -> 536870912 0x20000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Channel":  301989888 0x12000000 -> 301989988 0x12000064)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set Antenna Tuner Source":  285212672 0x11000000 -> 285212672 0x11000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set Cable Tuner Source":  285212673 0x11000001 -> 285212673 0x11000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Disable Internal Speaker":  553648129 0x21000001 -> 553648129 0x21000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Enable Internal  Speaker":  553648128 0x21000000 -> 553648128 0x21000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Keyboard Disable":  385875969 0x17000001 -> 385875969 0x17000001)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Keyboard Enable":  385875968 0x17000000 -> 385875968 0x17000000)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Brightness":  218103808 0xd000000 -> 218103908 0xd000064)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Color":  251658240 0xf000000 -> 251658340 0xf000064)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Contrast":  234881024 0xe000000 -> 234881124 0xe000064)
value_range_string error:  Video/Audio Control Data (tn5250.vac_data) hidden by earlier entry (prev="Set PIP Location and Size":  0 0x0 -> 4294967295 0xffffffff)  (this="Set PC/TV Tint":  268435456 0x10000000 -> 268461156 0x10006464)
value_range_string error:  Data Field (tn5250.dfdpck_data_field) hidden by earlier entry (prev="Invalid Data Field Type":  0 0x0 -> 64 0x40)  (this="Top Row Command Key Functions":  64 0x40 -> 64 0x40)

Change-Id: I3596fa1a62c6f0e7c115551be137162ddb6679a6
Reviewed-on: https://code.wireshark.org/review/36683
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-04-04 09:32:47 +00:00
Dario Lombardo c474b70f8b github: move pip installations upwards.
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>
2020-04-03 22:33:34 +00:00
Guy Harris e285c7c1da Eliminate duplicate code.
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>
2020-04-03 18:48:40 +00:00
Guy Harris 5a9c86f5a7 OICQ: Add command 0x03f7 as "Withdraw message"
Taken from pull request

	https://github.com/boundary/wireshark/pull/2

by ShieLan, from the boundary/wireshark repository.

Change-Id: Ib93a888de543eb74bf11483120afc240c5519eab
Reviewed-on: https://code.wireshark.org/review/36688
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-04-03 17:52:30 +00:00
Dario Lombardo 2f514106ea github: don't install ruby twice.
Change-Id: Id6edfca6f98ecfd5c30b5973f81980a8e8d935d4
Reviewed-on: https://code.wireshark.org/review/36668
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2020-04-03 16:27:55 +00:00
Dario Lombardo 65bcd03ce8 github: install ruby via action v1.1.1.
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>
2020-04-03 16:27:42 +00:00
Guy Harris 764b4d3bb3 netflow: decode RTT
From

    commit 07eade8124fd1d5386161591b52e177ee6ea849f
    Author: Brent Cook <brent@boundary.com>
    Date:   Fri Apr 19 12:59:45 2013 -0500

    decode RTT

in https://github.com/boundary/wireshark, with some fixes made.

Change-Id: Ib0393fc201f59cfec566d4fe5309a1e06b641e8a
Reviewed-on: https://code.wireshark.org/review/36682
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-04-03 16:03:26 +00:00
Guy Harris c0186ba7f1 netflow: nic IE decode
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>
2020-04-03 09:25:22 +00:00
Alexis La Goutte b94260d0f6 zbee_aps: fix typo found by range_string checking
Profile (zbee_aps.profile) hidden by earlier entry (prev='IEEE_1451_5':  48896 -> 48896)  (this='IEEE_1451_5':  48896 -> 48896)
Profile (zbee_aps.profile) hidden by earlier entry (prev='Unallocated Manufacturer-Specific':  48896 -> 49151)  (this='IEEE_1451_5':  48896 -> 48896)

Change-Id: I352d63a447d209472005221a0276f7c681db8bb5
Reviewed-on: https://code.wireshark.org/review/36681
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-04-03 08:56:27 +00:00
Alexis La Goutte 18781916da isakmp: fix typo found by range_string checking
Notify Message Type (isakmp.notify.msgtype) hidden by earlier entry (prev=RESERVED:  15 -> 16)  (this=RESERVED:  15 -> 16)

Change-Id: I3a371587f203ff845ff3f0c9c52a4e6feb714f92
Reviewed-on: https://code.wireshark.org/review/36680
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-04-03 08:49:10 +00:00
Guy Harris 324ec99d6d netflow: decode Boundary bprobe meter ID IEs
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>
2020-04-03 08:17:11 +00:00
Pascal Quantin 37831185f0 GSM SMS: fix gsm_sms_tp_failure_cause_values array definition
Change-Id: I3622e824592b66144fe4e1be3c82bf5e207aaf43
Reviewed-on: https://code.wireshark.org/review/36677
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-03 07:51:29 +00:00
Pascal Quantin 6d471c9a22 Diameter 3GPP: fix diameter_3gpp_qos_delay_cls_vals array definition
Change-Id: Id8df6889f177e203380a7cc98d15d8cb7514bb03
Reviewed-on: https://code.wireshark.org/review/36676
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-03 07:51:10 +00:00
Guy Harris 024e6cf1e7 added fastip (Boundary) enterprise ID
From

    commit f8e7530fbef3b969facca42929f0fe6c8e1fd6bd
    Author: Brent Cook <brent@boundary.com>
    Date:   Fri Apr 19 10:02:09 2013 -0500

        added fastip (Boundary) enterprise ID

in https://github.com/boundary/wireshark.

Change-Id: I8afdb1ce1d96e194140175c63d66dcc7df46bbdf
Reviewed-on: https://code.wireshark.org/review/36673
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-04-03 06:50:15 +00:00
Jiří Engelthaler a4220efead IEC104: Add dissection of parameters P_ME_NA_1, P_ME_NB_1, P_ME_NC_1
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>
2020-04-03 06:28:52 +00:00
Guy Harris ec2ca11c9c Clean up a number of things.
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>
2020-04-03 00:21:37 +00:00
Alexis La Goutte a2b3b0d49f usbll: fix no previous prototype for function
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>
2020-04-02 14:47:43 +00:00
Alexis La Goutte 1467f6e57d rtps: fix no previous prototype for function
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>
2020-04-02 14:47:32 +00:00
Alexis La Goutte 2346ad87c0 cfdp: fix no previous prototype for function
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>
2020-04-02 14:47:18 +00:00
Martin Mathieson acc6a61ddb RTCP: Fix wrong value in rtcp_mcpt_field_id_vals (Queued User ID)
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>
2020-04-02 09:55:22 +00:00
Dario Lombardo 772813fcc7 pluginifdemo: fix compilation when it's enabled.
Enable the plugin with ENABLE_PLUGIN_IFDEMO=1.

Change-Id: I8ebc076d3b4ea66443d58e57dce0d235a214a2bb
Reviewed-on: https://code.wireshark.org/review/36606
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2020-04-02 08:50:06 +00:00
Gerald Combs e37a7abf56 Remove duplicate status messages.
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>
2020-04-02 08:13:06 +00:00
Dario Lombardo 3885912cca proto: fix invalid types in hf check routine.
The conditional code compiles with ENABLE_CHECKHF_CONFLICT=1.
The mix of string_value and string_value64 requires to split
up the code, and a macro seems to be the most suitable solution
since types are involved.

The error raises on Ubuntu 18.04:

FAILED: epan/CMakeFiles/epan.dir/proto.c.o
/usr/bin/cc -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DWS_BUILD_DLL -Depan_EXPORTS -I. -I../ -isystem /usr/include/glib-2.0 -isystem /usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/lua5.2 -I/usr/include/libxml2 -Iepan -I../epan -fvisibility=hidden  -fexcess-precision=fast -Wall -Wextra -Wendif-labels -Wpointer-arith -Wformat-security -fwrapv -fno-strict-overflow -Wvla -Waddress -Wattributes -Wdiv-by-zero -Wignored-qualifiers -Wpragmas -Wno-overlength-strings -Wno-long-long -Wframe-larger-than=32768 -Wc++-compat -Wunused-const-variable -Wshadow -Wold-style-definition -Wstrict-prototypes -Wlogical-op -Wjump-misses-init -Werror=implicit -Wno-pointer-sign -std=gnu99  -O2 -g -DNDEBUG -fPIC   -isystem /usr/include/mit-krb5 -Werror -MD -MT epan/CMakeFiles/epan.dir/proto.c.o -MF epan/CMakeFiles/epan.dir/proto.c.o.d -o epan/CMakeFiles/epan.dir/proto.c.o   -c ../epan/proto.c
../epan/proto.c: In function ‘tmp_fld_check_assert’:
../epan/proto.c:8013:18: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types]
     start_values = VAL64_STRING_EXT_VS_P(((const val64_string_ext*)hfinfo->strings));
                  ^
cc1: all warnings being treated as errors
[27/388] Building CXX object ui/qt/CMakeFiles/qtui.dir/coloring_rules_dialog.cpp.o
ninja: build stopped: subcommand failed.

Change-Id: I77c424bac96a1bbe81c0826faef66df7cc476ec4
Reviewed-on: https://code.wireshark.org/review/36604
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 07:47:23 +00:00
Cedric Izoard e07f75f795 ieee80211: Beacon Radio Measurement request/report update
- 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>
2020-04-02 07:45:47 +00:00
Alexis La Goutte 52ae96e360 dot11decrypt_util.c: fix no previous prototype for function
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>
2020-04-02 07:43:49 +00:00
Martin Mathieson c68b7cb74a DTN: Fix dissection of the Bundle Refusal Reason.
Spotted by ENABLE_CHECK_FILTER check.

                               0 1 2 3 4 5 6 7
                              +-+-+-+-+-+-+-+-+
                              |  0x3  | RCode |
                              +-+-+-+-+-+-+-+-+

Change-Id: I6bf66b13ee3c8e7b59c4c463c7ccebf6db27f497
Reviewed-on: https://code.wireshark.org/review/36664
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-04-02 04:37:32 +00:00
Guy Harris 3398c2898d Document the -k option.
Change-Id: Ia695e3edcf673495eb8e61edfa72709fda2f99af
Reviewed-on: https://code.wireshark.org/review/36663
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-04-01 21:55:32 +00:00
Guy Harris 0975bf792a Handle -k better on platforms that don't support it.
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>
2020-04-01 20:31:14 +00:00
Uli Heilmeier 8e5007442e QT/UI: Fix shortcut
Shortcut should be in text and not in tooltip

Bug: 16472
Change-Id: I2139eab83dfbca51126a555476948373fee15237
Reviewed-on: https://code.wireshark.org/review/36651
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: Gerald Combs <gerald@wireshark.org>
2020-04-01 15:04:07 +00:00
Martin Mathieson 71e9009825 Check for true_false_string with identical true/false string.
Fixed a few instances where fix were obvious, others are
less clear.
The check in proto.c is protected by ENABLE_CHECK_FILTER.

Change-Id: I4edee4e67bd53bbf2eb809d68c87983a7c5a66f3
Reviewed-on: https://code.wireshark.org/review/36645
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-04-01 10:32:08 +00:00
Guy Harris 9b7a54d86c Make the message type values hex.
That's what I'm doing in the rpcap protocol I-D I'm writing, as it makes
it a bit cleaner to do the "uppermost bit means reply" stuff.

Change-Id: Ic6114ff9fe6df5cf6498798281189f1fbe658e60
Reviewed-on: https://code.wireshark.org/review/36647
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-04-01 02:21:04 +00:00
Gerald Combs e2b695ddef Qt: Fix a deprecation issue.
Use QFontMetrics::horizontalAdvance instead of QFontMetrics::width with
newer versions of Qt.

Change-Id: I65b3f4a6349d5c6dcd19e1cb029f0c8ce83decd0
Reviewed-on: https://code.wireshark.org/review/36644
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jason Cohen <kryojenik2@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-31 21:21:22 +00:00
Alexis La Goutte 8017bde10c pidl: fix typo found by lintian (mesages => messages)
verified with https://support.microsoft.com/fr-dz/help/238119/list-of-extended-mapi-numeric-result-codes

Change-Id: I3769f20071f9f15aa14a270e980f788ff9488d20
Reviewed-on: https://code.wireshark.org/review/36564
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-31 11:29:58 +00:00
Andreas Schultz 4f776cb70e PFCP: add Travelping's vendor IEs
Change-Id: Idcddc4e1388c5d31596690e997997b05a178702b
Reviewed-on: https://code.wireshark.org/review/33693
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-31 11:26:52 +00:00
Andreas Schultz c694a6f548 PFCP: fix Redirect Information IE
Redirect Information is an extensible IE. It was extended with the
Other Redirect Server Address in version 15.6.0, before that version
not including the Other Redirect Server Address was not an error.

Change-Id: I645862d99f62979996ec7faa8f08e2c39a3cf302
Reviewed-on: https://code.wireshark.org/review/36642
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-31 11:26:33 +00:00
Andreas Schultz 74aeb50b30 PFCP: fix End-Time IE
Change-Id: Ib268de91d88fc7364cea111b6d8558bae7bfcf89
Reviewed-on: https://code.wireshark.org/review/36641
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-31 11:26:21 +00:00
Martin Mathieson aacb52a31e TCP: Don't scale calculated window size using preference if no scaling signalled
Bug: 15841
Bug: 15959
Change-Id: If548b0a12f11c50f72e0957746525ed0fa591f15
Reviewed-on: https://code.wireshark.org/review/36637
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-03-31 08:25:06 +00:00
Gerald Combs da04d89f1e wslua: Update the ByteArray and Tvb docs.
Add content from https://wiki.wireshark.org/LuaAPI/ByteArray and
https://wiki.wireshark.org/LuaAPI/Tvb. Update as needed.

Remove an extraneous trailing semicolon.

Change-Id: I857b748821c21413ecb563c150525575fc9b947a
Reviewed-on: https://code.wireshark.org/review/36635
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>
2020-03-31 04:13:01 +00:00
Gerald Combs ed3fe162bd wslua: Update the Int64 docs.
Add content from https://wiki.wireshark.org/LuaAPI/Int64. Update as
needed.

Change-Id: I6a5f8c1cdeddee6d552fde940224704daca980b5
Reviewed-on: https://code.wireshark.org/review/36639
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>
2020-03-31 04:12:48 +00:00
Gerald Combs 99798d2c1c wslua: Update the Dir and Utils docs.
Add content from https://wiki.wireshark.org/LuaAPI/Utils. Update as
needed.

Change-Id: I2bf04d053a1edd5e05779c5a41e5ae0fbcb71b54
Reviewed-on: https://code.wireshark.org/review/36638
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>
2020-03-31 04:12:35 +00:00
Gerald Combs 3069129fe5 Qt+wslua: Add back progress bar titles.
As part of the Qt migration we dropped support for showing progress bar
titles. Add them back.

Fix the title and task arguments in wslua.

Change-Id: I76f008ff1f73e868a9b3833d24d355513692ae8b
Reviewed-on: https://code.wireshark.org/review/36612
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>
2020-03-31 04:11:56 +00:00
Gerald Combs 6f59b8e84d wslua: Cross-reference and title case fixes.
Use lua_class_DissectorTable instead of lua_class_DissectorTables.

Use title case for each module.

Change-Id: Ie855022ee59a857c8ced7c3e6ba070ab494fa017
Reviewed-on: https://code.wireshark.org/review/36634
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-30 16:42:18 +00:00