Gerald Combs [Thu, 10 Dec 2020 01:32:18 +0000 (9 17:32 -0800)]
3.2.9 → 3.2.10.
[skip ci]
Gerald Combs [Wed, 9 Dec 2020 20:05:15 +0000 (9 12:05 -0800)]
Build 3.2.9.
Gerald Combs [Wed, 9 Dec 2020 21:27:25 +0000 (9 13:27 -0800)]
GitLab CI: Stop installing external dependencies.
Remove the last package installation instances from .gitlab-ci.yml. Add
a comment at the top noting that dependencies should be added to our
Dockerfiles instead.
John Thacker [Tue, 8 Dec 2020 23:21:13 +0000 (8 18:21 -0500)]
epan: Fix format_text treament of Greek, Arabic, etc.
format_text uses the wrong bitmask when checking for two byte UTF-8
characters, resulting in rejecting half the possible two bytes characters,
including all of Arabic and Greek, and substituting REPLACEMENT CHARACTER
for them. Fixes #17070, and add some comments about the current behavior
that doesn't match existing comments.
(cherry picked from commit
770746cca810f0979f4b8dc82e2b2f1150f98dcc)
Yoshihiro Ueda [Sun, 6 Dec 2020 12:47:04 +0000 (6 12:47 +0000)]
SOME/IP: Fixed incorrect resetting offset of static array.
Fixed resetting offset of array to enable only when created tvb subset. Fixes #17057
(cherry picked from commit
2ab153527dd38ce3528b02ed25c89b54e1b4aa6c)
Gerald Combs [Mon, 7 Dec 2020 22:10:12 +0000 (7 14:10 -0800)]
Prep for 3.2.9.
Uli Heilmeier [Mon, 7 Dec 2020 21:46:38 +0000 (7 21:46 +0000)]
SMB/SMB2: FS Name is always Unicode
According to MS-CIFS sections 2.2.8.2.6 [1] FS Name (or Label) string
is in unicode.
[1]: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/
1011206a-55c5-4dbf-aff0-
119514136940
Fixes: wireshark/wireshark#17064
(cherry picked from commit
c876b34ed10399454f3c87fd17a9e57c526584de)
Gerald Combs [Tue, 8 Dec 2020 19:44:42 +0000 (8 19:44 +0000)]
GitLab CI: Update lintian excludes.
Add "copyright-excludes-files-in-native-package" to the lintian exclude
list. The wireshark/wireshark-ubuntu-dev image was updated to 20.04
recently, and its lintian added
https://lintian.org/tags/copyright-excludes-files-in-native-package.html.
(cherry picked from commit
7a8a3a8702d8f5c5b33173d0598ecb0cf0a1df34)
Gerald Combs [Tue, 1 Dec 2020 20:00:13 +0000 (1 12:00 -0800)]
Kafka: Limit our decompression size.
Don't assume that the Internet has our best interests at heart when it
gives us the size of our decompression buffer. Assign an arbitrary limit
of 50 MB.
This fixes #16739 in that it takes care of
** (process:17681): WARNING **: 20:03:07.440: Dissector bug, protocol Kafka, in packet 31: ../epan/proto.c:7043: failed assertion "end >= fi->start"
which is different from the original error output. It looks like *that*
might have taken care of in one of the other recent Kafka bug fixes.
The decompression routines return a success or failure status. Use
gbooleans instead of ints for that.
(cherry picked from commit
f4374967bbf9c12746b8ec3cd54dddada9dd353e)
Conflicts:
epan/dissectors/packet-kafka.c
Gerald Combs [Sun, 6 Dec 2020 09:37:40 +0000 (6 09:37 +0000)]
[Automatic update for 2020-12-06]
Update manuf, services enterprise numbers, translations, and other items.
Guy Harris [Fri, 4 Dec 2020 12:37:32 +0000 (4 12:37 +0000)]
wlan: fix a bug-number typo in comments.
(cherry picked from commit
00d45cc71a629cfad3be9aa63e5e136b4edafbd8)
Teyut [Thu, 3 Dec 2020 22:22:02 +0000 (3 22:22 +0000)]
RadioTap: skip present bits for vendor NS.
An error messages was shown when more than 1 present bits was set for a vendor NS because these bits were not skipped properly. Closes https://gitlab.com/wireshark/wireshark/-/issues/17047
(cherry picked from commit
96e31cb1163172b61841070e7b67f44dce9b4153)
Guy Harris [Thu, 3 Dec 2020 20:03:54 +0000 (3 12:03 -0800)]
wlan: never treat DMG frames as if they have an HT Control field.
At least one ns-3 capture has DMG frames (as indicated by the channel
number being in the 60 GHz band - radiotap currently has no DMG metadata
field) that have the +HTC/Order flag subfield set but have no HT Control
field, causing them to be misdissected.
802.11-2016 says that DMG frames should never have +HTC/Order set; if it
*is* set in a QoS frame known to be a DMG frame, flag it with an expert
info item and don't treat it as having an HT Control field.
Update a bunch of comments to give more information, put comments in the
appropriate places, and speak of 802.11-2016 rather than older standards.
While we're at it, update the title and description of the +HTC/Order
flag to reflect its name as of 802.11-2016.
(cherry picked from commit
3c640ca04a4710fa5d69f632c215c611572a6ff4)
Guy Harris [Thu, 3 Dec 2020 11:42:19 +0000 (3 11:42 +0000)]
PI_MALFORMED is not a valid error severity; fix it to PI_ERROR.
(cherry picked from commit
ac0cf10ab08755797e7484f487cf76c8264a1f22)
Harald Welte [Mon, 30 Nov 2020 19:14:02 +0000 (30 19:14 +0000)]
packet-ehdlc: Fix TEI in COL_INFO
Back in 2017, commit
d7bab0b46e72eb30e50ad1b6a0b56275394406b4 introduced
printing the TEI in COL_INFO. Unfortunatelky it contained a typo and
stated "TEI:1%u" instead of "TEI:%u". So TEI 0 became TEI 10, etc. -
causing some confusion.
Let's remote that extraneous '1' and at the same time print the sapi
with two digits for better alignment of multiple lines. It is a
two-digit decimal value (0..63).
(cherry picked from commit
9c5ea50b0a8ed812b9c2f24a2be215f332718ecd)
Guy Harris [Mon, 30 Nov 2020 03:11:32 +0000 (30 03:11 +0000)]
wlan: don't treat non-QoS frames as having an HT Control field.
That's QoS-frame only; for non-QoS frames, the +HTC/Order subfield
doesn't mean there's an HT Control field.
Update the reference to the part of the 802.11 standard mentioning that
subfield to 802.11-2016.
(cherry picked from commit
1fa5687fad88963b8a4857a856981da8cc304678)
Guy Harris [Mon, 30 Nov 2020 02:23:48 +0000 (30 02:23 +0000)]
wlan: clean up some tests.
It's clearer to say
if (A) {
if (B) {
do this;
} else {
do that;
}
}
than to say
if (A && B) {
do this;
} else if (A && !B) {
do that;
}
(cherry picked from commit
baee4a41c787080af4497d038c2b4f9794cb29fc)
Guy Harris [Sun, 29 Nov 2020 10:17:47 +0000 (29 10:17 +0000)]
802.11: clean up data frame handling.
Change
case DATA_FRAME:
if (condition) {
do stuff;
break;
}
do other stuff;
break;
to
case DATA_FRAME:
if (condition) {
do stuff;
} else {
do other stuff;
}
break;
to make it clearer that it's "do this if condition is true, else do
that".
(cherry picked from commit
258fb148212047b1b544c80dd478ac439a8fa7ee)
Gerald Combs [Sun, 29 Nov 2020 09:41:25 +0000 (29 09:41 +0000)]
[Automatic update for 2020-11-29]
Update manuf, services enterprise numbers, translations, and other items.
Guy Harris [Sun, 29 Nov 2020 09:28:59 +0000 (29 09:28 +0000)]
llc: don't fetch the etype until it's needed and if it's present.
This avoids throwing exceptions in some cases.
(cherry picked from commit
ee764b8d7dc3815df6a0003d1ffa32a31ed1a7cb)
Guy Harris [Sun, 29 Nov 2020 08:53:45 +0000 (29 08:53 +0000)]
llc: clean up indentation.
(cherry picked from commit
3f8423c26760b30ef7bf9aa3d31fa4b859f8fe0f)
Uli Heilmeier [Sat, 21 Nov 2020 21:29:36 +0000 (21 22:29 +0100)]
tshark: set cf values when quiet and tempfile
When there is no do_dissection cf is missing some variables
for cf_close() call. Therefore we have to set them explicitly.
Fixes: wireshark/wireshark#17021
(cherry picked from commit
0fad19b7d93a238a12ebfaab961fb9b21e3d32f7)
Pascal Quantin [Tue, 24 Nov 2020 13:05:21 +0000 (24 14:05 +0100)]
S1AP: fix decoding of inter eNB transparent container from NGAP
(cherry picked from commit
74c0b2134b5e776a97db1b0927b529fe5b725a4d)
Conflicts:
epan/dissectors/packet-s1ap.c
Pascal Quantin [Mon, 23 Nov 2020 22:09:30 +0000 (23 22:09 +0000)]
NAS 5GS: request type field is 3 bits long
(cherry picked from commit
9fdc3fb3ce6cddcc23349c729d211b2f7e0aabe8)
Pascal Quantin [Mon, 23 Nov 2020 15:42:34 +0000 (23 15:42 +0000)]
NAS 5GS: fix PDU address type, PDU session type and SSC mode bit width
(cherry picked from commit
7097d817a2d91a36349050405cf0ccd2a18e1345)
Gerald Combs [Sun, 22 Nov 2020 09:37:44 +0000 (22 09:37 +0000)]
[Automatic update for 2020-11-22]
Update manuf, services enterprise numbers, translations, and other items.
Guy Harris [Thu, 19 Nov 2020 07:50:28 +0000 (19 07:50 +0000)]
PacketListRecord: add an ensureColorized() method and use it.
Don't call the columnString() and discard the result in order to force
colorization; instead, add a separate method to force colorization and
use that.
This avoids the need to choose a column; we were using 1 as the column
number, but column numbers are zero-origin, so that's column 2, which
isn't guaranteed to exist (a crash ensued if it didn't).
(cherry picked from commit
58aea1de62b9499d7b767f4aa631394f9fbb889e)
John Thacker [Wed, 18 Nov 2020 01:13:06 +0000 (18 01:13 +0000)]
RFC2190: Fix bitmasks for several fields in mode A
Fixes some errors that the packet diagram helped make obvious.
Closes #17025.
(cherry picked from commit
5d374fed36d06d745440123944cbbeebaf7fcb20)
Jaap Keuter [Wed, 18 Nov 2020 11:22:38 +0000 (18 11:22 +0000)]
HTTP: Restore SSTP support
Add exclusion for SSTP having Contents-Length and no body.
Closes #17024
(cherry picked from commit
0250e4e2e44a73773dbaad64cfb244a0db463d7e)
Jason Cohen [Mon, 16 Nov 2020 21:18:00 +0000 (16 15:18 -0600)]
f5ethtrailer: Replace ingressslot and ingressport with reserved
Gerald Combs [Sun, 15 Nov 2020 22:07:16 +0000 (15 14:07 -0800)]
Tools: Update the usb.ids URL in make-usb.py.
The canonical location for the usb.ids file is
http://www.linux-usb.org/usb.ids. Unfortunately that site isn't
accessible over HTTPS so we were using https://usb-ids.gowdy.us/usb.ids
instead. *That* site is down, so switch to the Linux USB project's
SourceForge repository URL, which appears to house the assets for
www.linux-usb.org, including the usb.ids file.
(cherry picked from commit
01d5e8ee513cd17f2f86bcb1a2b76384e272428e)
Conflicts:
tools/make-usb.py
Gerald Combs [Sun, 15 Nov 2020 19:23:49 +0000 (15 19:23 +0000)]
[Automatic update for 2020-11-15]
Update manuf, services enterprise numbers, translations, and other items.
Guy Harris [Sun, 15 Nov 2020 06:51:58 +0000 (15 06:51 +0000)]
Pass an address-family-appropriate socket length to connect().
Some UN*Xes (4.4-lite-derived, such as the obscure, little-known macOS,
FreeBSD, NetBSD, OpenBSD, and DragonFly BSD) have a length field in the
socket address structure.
That was originally done for OSI address support; unlike most transport
addresses, such as IPv4 (and IPv6) addresses, where the size of the
address is fixed, the size of an OSI transport layer address is *not*
fixed, so it cannot be inferred from the address type.
With the dropping of OSI support, that field is no longer necessary in
userland. System calls that take a socket address argument also take an
address length argument; in newer (all?) versions of the {macOS,
FreeBSD, NetBSD, OpenBSD, DragonFly BSD} kernel, the system call code
sets the length field in the kernel's copy of the address to the address
length field value.
However, that means that you have to pass in the appropriate length; if
you have a sockaddr_storage that might contain an IPv4 address or an
IPv6 address, connect() (and bind()) calls should use the IPv4 address
size for IPv4 addresses and the IPv6 address size for IPv6 addresses,
otherwise, at least on macOS, the call fails.
In cap_open_socket(), report socket() and connect() errors separately,
to make it easier to determine where TCP@ captures fail, if they do
fail. (That's how I got here in the first place.)
(cherry picked from commit
e3047d9b385cb4787995ed87505495fc0a54bba5)
Pascal Quantin [Sat, 14 Nov 2020 15:02:16 +0000 (14 15:02 +0000)]
NAS EPS: fix inverted description of 2 N1 UE network capability IE fields
(cherry picked from commit
8c29bfe8b2118c201ed49ffe09976d8fc5244c8b)
Pascal Quantin [Fri, 13 Nov 2020 18:10:20 +0000 (13 18:10 +0000)]
NAS-EPS: remove an extra spare bit
It has been replaced by the 15 bearers capability during R15 development
(cherry picked from commit
440d8ceff98348a476ad6fa56c9b2cf0f46c9ba0)
Alexis La Goutte [Wed, 11 Nov 2020 13:31:13 +0000 (11 13:31 +0000)]
MMRP: Fix wrong offset for service attribute type
Issue reported by Nils Andersen
Close #17005
(cherry picked from commit
8b512665fcd59070b28abc91c8c6a3dac555f010)
Gerald Combs [Thu, 5 Nov 2020 21:20:06 +0000 (5 13:20 -0800)]
wiretap: Update pcapng systemd timestamp handling.
It's easy to create systemd blocks with a missing or invalid
__REALTIME_TIMESTAMP= field when fuzz testing. If that's the case, leave
WTAP_HAS_TS unset instead of returning an error. Fixes #16965.
(cherry picked from commit
51145c62e6629f1f967dd2666669a437828c898a)
Conflicts:
wiretap/pcapng.c
Gerald Combs [Mon, 9 Nov 2020 23:14:18 +0000 (9 23:14 +0000)]
RTPS: Fixup our coherent set map.
coherent_set_tracking.coherent_set_registry_map uses a struct as a key,
but the hash and comparison routines treat keys as a sequence of bytes.
Make sure every key byte is initialized. Fixes #16994.
Call wmem_strong_hash on our key in coherent_set_key_hash_by_key instead
of creating and leaking a GBytes struct.
(cherry picked from commit
33e63d19e5496c151bad69f65cdbc7cba2b4c211)
Gerald Combs [Fri, 6 Nov 2020 01:37:13 +0000 (5 17:37 -0800)]
epan: Limit our bits in decode_bits_in_field.
Limit the number of bits we process in decode_bits_in_field, otherwise
we'll overrun our buffer. Fixes #16958.
(cherry picked from commit
d5f2657825e63e4126ebd7d13a59f3c6e8a9e4e1)
Pau Espin Pedrol [Mon, 9 Nov 2020 10:37:13 +0000 (9 10:37 +0000)]
rlcmac: Fix EGPRS UL data block TLLI endianess
According to TS 44.060, figure 10.3a.2.1, note 2, the TLLI is
encoded in little endian for EGPRS (while big endian is used in GPRS).
(cherry picked from commit
dfa8a3fe5a1408a4355bb325d358dd1ab2c27d31)
Gerald Combs [Sun, 8 Nov 2020 09:37:09 +0000 (8 09:37 +0000)]
[Automatic update for 2020-11-08]
Update manuf, services enterprise numbers, translations, and other items.
Jaap Keuter [Thu, 5 Nov 2020 15:32:55 +0000 (5 15:32 +0000)]
giop: free the buffer where its at
Followup on commit
40ce72f1a8cfbc9df1fd0dd637f2b8f00b4f5042
(cherry picked from commit
57b666692051969d874a5b272258b9f3d8447949)
Jaap Keuter [Thu, 5 Nov 2020 10:47:10 +0000 (5 10:47 +0000)]
giop: don't use packet scope for allocating a buffer at init time
Followup on commit
2c2ee172eb1eadda5a418558fe35d2e3e2c03317
Also when reading in lines from the file don't use packet scope.
Fixes #16984
(cherry picked from commit
40ce72f1a8cfbc9df1fd0dd637f2b8f00b4f5042)
Gerald Combs [Tue, 27 Oct 2020 17:09:40 +0000 (27 10:09 -0700)]
CI+RPM: Disable the Fedora build for now.
Fedora 33's RPM environent added changes that break CMake. Disable it
for now.
(cherry picked from commit
05bd5cd91eeee9004efc6ea82d62cad831cda05f)
Conflicts:
.gitlab-ci.yml
Alexis La Goutte [Wed, 4 Nov 2020 07:16:47 +0000 (4 07:16 +0000)]
QUIC: Fix typo
Reported by Martin Thomson
Huang Qiangxiong [Wed, 4 Nov 2020 12:38:23 +0000 (4 12:38 +0000)]
Protobuf: fix bug about parsing negative enum value number
Change PT_DECIMALLIT, PT_OCTALLIT and PT_HEXLIT tokens to uint64
type, and make PT_IDENT excluding '-' numbers which will be parsed
in protobuf_lang.y. That negative enum number and number type of
constant can be correctly parsed.
Note, intLit is uint32 for parsing fieldNumber and enumNumber,
but might be uint64 as constant.
close #16988
(cherry picked from commit
1fff3cb10654441baac206360e19e33e81ede799)
Guy Harris [Thu, 5 Nov 2020 00:37:30 +0000 (5 00:37 +0000)]
giop: don't use packet scope for allocating a buffer at init time.
You can't use packet scope if you're not dissecting a packet;
read_IOR_strings_from_file() is called from giop_init(), which is called
when a file is opened, not when dissecting a packet.
Use NULL as the scope, which just does a regular allocation, and free
the buffer when we're done.
Expand a comment to indicate that using dissection routines is *also* a
bad idea in code that's not used when dissecting packets.
Fixes #16984.
(cherry picked from commit
2c2ee172eb1eadda5a418558fe35d2e3e2c03317)
Gerald Combs [Wed, 4 Nov 2020 19:03:56 +0000 (4 11:03 -0800)]
Tools: Allow cherry pick lines in validate-commit.py.
Cherry picking tends to add an extra blank line to the commit message.
Update the body check in validate-commit.py to allow for this.
Revert "tools+CI: Re-enable commit validation." This partially reverts
commit
507dd98a58a7e967ef82c18abdc24d25c1c09635.
(cherry picked from commit
dd6b6f48dc4b485740edbaa286b248556c9c03d6)
Gerald Combs [Tue, 3 Nov 2020 19:46:14 +0000 (3 11:46 -0800)]
Tools: Explicitly call "python3" in pre-commit.
We can't depend on the existence of a "python" command in Debian
bullseye[1] and possibly other distributions. Call "python3" instead.
[1]https://wiki.debian.org/Python
Dr. Lars Völker [Thu, 29 Oct 2020 15:26:37 +0000 (29 15:26 +0000)]
SOME/IP: Cleanup of length field parsing (BUG FIX)
This patch makes the parsing of length fields consistent by moving them
below their parent element and adjusting the length of the parent
element. And it fixes some problems by doing this.
Problems fixed by this:
- Bytes skipped after dynamic length arrays. This resolves #16951
- A byte was ignored before unparsed payload.
- Unions not marking the correct byte range.
- String having the length field twice.
Signed-off-by: Dr. Lars Völker <lars.voelker@technica-engineering.de>
(cherry picked from commit
9ac8dcb3a124eb42c57d4c0aa8d626ff1fefbb4e)
Uli Heilmeier [Wed, 28 Oct 2020 21:01:47 +0000 (28 22:01 +0100)]
RTCP: Extended Reports: check for padding
Check if padding flag is set and alter length accordingly.
Display rtcp.xr.bl the same way as rtcp.length.
Fixes: wireshark/wireshark#16933
(cherry picked from commit
e07bb433b2d86b17d014ad3a2178dfdb910b490b)
Gerald Combs [Sun, 1 Nov 2020 09:42:02 +0000 (1 09:42 +0000)]
[Automatic update for 2020-11-01]
Update manuf, services enterprise numbers, translations, and other items.
Sylvain Munaut [Sat, 31 Oct 2020 10:06:28 +0000 (31 10:06 +0000)]
usbvideo: Fix dissection of PROBE infos structure
Refer to USB Device Class Definition for Video Devices
document revision 1.5.
* bmFramingInfo is 1 byte
* Cut & Paste error for bMaxVersion label
Change-Id: Ib1221886f864a6ab9dbab70a8e5fca6482bf4267
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
(cherry picked from commit
b6222766cce1befd7f696a67df57c9e63ad963b6)
Martin Mathieson [Sat, 31 Oct 2020 12:09:23 +0000 (31 12:09 +0000)]
GSM A: Uncertainty speed is only 1 byte.
(cherry picked from commit
b925734fe29306d575347ce56ec8d4910f712d3e)
Gerald Combs [Thu, 29 Oct 2020 21:13:09 +0000 (29 14:13 -0700)]
3.2.8 → 3.2.9.
Gerald Combs [Thu, 29 Oct 2020 17:43:39 +0000 (29 10:43 -0700)]
Build: 3.2.8.
Richard Smith [Sat, 10 Oct 2020 10:25:57 +0000 (10 18:25 +0800)]
GQUIC: make sure our tag offset advances.
Make sure gquic tag offset advances so that we don't infinitely loop.
(cherry picked from commit
b287e7165e8aa89cde6ae37e7c257c5d87d16b9b)
Vadim Yanitskiy [Thu, 29 Oct 2020 01:25:05 +0000 (29 01:25 +0000)]
GSM A RR: fix wrong cause value in gsm_a_rr_RR_cause_vals
Also, take a chance to correct the comment: section 6.11.0 does
not exit in 3GPP TS 44.018. In version 15.4.0 Release 15 of
the referenced document it is 10.5.2.31 (table 10.5.2.31.1).
(cherry picked from commit
732591237bd3121fc0e5586f36700eff7d6c0b7f)
Jonas Falkevik [Fri, 9 Oct 2020 22:07:36 +0000 (9 22:07 +0000)]
lcsap: fix decode of plmnIdentity
Corretly decode MNC if it consists of 3 digits
Change to what is called big endinan MNC
8 7 6 5 4 3 2 1
+---+---+---+---+---+---+---+---+
| MCC digit 2 | MCC digit 1 | octet x
+---------------+---------------+
| Filler | MCC digit 3 | octet x+1
+---------------+---------------+
| MNC digit 2 | MNC digit 1 | octet x+2
+---------------+---------------+
MNC of length 3:
8 7 6 5 4 3 2 1
+---+---+---+---+---+---+---+---+
| MCC digit 2 | MCC digit 1 | octet x
+---------------+---------------+
| MNC digit 1 | MCC digit 3 | octet x+1
+---------------+---------------+
| MNC digit 3 | MNC digit 2 | octet x+2
+---------------+---------------+
From 3GPP TS 29.171
7.4.27 PLMN Identity
- digits 0 to 9, encoded 0000 to 1001,
- 1111 used as filler digit, two digits per octet,
- bits 4 to 1 of octet n encoding digit 2n-1
- bits 8 to 5 of octet n encoding digit 2n
The Selected PLMN identity consists of 3 digits from MCC followed by either
- a filler digit plus 2 digits from MNC (in case of 2 digit MNC) or
- 3 digits from MNC (in case of a 3 digit MNC).
(cherry picked from commit
156f9e81fc3121722f72e4ef9486720bbaa9b1d0)
Pascal Quantin [Sat, 4 Apr 2020 14:15:42 +0000 (4 16:15 +0200)]
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>
(cherry picked from commit
f48a62f4ef94d1c908b0880d021566eec7f35190)
Jaap Keuter [Wed, 28 Oct 2020 11:02:29 +0000 (28 12:02 +0100)]
Create protocols to the end of the TVB if length unknown upfront
Creating protocols with unknown length must be created to the end of the TVB
first and reined back using proto_set_len() once the length becomes known.
Not doing so can make indentification of problems harder and prevents analysis
engines like MATE from properly processing the generated protocol trees.
With this change the remaining offending dissectors are corrected for this.
Closes #16961
(cherry picked from commit
918db88055dd7781e69d7bfcf39c71956437c7ae)
Dieter Dobbelaere [Wed, 28 Oct 2020 09:46:27 +0000 (28 09:46 +0000)]
Fix typo: 'descriptionfor' -> 'description for'.
(cherry picked from commit
7c9eb8b2354e55969d9c2a4e3b80fd8a81e2ff39)
Guy Harris [Mon, 26 Oct 2020 23:00:40 +0000 (26 16:00 -0700)]
Impose limits on the number of records we read.
Start the limit at 2^32-1, as we use a guint32 to store the frame
number.
With Qt prior to Qt 6, lower the limit to 53 million packets; this
should fix issue #16908.
(cherry picked from commit
639891651f7caca3a427467edbe608f90e88a060)
Jaap Keuter [Thu, 22 Oct 2020 16:07:55 +0000 (22 16:07 +0000)]
MATE: allow _AVP_DEBUGGING flag to be set
(cherry picked from commit
87a42de3931a6794cf88947158b6457340e7cd51)
Jaap Keuter [Sat, 24 Oct 2020 10:42:27 +0000 (24 10:42 +0000)]
MATE: Improve MATE debug facility
1) Allow AVP_DEBUGGING settings to be made from Preferences, iff compiled so.
2) Flush MATE/AVP debug output once sequential packet parse has completed.
(cherry picked from commit
5b2901d09015194682538d33be18900079aa0567)
Guy Harris [Mon, 26 Oct 2020 00:42:11 +0000 (26 00:42 +0000)]
Apparently, WS_WIKI_URL() can work in Qt C++ code.
(cherry picked from commit
32b64c1694320380ff0dafd8a2408cb9c81cfe33)
Guy Harris [Sun, 25 Oct 2020 21:42:47 +0000 (25 21:42 +0000)]
Revert "Apparently, WS_WIKI_URL() is unworkable not only in C++ but in C."
This reverts commit
5df29254347daab8ab9f530a0b9dfd0b32a40efc.
The problem only showed up in tfshark.c, and was caused by tfshark.c
using stuff from ui/urls.h but not *including* ui/urls.h.
(cherry picked from commit
f7c99f73e2870ffa4e64ad26c064671225da287d)
Guy Harris [Sun, 25 Oct 2020 20:50:53 +0000 (25 20:50 +0000)]
Include <ui/urls.h>
If you're going to use #defines from ui/urls.h, it reeeeeeeeeally helps
if you *include* ui/urls.h.
(cherry picked from commit
a8d023ba581bab311e58dce13706125b28271535)
Gerald Combs [Sun, 25 Oct 2020 09:42:39 +0000 (25 09:42 +0000)]
[Automatic update for 2020-10-25]
Update manuf, services enterprise numbers, translations, and other items.
Guy Harris [Sat, 24 Oct 2020 20:53:23 +0000 (24 20:53 +0000)]
Apparently, WS_WIKI_URL() is unworkable not only in C++ but in C.
If you use it, GCC 9.3.0 seems to think there's a missing parenthesis
somewhere, just as the version of clang++ in my version of Xcode does,
even though other versions of GCC don't. I'm clearly missing something
obscure about C here; I give up.
(cherry picked from commit
5df29254347daab8ab9f530a0b9dfd0b32a40efc)
John Thacker [Thu, 22 Oct 2020 13:22:51 +0000 (22 13:22 +0000)]
Export Objects: Don't double increment count
Don't double increment the count when saving all Export Objects,
which effectively halves the maximum number allowed.
(cherry picked from commit
56e19bec49c23480fcde110a7f2d0b503b285805)
Gerald Combs [Thu, 22 Oct 2020 18:00:58 +0000 (22 11:00 -0700)]
Windows: Fix the win-setup documentation.
The destination path needs to end in "-3.2".
Guy Harris [Mon, 19 Oct 2020 18:17:43 +0000 (19 18:17 +0000)]
Include <stdint.h> in YACC/Bison parsers if necessary.
MSVC doesn't, by default, define __STDC_VERSION__, which means that the
code generated by newer versions of winflexbison3's Bison end up
defining YYPTRDIFF_T as long, which is wrong on 64-bit Windows, as
that's an LLP64 platform, not an LP64 platform, and causes warnings to
be generated. Those warnings turn into errors.
With MSVC, if __STDC_VERSION__ isn't defined, Forcibly include
<stdint.h> here to work around that.
Fixes #16924.
(cherry picked from commit
0d2277bca5fc1c259efca59adff9caaf247f1974)
Gerald Combs [Mon, 19 Oct 2020 00:41:02 +0000 (18 17:41 -0700)]
CMake: Configure our .y files for different Bison/YACC flavors.
Bison 3.4 and later generate deprecation warnings for the "%pure-parser"
directive. As https://git.savannah.gnu.org/cgit/bison.git/tree/NEWS says,
----
** Deprecated features
The %pure-parser directive is deprecated in favor of '%define api.pure'
since Bison 2.3b (2008-05-27), but no warning was issued; there is one
now. Note that since Bison 2.7 you are strongly encouraged to use
'%define api.pure full' instead of '%define api.pure'.
----
Rename our .y files to .y.in, and modify FindYACC.cmake to detect newer
versions of Bison and configure our .y files with "%pure-parser" or
"%define api.pure" as needed. Squelches warnings from Bison in #16924.
(cherry picked from commit
1a244f9de5b770e072acfe07c4c3c38dd4260420)
Gerald Combs [Sun, 18 Oct 2020 09:26:24 +0000 (18 09:26 +0000)]
[Automatic update for 2020-10-18]
Update manuf, services enterprise numbers, translations, and other items.
Nardi Ivan [Fri, 16 Oct 2020 19:27:57 +0000 (16 19:27 +0000)]
TLS: fix visualization of QUIC Transport Parameter Preferred Address
(cherry picked from commit
e9ab79517917c9b5c3d0b4eb6ce5c30b9f607428)
Guy Harris [Thu, 15 Oct 2020 04:22:53 +0000 (15 04:22 +0000)]
Fix message printed for --skip-radiotap-header for non-radiotap packets.
If the encapsulation is WTAP_ENCAP_PER_PACKET, all we know about the
file is that it might not include radiotap packets and, if it does, it
also includes non-radiotap packets.
If it's *not* WTAP_ENCAP_PER_PACKET, properly report it
(wtap_file_type_subtype() returns the *file type* of the file, not the
*link-layer header type* - yes, that *happens* to work for a pcap file
with Ethernet packets, because the values of WTAP_ENCAP_ETHERNET and
WTAP_FILE_TYPE_SUBTYPE_PCAP both *happen* to be 1, but that's pure
luck).
While we're at it, test only once for --skip-radiotap-header and put
both tests inside that if.
(cherry picked from commit
3f412284a20353ac6dec9475de6dd1755b056556)
Guy Harris [Tue, 13 Oct 2020 21:39:55 +0000 (13 21:39 +0000)]
Get rid of some debugging cruft accidentally checked in.
(cherry picked from commit
63714518dfd89daac881e5c6a95169906dbed3b7)
Guy Harris [Tue, 13 Oct 2020 18:28:29 +0000 (13 18:28 +0000)]
Fix file description in error message from cfile_dump_open_failure_message().
cfile_dump_open_failure_message() opens a file for output, not input, so
use output_file_description(), not input_file_description() (i.e., "-"
means "standard output", not "standard input").
(cherry picked from commit
16198291bcae769fc770838e84e1204a765460b4)
Stig Bjørlykke [Mon, 12 Oct 2020 08:08:18 +0000 (12 08:08 +0000)]
thread: Add check for valid CoAP info
Add a check for valid CoAP info in dissect_thread_coap() before use.
It may happen that this is NULL because setting a decode_as rule
for application/octet-stream will also catch other packets.
(cherry picked from commit
a750cab655515904022c6a62651a855077a49315)
Francisco Jose Alvarez [Thu, 8 Oct 2020 09:08:05 +0000 (8 09:08 +0000)]
ieee80211: Fix dissect_hs20_osu_provider() return parameter
With the current return parameter of dissect_hs20_osu_provider() function, the dissector only show the first
osu_provider of the list. Changing the return end by return offset, the
dissector show all osu_provider of the list.
(cherry picked from commit
4189581cc9280ed6c1a1d01b7d2fcca6aadbd099)
Guy Harris [Sun, 11 Oct 2020 20:46:02 +0000 (11 20:46 +0000)]
Fix some error messages.
(cherry picked from commit
41c7b848d03b1ddb96af1792ba6757258b4d8b1e)
Gerald Combs [Sun, 11 Oct 2020 09:30:29 +0000 (11 09:30 +0000)]
[Automatic update for 2020-10-11]
Update manuf, services enterprise numbers, translations, and other items.
Pascal Quantin [Wed, 7 Oct 2020 10:16:23 +0000 (7 10:16 +0000)]
E212: fix a test when checking MCC digits
Closes #16895
(cherry picked from commit
926d6e37999e3f38831977777398ae2fe7db12a6)
Pascal Quantin [Mon, 5 Oct 2020 19:18:55 +0000 (5 21:18 +0200)]
ETSI CAT: fix dissection of send short msg/data proactive commands
Closes #16889
Pascal Quantin [Mon, 5 Oct 2020 13:25:55 +0000 (5 15:25 +0200)]
XnAP: fix the dissection of some NR and E-UTRA cell identity fields
Gerald Combs [Sun, 4 Oct 2020 09:26:15 +0000 (4 09:26 +0000)]
[Automatic update for 2020-10-04]
Update manuf, services enterprise numbers, translations, and other items.
Guy Harris [Sun, 4 Oct 2020 19:56:52 +0000 (4 19:56 +0000)]
g_mallocate all strings returned from topic_action_url().
Callers assume it's been g_mallocated and attempt to free it.
(cherry picked from commit
8a77692171d2a8625469f494ab5cfce51b0eb01f)
Guy Harris [Sun, 4 Oct 2020 07:59:48 +0000 (4 07:59 +0000)]
Fix a Coverity complaint.
For all cases in topic_action_url(), set url and break out of the switch
statement.
For the default case, set the URL to WS_HOME_PAGE_URL - we should never
get there, as here's a g_assert_not_reached() call before that, but this
should squelch Coverity's complaint.
Should fix Coverity CID
1467697.
(cherry picked from commit
4a9c412218f5ad5d48a6685844c0ca1ac5c98b08)
ishaangandhi [Sat, 3 Oct 2020 16:43:36 +0000 (3 16:43 +0000)]
ICMP: Fix dissection of Interface Information Object
If an address subobject was included, all subsequent subobjects (eg, interface name or MTU subobjects) would read from the same offset.
(cherry picked from commit
c1eb36b84b6fcfea93bfc087b280da60273b597d)
Gerald Combs [Fri, 2 Oct 2020 19:42:03 +0000 (2 19:42 +0000)]
FBZERO: Make sure our offset advances.
Make sure our offset advances so that we don't infinitely loop.
Fixes #16887.
(cherry picked from commit
3ff940652962c099b73ae3233322b8697b0d10ab)
Guy Harris [Sat, 3 Oct 2020 02:17:00 +0000 (2 19:17 -0700)]
Clean up URLs.
Add ui/urls.h to define some URLs on various of our websites. Use the
GitLab URL for the wiki. Add a macro to generate wiki URLs.
Update wiki URLs in comments etc.
Use the #defined URL for the docs page in
WelcomePage::on_helpLabel_clicked; that removes the last user of
topic_online_url(), so get rid of it and swallow it up into
topic_action_url().
Chuck Craft [Fri, 2 Oct 2020 17:25:54 +0000 (2 17:25 +0000)]
Qt: point to Lua wiki page now on Gitlab
(cherry picked from commit
4a0d8d4ef6cd26dceef15e9e7b981ce81ec60536)
Gerald Combs [Sun, 27 Sep 2020 09:25:41 +0000 (27 09:25 +0000)]
[Automatic update for 2020-09-27]
Update manuf, services enterprise numbers, translations, and other items.
Martin Mathieson [Thu, 24 Sep 2020 15:01:29 +0000 (24 15:01 +0000)]
SDAP: Add some long help, and fix filter name.
(cherry picked from commit
b00a76d36bc14394d305e489387ccf791b1edf39)
Gerald Combs [Thu, 24 Sep 2020 00:45:36 +0000 (23 17:45 -0700)]
Version: 3.2.7 → 3.2.8.
Gerald Combs [Wed, 23 Sep 2020 19:00:08 +0000 (23 12:00 -0700)]
Build: 3.2.7.
Gerald Combs [Wed, 23 Sep 2020 19:44:30 +0000 (23 12:44 -0700)]
BLIP: Update an expert item.
Generalize the decompression error field name and description.
(cherry picked from commit
dcc8bbaf9b9689a25e059de5f45ed7e857b4d799)
Jim Borden [Wed, 23 Sep 2020 05:16:27 +0000 (23 14:16 +0900)]
BLIP: Fix decompression buffer bug
Until now, mistakenly, the buffer for decompressing compressed BLIP messages
has been statically allocated as 16 Kb, but that is not valid behavior.
16 Kb is the maximum size of a _compressed_ frame. In theory, due to the
ability to zipbomb, there is virtually no upper bound on what the maximum
size of an uncompressed frame could be. However, to keep sanity, it has
been made into a preference with a reasonable default that is not likely to
be exceeded (64 Kb). The behavior before for this was that wireshark would
crash because the dissector would return NULL for a decompressed buffer due
to error and then try to deference it later. A null check has been added,
so that the behavior is now that the packet will show
'<Error decompressing message>' instead, and log why it couldn't handle the
compressed message. Closes #16866.
(cherry picked from commit
4a948427100b6c109f4ec7b4361f0d2aec5e5c3f)
Pascal Quantin [Wed, 23 Sep 2020 19:33:18 +0000 (23 21:33 +0200)]
MMS: regenerate dissector from ASN.1 source