wireshark.git
17 months agoBuild: 3.4.3v3.4.3wireshark-3.4.3
Gerald Combs [Fri, 29 Jan 2021 18:10:04 +0000 (29 10:10 -0800)]
Build: 3.4.3

[skip ci]

17 months agoPrep for 3.4.3.
Gerald Combs [Thu, 28 Jan 2021 21:32:36 +0000 (28 13:32 -0800)]
Prep for 3.4.3.

17 months agoUSB HID: Avoid allocating a huge amount of memory (second try).
Gerald Combs [Mon, 25 Jan 2021 21:41:38 +0000 (25 21:41 +0000)]
USB HID: Avoid allocating a huge amount of memory (second try).

10204490d7 / MR 80 ensured that we didn't grow field.usages due to an
underflow, but it neglected to check for a sane array size. Add another
check to make sure we don't wmem_array_grow() too much. Fixes #17165 and
fixes #16809 more completely.

(cherry picked from commit 785e291c1be04beebae3f3603752f5737dc1694d)

17 months agoUSB HID: Usage Minimum and Usage Maximum are inclusive
John Thacker [Thu, 3 Dec 2020 04:00:09 +0000 (3 04:00 +0000)]
USB HID: Usage Minimum and Usage Maximum are inclusive

Usage Minimum and Usage Maximum are an inclusive, closed interval.
This fixes an fencepost error where the Usage Maximum value was
not being included as a possible value in the bitfield. Related
to #17014

(cherry picked from commit 5ca608f51932302e16c9d1218425804aac5f7ef4)

17 months agoZVT: clean up some data points
Jaap Keuter [Thu, 28 Jan 2021 11:16:51 +0000 (28 11:16 +0000)]
ZVT: clean up some data points

(cherry picked from commit b4f74bac74220e402c64175c65a222b7aabcb1dc)

17 months agoepan: don't print nanoseconds if seconds isn't representable.
Guy Harris [Thu, 28 Jan 2021 07:56:22 +0000 (28 07:56 +0000)]
epan: don't print nanoseconds if seconds isn't representable.

Fix for previous fixes to #17179.

(cherry picked from commit 4715f5021cb44fcf672b9f8d23efa8e4601a8d1f)

17 months agoepan: don't use gmtime_s().
Guy Harris [Thu, 28 Jan 2021 06:15:31 +0000 (28 06:15 +0000)]
epan: don't use gmtime_s().

It has the "feature" that, if handed a negative value, it might just
exit.  gmtime() doesn't have that "feature", and is sufficiently
thread-safe for our purposes; use it instead, and check to make sure it
doesn't return a null pointer.

The previous fix for #17179 still used gmtime_s(); this doesn't, so it's
a better fix for #17179.

(cherry picked from commit bf265d7e7aa8c69841291a20ab9c9f5ac189135b)

17 months agoepan: don't assume gmtime_s() or gmtime_r() succeed.
Guy Harris [Thu, 28 Jan 2021 05:46:11 +0000 (28 05:46 +0000)]
epan: don't assume gmtime_s() or gmtime_r() succeed.

At least on Windows, gmtime_s() will *not* succeed if passed a negative
value.

Fixes #17179.

(cherry picked from commit 4e4a7c11c744cf0d9ad83a575f9a3bcc60aa35c5)

17 months agoZVT: Use standard TCP segment reassemble support function
Jaap Keuter [Wed, 27 Jan 2021 21:06:11 +0000 (27 21:06 +0000)]
ZVT: Use standard TCP segment reassemble support function

Fixes #17177

(cherry picked from commit 616d44cbb651fd53273946fc04d4653aa69584fb)

17 months agowiretap: Fixup the sdjournal block length in pcapng.
Gerald Combs [Mon, 25 Jan 2021 22:32:11 +0000 (25 22:32 +0000)]
wiretap: Fixup the sdjournal block length in pcapng.

Fix our entry length check and put our trailing '\0' in the right
location. Fixes #17174.

(cherry picked from commit cd278f5fd9bc77426f060170605e3ada39c6bb6a)

17 months agoFix TID bitmap name
Grzegorz Niemirowski [Mon, 25 Jan 2021 21:50:37 +0000 (25 21:50 +0000)]
Fix TID bitmap name

(cherry picked from commit 6a860c979a8339088e5ae2e49ce5bc084626ccc6)

17 months agoUSB HID: Fix a memory leak.
Gerald Combs [Mon, 25 Jan 2021 20:38:26 +0000 (25 20:38 +0000)]
USB HID: Fix a memory leak.

Replace mismatched g_strdup() + g_free()s with
wmem_strdup_printf(wmem_packet_scope(), ...). Fixes #17124.

(cherry picked from commit 26f0db01a7f7e6c69eee2f1c601444c64ca53e19)

17 months ago[Automatic update for 2021-01-24]
Gerald Combs [Sun, 24 Jan 2021 10:30:17 +0000 (24 10:30 +0000)]
[Automatic update for 2021-01-24]

Update manuf, services enterprise numbers, translations, and other items.

17 months agotshark: Fix typo in comment from ascci to ascii
Jim Young [Sun, 24 Jan 2021 04:50:36 +0000 (24 04:50 +0000)]
tshark: Fix typo in comment from ascci to ascii

(cherry picked from commit a7ad6c271fc59ed64494c5d17b37697b6034f69a)

17 months agotshark: Unconditionally call extcap_register_preferences
Enrique Giraldo [Fri, 22 Jan 2021 08:37:52 +0000 (22 08:37 +0000)]
tshark: Unconditionally call extcap_register_preferences

extcap_register_preferences is only called with the -G option
(to dump information) and extcap preferences are not loading,
loading it unconditionally avoids this, as it is done in the
GUI startup.

(cherry picked from commit 506f1c650ff57534b58ee6391b3c537dfc307a0e)

17 months agof5ethtrailer: Some trailers are not detected
Jason Cohen [Thu, 21 Jan 2021 22:37:41 +0000 (21 16:37 -0600)]
f5ethtrailer: Some trailers are not detected

This corrects 2 issues with the detection heuristic for f5ethtrailers
causing trailers to be missed.

Fixes #17171
Fixes #17172

(cherry picked from commit b297afee3e13d8843e462845480800bebacf6ae6)

17 months agoFC ELS: Fix address length of FCWWN address in logout message
Jaap Keuter [Thu, 21 Jan 2021 09:40:38 +0000 (21 09:40 +0000)]
FC ELS: Fix address length of FCWWN address in logout message

Closes #17168

(cherry picked from commit 13e04a21926524ed996f95a7cc350287383f1461)

17 months agoNAS 5GS: fix display of IPv6 interface identifier
Pascal Quantin [Wed, 20 Jan 2021 13:41:12 +0000 (20 14:41 +0100)]
NAS 5GS: fix display of IPv6 interface identifier

Do not use FT_IPV6 as an interface identifier could be wrongly identified
as an IPv4-Compatible IPv6 Address format by inet_ntop() and displayed
as such.

(cherry picked from commit f64eddfd010248104716be3435b09c42082b5461)

Conflicts:
epan/dissectors/packet-nas_5gs.c

17 months agoNAS EPS: fix display of IPv6 interface identifier
Pascal Quantin [Wed, 20 Jan 2021 13:39:09 +0000 (20 13:39 +0000)]
NAS EPS: fix display of IPv6 interface identifier

Do not use FT_IPV6 as an interface identifier could be wrongly identified
as an IPv4-Compatible IPv6 Address format by inet_ntop() and displayed
as such.

(cherry picked from commit b794e4798a4e076e6d79d358a6fb7085e8f6427b)

17 months agoDon't dereference a known-to-be-null pointer.
Guy Harris [Wed, 20 Jan 2021 09:07:18 +0000 (20 09:07 +0000)]
Don't dereference a known-to-be-null pointer.

In dump_dfilter_macro_t(), if the dfilter_macro_t pointer is null, just
give up after printing the message that indicates that.

This should squelch several nullPointerRedundantCheck warnings from
cppcheck.

(cherry picked from commit 05b9e5377753cb7463294bf17f3f2cc6faec6ba4)

17 months agoSquelch "Clarify calculation precedence" warning from cppcheck.
Guy Harris [Wed, 20 Jan 2021 07:12:03 +0000 (20 07:12 +0000)]
Squelch "Clarify calculation precedence" warning from cppcheck.

For

        A & B ? C : D

put "A & B" in parentheses, to clarify the precedence.

(cherry picked from commit 138041b545e1191e0218142dfd6d1a15f4007f7e)

17 months agoSquelch "Clarify calculation precedence" warning from cppcheck.
Guy Harris [Tue, 19 Jan 2021 23:46:10 +0000 (19 23:46 +0000)]
Squelch "Clarify calculation precedence" warning from cppcheck.

For

A & B ? C : D

put "A & B" in parentheses, to clarify the precedence.

(cherry picked from commit 6b85987e4aa9171d7a275abba7433ed05549d89a)

18 months agodup() can fail; check whether it does.
Guy Harris [Tue, 19 Jan 2021 07:31:27 +0000 (19 07:31 +0000)]
dup() can fail; check whether it does.

If, for example, you run out of file descriptors, dup() can fail, and
ws_dup() is a wrapper around it on UN*X.  Don't just pass the result of
ws_dup() to ws_fdopen(); instead, save its result, check against -1 and,
if it's -1, give up, otherwise pass it to ws_fdopen().

This addresses Coverity CID 1471708.

Also, if ws_fdopen() fails, close the descriptor we got from ws_dup();
this closes a possible FD leak.

(cherry picked from commit 165792fb310080cd40bb891eabde97b3e6287001)

18 months agoQt+tools: Fix most of our lupdate warnings.
Gerald Combs [Sun, 17 Jan 2021 18:38:27 +0000 (17 18:38 +0000)]
Qt+tools: Fix most of our lupdate warnings.

Fix various warnings with the following changes:

Pass a list of include directories to lupdate. Fixes:

    ui/qt/proto_tree.cpp:57: Qualifying with unknown namespace/class ::ProtoTree

and similar warnings.

Use QT_TRANSLATE_NOOP instead of QT_TR_NOOP. Fixes:

    ui/qt/lte_rlc_statistics_dialog.cpp:993: tr() cannot be called without context
    ui/qt/lte_mac_statistics_dialog.cpp:911: tr() cannot be called without context
    ui/qt/font_color_preferences_frame.cpp:28: tr() cannot be called without context
    ui/qt/font_color_preferences_frame.cpp:29: tr() cannot be called without context
    ui/qt/font_color_preferences_frame.cpp:30: Discarding unconsumed meta data

Add Q_OBJECT to the class definition. Fixes:

    ui/qt/models/filter_list_model.cpp:120: Class 'FilterListModel' lacks Q_OBJECT macro

The following warnings were not fixed. This might require moving IOGraph
to its own file:

    ui/qt/io_graph_dialog.cpp:320: Qualifying with unknown namespace/class ::IOGraphDialog
    ui/qt/io_graph_dialog.cpp:555: Qualifying with unknown namespace/class ::IOGraphDialog
    ui/qt/io_graph_dialog.cpp:1059: Qualifying with unknown namespace/class ::IOGraphDialog
    ui/qt/io_graph_dialog.cpp:1485: Qualifying with unknown namespace/class ::IOGraphDialog

(cherry picked from commit 85a793892520c0f2152bc26c1287236762c69e85)

18 months agoQUIC: improve error reporting
Nardi Ivan [Mon, 14 Dec 2020 09:35:42 +0000 (14 09:35 +0000)]
QUIC: improve error reporting

When unable to decrypt SH packets we should visualize an error, via
expert info. This way we handle SH and LH errors in the same way.

Close #17077

(cherry picked from commit 9faf6d4e7b670a517ad492fe0a1c866f9ed21875)

18 months ago[Automatic update for 2021-01-17]
Gerald Combs [Sun, 17 Jan 2021 10:29:07 +0000 (17 10:29 +0000)]
[Automatic update for 2021-01-17]

Update manuf, services enterprise numbers, translations, and other items.

18 months agoAUTOSAR-NM: True-False-String wrong way around for PNI (BUGFIX)
Dr. Lars Völker [Wed, 13 Jan 2021 22:41:54 +0000 (13 22:41 +0000)]
AUTOSAR-NM: True-False-String wrong way around for PNI (BUGFIX)

This patch fixes the PNI TFString, which was wrong. Correct is:
0 = "... contains no Partial Network ..."
1 = "... contains Partial Network ..."

Fixes #17154

(cherry picked from commit 238446dc91cd39bbe56d8aea2bb0f782399f77a6)

18 months agoWindows: add a notice to NSIS in case of BSOD while installing Npcap
Pascal Quantin [Wed, 13 Jan 2021 21:57:00 +0000 (13 21:57 +0000)]
Windows: add a notice to NSIS in case of BSOD while installing Npcap

(cherry picked from commit a07898a280d40735a4aa090ddc94169d99ff263c)

18 months agoWindows: upgrade Npcap to 1.10
Pascal Quantin [Wed, 13 Jan 2021 21:00:16 +0000 (13 22:00 +0100)]
Windows: upgrade Npcap to 1.10

18 months agoWindows: fix USBPcap page link display in NSIS installer
Pascal Quantin [Wed, 13 Jan 2021 21:35:21 +0000 (13 21:35 +0000)]
Windows: fix USBPcap page link display in NSIS installer

(cherry picked from commit 511aeaa44a095976944528a5e19d76205b15e198)

18 months agoDoIP: Adding 2019 DoIP Type
Dr. Lars Völker [Tue, 12 Jan 2021 18:03:00 +0000 (12 18:03 +0000)]
DoIP: Adding 2019 DoIP Type

Adding ISO13400-2019 DoIP Version 3.

(cherry picked from commit 69710ff1177179719b75904c46e0c2ee4faed292)

18 months agoSIP: Fix parsing of multiple contact-param
Uli Heilmeier [Fri, 1 Jan 2021 20:09:02 +0000 (1 20:09 +0000)]
SIP: Fix parsing of multiple contact-param

contact-params are optional (s. https://tools.ietf.org/html/rfc3261#section-20.10).
Therefore, independently of contact-params, we should also check for additional contact-param.

Fixes: wireshark/wireshark#13752

(cherry picked from commit 02f2d18b2ee6dbb650193689b0d4ed2d01566426)

18 months agoQt: Make the checkSaveAsWithComment dialog box appear.
John Thacker [Tue, 12 Jan 2021 00:11:52 +0000 (12 00:11 +0000)]
Qt: Make the checkSaveAsWithComment dialog box appear.

Set the parent of the QMessageBox in the constructor instead of calling
QMessageBox::setParent(). The latter inherits from QDialog, and it
"clear[s] the window flags specifying the window-system properties for
the widget (in particular it will reset the Qt::Dialog flag)."
(See https://doc.qt.io/qt-5/qdialog.html#details )
This makes the dialog properly appear instead of attempting to save a file
with comments to a file type that does not support comments silently failing.
Fixes #17146.

(cherry picked from commit fb422bed916efeb8e346e175db96bbb10407c7d7)

18 months ago[Automatic update for 2021-01-10]
Gerald Combs [Sun, 10 Jan 2021 10:31:22 +0000 (10 10:31 +0000)]
[Automatic update for 2021-01-10]

Update manuf, services enterprise numbers, translations, and other items.

18 months agoJust correct the documentation for this obvious mistake. Closes #17141.
Eugene Adell [Sat, 9 Jan 2021 18:07:30 +0000 (9 18:07 +0000)]
Just correct the documentation for this obvious mistake. Closes #17141.

(cherry picked from commit 9b0c3f5eaf2d91596b1c6769b7e44666a641fa07)

18 months agoTECMP: Fixing wrong size of HW version in Status CM Msg (Bugfix)
Dr. Lars Völker [Wed, 6 Jan 2021 16:42:15 +0000 (6 16:42 +0000)]
TECMP: Fixing wrong size of HW version in Status CM Msg (Bugfix)

The HW version is correctly parsed as 2 bytes but shown as 3 bytes in
the dissection. This is fixed here.

Fixes #17133

(cherry picked from commit 1546a0af26d16594448e48998aa7b567b4552d8a)

18 months agomacos-setup: Update CMake for Apple Silicon
John Thacker [Mon, 4 Jan 2021 00:35:25 +0000 (4 00:35 +0000)]
macos-setup: Update CMake for Apple Silicon

Apple Silicon requires CMake 3.19.2, but the binaries provided
for 3.19.2 only run on MacOS 10.10 and later, so we have more
bifurcation of the CMake we try to install. Get rid of some of
the old 2.x paths to compensate.

(cherry picked from commit d74bfc569ec80ec90a07d99ca267468d3d5d0589)

18 months agoQt: Fetch OverlayScrollBar sliderPosition from the real ScrollBar
Stig Bjørlykke [Sun, 3 Jan 2021 13:56:43 +0000 (3 13:56 +0000)]
Qt: Fetch OverlayScrollBar sliderPosition from the real ScrollBar

In OverlayScrollBar return the real ScrollBar sliderPosition to ensure
the correct value is used when handling the actionTriggered signal in
vScrollBarActionTriggered().

This improves turning on and off auto scroll during capture when page
stepping using the packet list slider, because the value is propagated
after this signal.

(cherry picked from commit 7980f25f999a39ca3cebd8e6c2f8b17818774ebe)

18 months agoTPNCP: Fix exception for commands/events without CID
Orgad Shaneh [Sun, 3 Jan 2021 10:48:08 +0000 (3 12:48 +0200)]
TPNCP: Fix exception for commands/events without CID

+ Simplify length checks

(cherry picked from commit 4003a5f3ce75f8cd20a6a0322fcdaa3214a4e8f8)

18 months ago[Automatic update for 2021-01-03]
Gerald Combs [Sun, 3 Jan 2021 10:29:33 +0000 (3 10:29 +0000)]
[Automatic update for 2021-01-03]

Update manuf, services enterprise numbers, translations, and other items.

18 months agoTPNCP: Misc fixes for backward compatibility
Orgad Shaneh [Mon, 7 Dec 2020 08:38:53 +0000 (7 08:38 +0000)]
TPNCP: Misc fixes for backward compatibility

(cherry picked from commits d2abcb09c1232b381b538210751d351e96d43162
and 26a822c968077076058d6245f04a56660a247d80)

18 months agoTPNCP: Fix spelling
Orgad Shaneh [Sun, 3 Jan 2021 06:55:17 +0000 (3 08:55 +0200)]
TPNCP: Fix spelling

(partially cherry picked from commit
eef4ba7ed7dfc56745f2b5371dafa0f6df594142)

18 months agoTPNCP: Update tpncp.dat
Orgad Shaneh [Mon, 30 Nov 2020 09:24:24 +0000 (30 11:24 +0200)]
TPNCP: Update tpncp.dat

(cherry picked from commit a97341607712eb9d567a9d5e4b09a965f2bb6e19)

18 months agoQt: Connect QScrollbar::actionTriggered to OverlayScrollBar
Stig Bjørlykke [Sat, 2 Jan 2021 16:36:50 +0000 (2 16:36 +0000)]
Qt: Connect QScrollbar::actionTriggered to OverlayScrollBar

This will fix the issue where auto scroll during capture is not turned
off when the scroll bar position is changed.

(cherry picked from commit a42ab09b72c9f19525b63742dd5142bc81abef58)

18 months agoHappy New Year 2021
Stig Bjørlykke [Fri, 1 Jan 2021 10:11:59 +0000 (1 10:11 +0000)]
Happy New Year 2021

(cherry picked from commit 85bf15fd7614cf3291b0c9d0cb682bdba5ad920b)

18 months agoTLS: fix display of Google QUIC Version in Transport Parameters
Nardi Ivan [Wed, 30 Dec 2020 15:49:06 +0000 (30 15:49 +0000)]
TLS: fix display of Google QUIC Version in Transport Parameters

(cherry picked from commit a23915c9a86ae8d4b5a497b114b06d7835ed9070)

18 months agovoip_calls_dialog/voip_calls: Fix for #16952
Jirka Novak [Tue, 29 Dec 2020 15:52:33 +0000 (29 15:52 +0000)]
voip_calls_dialog/voip_calls: Fix for #16952

The fix solves issue #16952. It reverts commit 88813716 which introduced memory leak which causes the issue. The original issue with duplicating entries is solved too.
Because commit was cherry picked to 3.4.0 (might be in more branches), this patch should be cherry picked too.

(cherry picked from commit 71e3969d63d70e1e57b58568926534e963bd3b31)

18 months agoVoIP: VoIP calls statistics are cleared when retap is issued
Jirka Novak [Sun, 13 Dec 2020 13:04:11 +0000 (13 13:04 +0000)]
VoIP: VoIP calls statistics are cleared when retap is issued

Every press of Play Stream or Prepare Filter caused incorrect increasing
of Packets count and added Comments.
The reason was that callinfo statistics were not clear before recap
therefore all new values were added to exiting ones.
Patch solves it.

(cherry picked from commit ff3fffcf5cc6a72ff6e37354cf5abafe0987fec0)

18 months agoDHCPv6: typo
Valerii Zapodovnikov [Tue, 29 Dec 2020 15:43:39 +0000 (29 15:43 +0000)]
DHCPv6: typo

(cherry picked from commit fbccfe99969ad47c60affadc1c06627dbde3c814)

18 months agopcapng: add missing file format interpretation of EPB options
Jaap Keuter [Mon, 28 Dec 2020 15:41:44 +0000 (28 15:41 +0000)]
pcapng: add missing file format interpretation of EPB options

Add the file format interpretations of Enhanced Packet Block options which
are being read by wiretap, but missing from the file format dissector.

(cherry picked from commit c657a6f5e7a8ba32a7788787b25146e0d9fa4b5f)

18 months ago[Automatic update for 2020-12-27]
Gerald Combs [Sun, 27 Dec 2020 19:39:36 +0000 (27 19:39 +0000)]
[Automatic update for 2020-12-27]

Update manuf, services enterprise numbers, translations, and other items.

18 months agodumpcap: Improve the secondary error for promiscuous mode failure.
Guy Harris [Sun, 27 Dec 2020 20:55:31 +0000 (27 20:55 +0000)]
dumpcap: Improve the secondary error for promiscuous mode failure.

On Windows, some devices don't let promiscuous mode be enabled, and
return an error rather than silently ignoring the request to use
promiscuous mode (as UN*X devices tend to do).  Check for the error
message from that error, and suggest that the user turn off promiscuous
mode on that device.

(cherry picked from commit c15a37db5155566cf548b8406133b3c9e43471e0)

18 months agoeditcap: one more integer -> Boolean.
Guy Harris [Thu, 24 Dec 2020 07:09:19 +0000 (24 07:09 +0000)]
editcap: one more integer -> Boolean.

selected() returns a Boolean value indicating whether the packet with a
given number was selected by the packet-range arguments or not.

(cherry picked from commit f75e2e5956ffb3e26ef68813e382cc5b5afe60cb)

18 months agoeditcap: make verbose a Boolean as well.
Guy Harris [Thu, 24 Dec 2020 01:55:20 +0000 (24 01:55 +0000)]
editcap: make verbose a Boolean as well.

And, to catch people habituated to -r and -v toggling the flag, fail if
it's already been set, to dishabituate them.

Not having them toggle makes it easier to document their semantics.

(cherry picked from commit 0d0071a3023d19f54c02b6edaa37c20429f8da92)

18 months agoeditcap: treat the "keep packets" flag as a Boolean.
Guy Harris [Wed, 23 Dec 2020 23:49:07 +0000 (23 23:49 +0000)]
editcap: treat the "keep packets" flag as a Boolean.

Give it the type gboolean, initialize it to FALSE, and have -r set it to
TRUE.

This makes it a little clearer what it's doing.

(cherry picked from commit d98106876c333bdc9a0c947aa8eaba62cd10aafc)

18 months agomate_setup: allocate correct amount of memory
Moshe Kaplan [Tue, 22 Dec 2020 18:36:46 +0000 (22 18:36 +0000)]
mate_setup: allocate correct amount of memory

When creating a _mate_cfg_gog, instead of
allocating space for a `_mate_cfg_gop`,
allocate space for a _mate_cfg_gog. Also, use
`g_new` instead of `gmalloc`.

(cherry picked from commit 1c7edf49f83815b56367e6d0441445e8a4981a72)

18 months agoLet the CLI programs tell about how to show their version
Jaap Keuter [Tue, 22 Dec 2020 14:57:14 +0000 (22 14:57 +0000)]
Let the CLI programs tell about how to show their version

Add to the help text the option to show the version of the CLI program.

(cherry picked from commit 38ab00a094e476cdb93bf1c6a1f27246b6cba179)

18 months agomacOS: Force dark mode support.
Gerald Combs [Mon, 21 Dec 2020 21:12:01 +0000 (21 21:12 +0000)]
macOS: Force dark mode support.

We initially disabled dark mode support in Info.plist when we didn't
support it very well, and later passively enabled it depending on our
SDK version. Go ahead and force it on since we officially support dark
mode. Closes #17098.

(cherry picked from commit b3352bd639ba2cffd204d6e0b63bc72d34513077)

18 months agoCMake: macOS version updates.
Gerald Combs [Sat, 19 Dec 2020 19:23:57 +0000 (19 19:23 +0000)]
CMake: macOS version updates.

Set MIN_MACOS_VERSION to 10.14 if we're building with Qt 6.0 or later.
Print both our deployment target and our base SDK at configure time.

(cherry picked from commit 2c303c725f1122fdc55c3ff8b56e75f77f43163f)

18 months agogitlab-ci: fix build:ubuntu-dist.
Dario Lombardo [Tue, 22 Dec 2020 10:59:00 +0000 (22 10:59 +0000)]
gitlab-ci: fix build:ubuntu-dist.

(cherry picked from commit 33ab986589684398a656e37463df71631a0710d3)

18 months agoGitLab CI: Copy over the build:ubuntu-dist job from master.
Gerald Combs [Tue, 22 Dec 2020 00:05:27 +0000 (21 16:05 -0800)]
GitLab CI: Copy over the build:ubuntu-dist job from 

18 months agoFix the way we get high-resolution time.
Guy Harris [Sun, 20 Dec 2020 21:31:57 +0000 (20 21:31 +0000)]
Fix the way we get high-resolution time.

If we're not on Windows, use clock_gettime(CLOCK_REALTIME) *if* we have
it; otherwise, fall back on gettimeofday().

(Note: neither Linux, nor macOS, nor Windows necessarily "have"
particular APIs; particular *versions* of Linux distributions
(kernel+libc) have them, particular *versions* of macOS have them, and
particular *versions* of Windows+MSVC have them.

And Linux, Windows and macOS aren't the only platforms on which we run.)

Fixes #17101.

(cherry picked from commit ca99a821b4021b2367152ed6547615b098ac7c71)

18 months ago[Automatic update for 2020-12-20]
Gerald Combs [Sun, 20 Dec 2020 09:25:52 +0000 (20 09:25 +0000)]
[Automatic update for 2020-12-20]

Update manuf, services enterprise numbers, translations, and other items.

18 months agoGQUIC: add decoding of QLVE tag
Nardi Ivan [Sat, 19 Dec 2020 18:33:00 +0000 (19 18:33 +0000)]
GQUIC: add decoding of QLVE tag

Latest GQUIC versions encapsulate their first flight in Q043 packets.

(cherry picked from commit bfb889910af094042bd975b32a578b447bcc1e08)

18 months agoQUIC: improve heurist to avoid false positives
Nardi Ivan [Wed, 18 Nov 2020 13:55:37 +0000 (18 13:55 +0000)]
QUIC: improve heurist to avoid false positives

Improve visualization of "Version Negotiation" fields

(cherry picked from commit 60401ca54efdc3e83b9e3177f3f385d6c3bd1e55)

18 months agomacos-setup: clean up snappy uninstall to match the trunk version.
Guy Harris [Sun, 20 Dec 2020 05:15:30 +0000 (19 21:15 -0800)]
macos-setup: clean up snappy uninstall to match the trunk version.

[skip ci]

18 months agomacos-setup: various cleanups.
Guy Harris [Thu, 17 Dec 2020 02:14:30 +0000 (17 02:14 +0000)]
macos-setup: various cleanups.

In uninstall_autoconf, when running uninstall subfunctions, pass the
arguments to the subfunctions.

When uninstalling Ninja, remove the "we've finished installing this"
indicator file.

Get rid of a debugging "set +x".

(cherry picked from commit 9fbf79c0453952ed48f9ed31f7004aab73c92e8e)

18 months agomacos-setup: work around a botch in GLib "make distclean".
Guy Harris [Sat, 19 Dec 2020 22:21:15 +0000 (19 22:21 +0000)]
macos-setup: work around a botch in GLib "make distclean".

[skip ci]

(cherry picked from commit f3dc269df64d11763e76370c5b413dc15c11235b)

18 months agomacos-setup: don't configure p11-kit to use libffi.
Guy Harris [Thu, 17 Dec 2020 21:21:38 +0000 (17 21:21 +0000)]
macos-setup: don't configure p11-kit to use libffi.

See comment for an explanation.

(cherry picked from commit 1949b6a5eed9e2725df68b77616a6f0523058bb3)

18 months agomacos-setup: remove tabs.
Guy Harris [Thu, 17 Dec 2020 20:43:43 +0000 (17 20:43 +0000)]
macos-setup: remove tabs.

Consistenly use spaces for indentation.

(cherry picked from commit 2db0c640349643ea745b698b918f1ce561bb9551)

18 months agomacos-setup: get rid of a debugging "set -x".
Guy Harris [Thu, 17 Dec 2020 07:23:13 +0000 (17 07:23 +0000)]
macos-setup: get rid of a debugging "set -x".

(cherry picked from commit ca13c3ce49d94c09a36f1696e42bd37a4412e44a)

18 months agomacos-setup: fix uninstallation of libtasn1.
Guy Harris [Wed, 16 Dec 2020 19:54:53 +0000 (16 19:54 +0000)]
macos-setup: fix uninstallation of libtasn1.

Fix a copy-and-pasteo.

(cherry picked from commit f2af1ea66d195c39d8e81a80afe3332c9fcc2fd3)

19 months agomacos-setup: clean up uninstallation of snappy.
Guy Harris [Sun, 13 Dec 2020 07:47:27 +0000 (13 07:47 +0000)]
macos-setup: clean up uninstallation of snappy.

For a CMake build done in a subdirectory of the source directory, the
equivalent of "make distclean" is "rm -rf {that subdirectory}".  Make it
so.

When uninstalling the stuff snappy installs with "rm -rf", use $DO_RM,
so it's done with sudo iff /usr/local isn't writable by us, just as
"make uninstall" is done with $DO_MAKE_UNINSTALL so it's done with sudo
iff /usr/local isn't writable by us.

Fix up the list of what to remove, now that we're building snappy as a
shared library, so that it removes shared libraries rather than the
non-existent static library.

Update a comment while we're at it, as Lua isn't the only dependency
that doesn't support "make uninstall".

(cherry picked from commit 7d01e3a74ec24d1e9748674bda5d109d2336dd3e)

19 months agomacos-setup: build snappy as a shared library.
Guy Harris [Sun, 13 Dec 2020 05:30:51 +0000 (13 05:30 +0000)]
macos-setup: build snappy as a shared library.

The older versions of snappy apparently used autotools and build a
shared library by default; for example, Wireshark 3.2.6 for macOS is
built with snappy, and includes a snappy dynamic library in the app
bundle.

The current version uses CMake and does *not* build a shared library by
default.  Instead, it builds a static library, which, when you try to
link it to a C-only shared library...

...does not work.

The linker sees that you're statically linking in a bunch of C++ .o
files and gets upset because it can't find C++ standard library routines
used by that code.

If it's a dynamic library, the library was itself already linked with
the C++ standard library, so the external references to that library
from the snappy library are already marked as having been resolved to
the extent that they're expected to be in the C++ standard library at
run time - and, when the dynamic snappy library is built, it's marked as
depending on the C++ standard library, so the run time linker will, when
it loads the snappy dynamic library, see that the C++ standard library
is required and will load it if it hasn't already been loaded.

(cherry picked from commit e92119c60895fd4586548e84ef3434bba3dbe0d8)

19 months agoSnappy uses CMake, and they didn't bother to provide an unintall target.
Guy Harris [Sat, 12 Dec 2020 23:51:10 +0000 (12 23:51 +0000)]
Snappy uses CMake, and they didn't bother to provide an unintall target.

Or a distclean target, for that matter.

Do the best we can.

(libpcap and tcpdump support both autotools and CMake, and Wireshark
uses only CMake; all of them support an uninstall target in CMake.  Go
forth, read what they did, and sin no more.)

(cherry picked from commit 504f2ea42ab1fe6730f349860b083eabdaaaaebb)

19 months agoWork around more NeXTStEP-induced pain.
Guy Harris [Sat, 12 Dec 2020 21:53:46 +0000 (12 21:53 +0000)]
Work around more NeXTStEP-induced pain.

GNU libtool has a libtool program and a libtoolize program.

The development tools for NeXTStEP, apparently, had a libtool program as
well, and the current version of the development tools for the current
version of NeXTStEP, generally known as "Xcode for macOS", still have
that program.

This means that we do some renaming after installing GNU libtool, so
that its "libtool" becomes "glibtool" and its "libtoolize" becomes
"glibtoolize".

That meant we had to compensate for that when running autoreconf when
building and installing minizip.

It turns out we have to do that when running autogen.sh when building
and installing GLib as well.

(cherry picked from commit 2ecb6061422ca933db2422e9ecb03bb0544a6492)

19 months agomacOS: Enable PKCS #11 support when building with macos-setup.sh
John Thacker [Thu, 26 Nov 2020 06:10:34 +0000 (26 06:10 +0000)]
macOS: Enable PKCS #11 support when building with macos-setup.sh

Enable PKCS #11 support in macOS builds with macos-setup.sh (already
supported on macOS via Homebrew and on all other OSes with GnuTLS 3.4
or greater) by installing p11-kit (and its dependency libtasn1) and
building nettle and GnuTLS against it.

(cherry picked from commit fe1f9475409f252b6ca2dccc71187868e168c74b)

19 months agomacos-setup.sh: Update various software versions
Joerg Mayer [Tue, 1 Dec 2020 16:44:13 +0000 (1 17:44 +0100)]
macos-setup.sh: Update various software versions

Update versions of xz, lzip, gettext, libgpg, libgpg-error, libgcrypt, gnutls and gmp
to newest releases.

Also update glib but only to last version with autotools support - meson build is left
for another time.

Current versions of glib require a libpcre with unicode enabled which the Catalina system
version does not provide, so install the current version of libpcre as well.

Update some additional tools to commit 3a42bf0de2b9e35efcc3cea38153ab95cb71b352:
brotli, libmaxminddb, lz4, and snappy

(backported from commit 77e9d7d3f9ba64e27481710ff3effc1d5e2fbbac)

These are the versions being used to build 3.4, so we're updating this
so that the 3.4 source tree's macos-setup.sh can be used to set up the
build environment for 3.4.

[skip ci]

19 months agoIPv6: SRH setup correct DA for pseudo header
Jaap Keuter [Fri, 18 Dec 2020 12:22:15 +0000 (18 12:22 +0000)]
IPv6: SRH setup correct DA for pseudo header

When a Segment Routing Header is present in the IPv6 packet provisions
have to be made to setup the right destination address for the pseudo
header used in checksum calculations. When segments are left in the header
the first address in the list has to replace the destination address.

Closes #17097

(cherry picked from commit 7052994a19bd3361ea9181c6ef99a82b398033ed)

19 months agoSOME/IP-SD: hidden fields for entries are 16 bytes off (Bugfix)
Dr. Lars Völker [Wed, 16 Dec 2020 23:39:23 +0000 (16 23:39 +0000)]
SOME/IP-SD: hidden fields for entries are 16 bytes off (Bugfix)

This patch fixes a bug that lead to 7 hidden fields being off by
16 bytes.

Closes #17091

(cherry picked from commit ff23fb9f0cba69f3fa202bf6125fcbbc60f581f1)

19 months agomacos-setup: explain why we're running autoreconf on minizip.
Guy Harris [Sat, 19 Dec 2020 07:53:47 +0000 (19 07:53 +0000)]
macos-setup: explain why we're running autoreconf on minizip.

[skip ci]

(cherry picked from commit 8b0d19c63433ec89c84139f6fee298dc32994741)

19 months agomacos-setup: fix the name of the -done file for Minizip.
Guy Harris [Sat, 19 Dec 2020 07:45:28 +0000 (19 07:45 +0000)]
macos-setup: fix the name of the -done file for Minizip.

It's minizip-$installed_minizip_version-done, not
zlib-$installed_minizip_version-done; the tarball is
zlib-$installed_minizip_version.tar.gz, because it's a contributed file
in the zlib package, but we don't use zlib in the name of the -done
file.

[skip ci]

(cherry picked from commit 0cdbdcc5a40f01117aa277120c97cda3c8107dfe)

19 months agomacos-setup: do "make clean", not "make distclean", for zstd.
Guy Harris [Sat, 19 Dec 2020 07:19:12 +0000 (19 07:19 +0000)]
macos-setup: do "make clean", not "make distclean", for zstd.

It has no configure script, so there's no need for "make distclean", and
the Makefile supplied with it has no "make distclean" rule; just do
"make clean".

[skip ci]

(cherry picked from commit 806f524a108280f48af58b41ee7ee9f1f4265a0d)

19 months agoIn Wireshark's version info, indicate whether we were built with Minizip.
Guy Harris [Sat, 19 Dec 2020 06:16:04 +0000 (19 06:16 +0000)]
In Wireshark's version info, indicate whether we were built with Minizip.

We can't determine the version number, as there's nothing in the header
to indicate the version with which we were compiled, nor is there an API
to determine the version with which we're running.

(cherry picked from commit 6498bde741afdd55904fc80b692a5590471a5069)

19 months agoVersion: 3.4.2 → 3.4.3.v3.4.3rc0
Gerald Combs [Fri, 18 Dec 2020 21:53:57 +0000 (18 13:53 -0800)]
Version: 3.4.2 → 3.4.3.

[skip ci]

19 months agoBuild 3.4.2.v3.4.2wireshark-3.4.2
Gerald Combs [Fri, 18 Dec 2020 18:42:42 +0000 (18 10:42 -0800)]
Build 3.4.2.

19 months agoQUIC: update to draft-33
Nardi Ivan [Mon, 14 Dec 2020 12:33:19 +0000 (14 12:33 +0000)]
QUIC: update to draft-33

QUIC (final?) constants for v1 are defined in draft-33

(cherry picked from commit 91bd291b90ab78fa2ccb1eaca27fc1685f6ad0ab)

19 months agoPrep for 3.4.2.
Gerald Combs [Thu, 17 Dec 2020 17:19:17 +0000 (17 09:19 -0800)]
Prep for 3.4.2.

19 months agomacos-setup: Update a comment.
Guy Harris [Sun, 13 Dec 2020 07:47:27 +0000 (12 23:47 -0800)]
macos-setup: Update a comment.

Lua isn't the only dependency that doesn't support "make uninstall".

(backported from commit 7d01e3a74ec24d1e9748674bda5d109d2336dd3e)

19 months agoDon't assume macOS version numbers are of the form 10.N.
Guy Harris [Thu, 26 Nov 2020 02:23:06 +0000 (26 02:23 +0000)]
Don't assume macOS version numbers are of the form 10.N.

Big Sur goes to 11, and it appears that next year's (San Juan Capistrano?)
will go to 12, and so on.

Split version numbers into major and minor, and do version-number
comparison (alas, whilst CMake has that built in, the Bourne shell
doesn't, and neither does the Bourne-again shell).

This should fix issue #17043.

(cherry picked from commit 8e2815bfc0aa08a5e9ab83de8b8b2ed56e698cf9)

19 months agomacos-setup: various cleanups.
Guy Harris [Thu, 17 Dec 2020 02:14:30 +0000 (17 02:14 +0000)]
macos-setup: various cleanups.

In uninstall_autoconf, when running uninstall subfunctions, pass the
arguments to the subfunctions.

When uninstalling Ninja, remove the "we've finished installing this"
indicator file.

Get rid of a debugging "set +x".

(cherry picked from commit 9fbf79c0453952ed48f9ed31f7004aab73c92e8e)

19 months agomacos-setup: set SDKROOT when running xcrun.
Guy Harris [Wed, 16 Dec 2020 22:09:22 +0000 (16 14:09 -0800)]
macos-setup: set SDKROOT when running xcrun.

That lets it find the right SDK path if you're not using the default
SDK.

(backported from commit 190442d76ebdd77626d03b6aad31a9bee20b2f9c)

19 months agomacos-setup: more cleanups.
Guy Harris [Sun, 13 Dec 2020 08:44:24 +0000 (13 00:44 -0800)]
macos-setup: more cleanups.

Fix/update/expand some comments.

Do uninstalls for dependencies using CMake more similarly.

For LZ4, as it comes with a Makefile rather than any
autotools/CMake/etc. configuration, "make distclean" might not be
necessary, so, as it's not supported, just do "make clean".

For libssh, do all removes in the uninstall in a single command, and use
$DO_RM, so that it uses sudo iff /usr/local isn't writable by us.  In
addition, remove the build directory as the equivalent of "make
distclean".

As with libssh, so with brotli.

(backported from commit 02c5f500090261947b3e9a65dafff83a71edb17b)

19 months agoQt: Force layer backing on Big Sur when needed.
Gerald Combs [Tue, 15 Dec 2020 19:14:17 +0000 (15 19:14 +0000)]
Qt: Force layer backing on Big Sur when needed.

Make sure NSView.wantsLayer is true by setting QT_MAC_WANTS_LAYER=1 at
startup if we're running on Big Sur and we were built with a version of
Qt susceptible to QTBUG-87014. Fixes #17075?

(cherry picked from commit d4b40c00472d0d1eb032725f27f1c827943d8546)

19 months agomacOS: Add a workaround for libsnappy.
Gerald Combs [Wed, 16 Dec 2020 21:04:18 +0000 (16 21:04 +0000)]
macOS: Add a workaround for libsnappy.

Work around an issue with libsnappy similar to what we do with libssh.

(cherry picked from commit bf45e8c3f1ee600b42cee186e81f1a3ad0b61cb3)

19 months agofcdns: the Owner Id field is a 3-octet FC address, not a text string.
Guy Harris [Wed, 16 Dec 2020 10:04:09 +0000 (16 10:04 +0000)]
fcdns: the Owner Id field is a 3-octet FC address, not a text string.

Make it FT_BYTES with SEP_DOT, like other 3-octet FC addresses.

(cherry picked from commit 19ffed19bd338c1f179e2fc260816b19b328261c)

19 months agofcswils: fix a comment.
Guy Harris [Wed, 16 Dec 2020 05:57:04 +0000 (16 05:57 +0000)]
fcswils: fix a comment.

In an ESS capability object, the well-known type and well-known subtype
fields are 1 byte, not 2 bytes.

(cherry picked from commit ed6f6a49aa59525e7ef032976ce34904c27e4393)

19 months agoFC: use ETHERTYPE_UNK when applicable, no excuses
Jaap Keuter [Tue, 15 Dec 2020 18:14:32 +0000 (15 18:14 +0000)]
FC: use ETHERTYPE_UNK when applicable, no excuses

Two interlocking problems cause the dissection of FC to fail in some cases,
as shown in the capture of the related issue.

The FC dissector assumes that ETHERTYPE_UNK in the data structure passed
to it is coming from the MDS header dissector only, and thus that header
sizes have to be taken into account. This is not / no longer the case.
It always passes down ETHERTYPE_FCFT. Therefore the MDS header size
checking does not apply to ETHERTYP_UNK, so is removed as condition.

The other FC related dissectors were forced to setup a data structure to
pass to FC for it to handle that part of the frame. Because these weren't
related to ethernet, these lazily set the ethertype field in the data
structure to 0. This unfortunately matches ETHERTYPE_UNK, triggering the
MDS header size checking in FC, leading to this issue. With the first
problem resolved, now make it explicit that unknown ethertype is indicated
by ETHERTYPE_UNK, not '0'.

Addresses primary part of issue #17084

(cherry picked from commit 3f0fc1b232493815161b345368c7c41500e0153c)

19 months agoFCdNS: use correct header field for field of flags
Jaap Keuter [Tue, 15 Dec 2020 18:42:43 +0000 (15 18:42 +0000)]
FCdNS: use correct header field for field of flags

closes #17084

(cherry picked from commit 354a6fd0154c284b5c1b86987fde1e58cc73dbbb)

19 months agoQUIC: fix a stack overflow
Nardi Ivan [Thu, 10 Dec 2020 19:30:05 +0000 (10 19:30 +0000)]
QUIC: fix a stack overflow

While at it, fix also a memory leak
Close #17073

(cherry picked from commit 4227e5a1adef8ccce29fba0e272a13bc7c312041)