Commit Graph

79172 Commits

Author SHA1 Message Date
Gerald Combs 564a52be19 [Automatic update for 2021-01-31]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-31 10:30:58 +00:00
Gerald Combs e0abfddcc5 Version: 3.4.3 → 3.4.4.
[skip ci]
2021-01-29 11:52:30 -08:00
Gerald Combs 6ae6cd335a Build: 3.4.3
[skip ci]
2021-01-29 10:10:04 -08:00
Gerald Combs b442b8d9d1 Prep for 3.4.3. 2021-01-28 18:30:47 -08:00
Gerald Combs 57e14a4190 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 785e291c1b)
2021-01-28 22:20:52 +00:00
John Thacker 247f8a4b33 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 5ca608f519)
2021-01-28 21:55:50 +00:00
Jaap Keuter 935de5c4eb ZVT: clean up some data points
(cherry picked from commit b4f74bac74)
2021-01-28 11:49:03 +00:00
Guy Harris 1b22b8ed51 epan: don't print nanoseconds if seconds isn't representable.
Fix for previous fixes to #17179.


(cherry picked from commit 4715f5021c)
2021-01-28 08:18:16 +00:00
Guy Harris 9bcc1785c1 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 bf265d7e7a)
2021-01-28 06:58:45 +00:00
Guy Harris e072a71256 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 4e4a7c11c7)
2021-01-28 06:17:57 +00:00
Jaap Keuter 303a7cc58f ZVT: Use standard TCP segment reassemble support function
Fixes #17177


(cherry picked from commit 616d44cbb6)
2021-01-28 00:00:50 +00:00
Gerald Combs e5478357e2 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 cd278f5fd9)
2021-01-27 07:58:38 +00:00
Grzegorz Niemirowski cbdee60912 Fix TID bitmap name
(cherry picked from commit 6a860c979a)
2021-01-26 07:19:49 +00:00
Gerald Combs 24f56bec53 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 26f0db01a7)
2021-01-26 00:45:32 +00:00
Gerald Combs 2248cba00c [Automatic update for 2021-01-24]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-24 10:30:17 +00:00
Jim Young 1b8d89accd tshark: Fix typo in comment from ascci to ascii
(cherry picked from commit a7ad6c271f)
2021-01-24 06:23:06 +00:00
Enrique Giraldo edaa78ceac 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 506f1c650f)
2021-01-24 03:09:03 +00:00
Jason Cohen c8bc83cb9e 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 b297afee3e)
2021-01-22 08:58:34 -06:00
Jaap Keuter 227ed8cced FC ELS: Fix address length of FCWWN address in logout message
Closes #17168


(cherry picked from commit 13e04a2192)
2021-01-22 11:51:50 +00:00
Pascal Quantin 4ea329548c 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 f64eddfd01)

Conflicts:
	epan/dissectors/packet-nas_5gs.c
2021-01-20 15:49:11 +00:00
Pascal Quantin 632df36405 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 b794e4798a)
2021-01-20 15:28:41 +00:00
Guy Harris 79b075365f 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 05b9e53777)
2021-01-20 09:27:38 +00:00
Guy Harris 886465a976 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 138041b545)
2021-01-20 07:35:44 +00:00
Guy Harris 3ff5fc344f 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 6b85987e4a)
2021-01-20 00:11:12 +00:00
Guy Harris 22cc9f3f7f 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 165792fb31)
2021-01-19 07:50:33 +00:00
Gerald Combs f8d662d787 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 85a7938925)
2021-01-18 16:57:04 +00:00
Nardi Ivan c297de3b27 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 9faf6d4e7b)
2021-01-17 11:53:09 +00:00
Gerald Combs 48f42d78b1 [Automatic update for 2021-01-17]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-17 10:29:07 +00:00
Dr. Lars Völker f4d5d56592 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 238446dc91)
2021-01-14 13:39:46 +00:00
Pascal Quantin 9fd813398f Windows: add a notice to NSIS in case of BSOD while installing Npcap
(cherry picked from commit a07898a280)
2021-01-14 06:06:52 +00:00
Pascal Quantin b7e7e0b37f Windows: upgrade Npcap to 1.10 2021-01-14 00:06:47 +00:00
Pascal Quantin c6c0556b3a Windows: fix USBPcap page link display in NSIS installer
(cherry picked from commit 511aeaa44a)
2021-01-13 22:03:34 +00:00
Dr. Lars Völker 85320d2b80 DoIP: Adding 2019 DoIP Type
Adding ISO13400-2019 DoIP Version 3.


(cherry picked from commit 69710ff117)
2021-01-13 10:45:03 +00:00
Uli Heilmeier 75c00f6d0d 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 02f2d18b2e)
2021-01-13 09:32:31 +00:00
John Thacker a666035948 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 fb422bed91)
2021-01-12 11:29:27 +00:00
Gerald Combs 0bb6c70189 [Automatic update for 2021-01-10]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-10 10:31:22 +00:00
Eugene Adell 39f15f4d3f Just correct the documentation for this obvious mistake. Closes #17141.
(cherry picked from commit 9b0c3f5eaf)
2021-01-09 19:08:00 +00:00
Dr. Lars Völker d412877409 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 1546a0af26)
2021-01-06 17:04:51 +00:00
John Thacker 6f489ee857 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 d74bfc569e)
2021-01-05 22:32:46 +00:00
Stig Bjørlykke ee43965024 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 7980f25f99)
2021-01-05 08:24:25 +00:00
Orgad Shaneh c57c306762 TPNCP: Fix exception for commands/events without CID
+ Simplify length checks

(cherry picked from commit 4003a5f3ce)
2021-01-04 09:16:20 +02:00
Gerald Combs 0b17762519 [Automatic update for 2021-01-03]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-03 10:29:33 +00:00
Orgad Shaneh e71ff74953 TPNCP: Misc fixes for backward compatibility
(cherry picked from commits d2abcb09c1
and 26a822c968)
2021-01-03 08:25:53 +00:00
Orgad Shaneh 1d6e13c12e TPNCP: Fix spelling
(partially cherry picked from commit
eef4ba7ed7)
2021-01-03 08:03:23 +00:00
Orgad Shaneh 417b694990 TPNCP: Update tpncp.dat
(cherry picked from commit a973416077)
2021-01-03 08:57:22 +02:00
Stig Bjørlykke 09d182d987 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 a42ab09b72)
2021-01-02 22:10:45 +00:00
Stig Bjørlykke f95baf9c9c Happy New Year 2021
(cherry picked from commit 85bf15fd76)
2021-01-01 11:56:25 +00:00
Nardi Ivan 17b2a16b5a TLS: fix display of Google QUIC Version in Transport Parameters
(cherry picked from commit a23915c9a8)
2020-12-31 11:45:09 +00:00
Jirka Novak 4bbab577e7 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 71e3969d63)
2020-12-29 20:03:55 +00:00
Jirka Novak 0985a2ef2a 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 ff3fffcf5c)
2020-12-29 19:36:52 +00:00