Commit Graph

84409 Commits

Author SHA1 Message Date
Gerald Combs c5e265f852 CMake: Deduplicate some version variables.
Use PROJECT_VERSION instead of VERSION. Prepend "PROJECT_" or
"LOG_PROJECT_" as needed to other variables. Remove the leftover unused
variables.
2022-06-07 16:04:17 -07:00
Stig Bjørlykke 604cb2a7a3 t38: Use correct conversation_new() options
Fix conversation_new() options after they was changed/improved
in commit 709593ee.
2022-06-07 22:09:28 +00:00
Stig Bjørlykke 86fdbe2ea9 fcels: Use correct find_conversation() options
Fix find_conversation() options after they was changed/improved
in commit 709593ee.
2022-06-07 17:25:36 +00:00
Stig Bjørlykke c5739dcded umts_fp: Use correct find_conversation() and conversation_new() options
Fix find_conversation() and conversation_new() options after they
was changed/improved in commit 709593ee.
2022-06-07 17:09:21 +00:00
Stig Bjørlykke e329582f1d rtp: Use correct find_conversation() options
Fix find_conversation() options after they was changed/improved
in commit 709593ee.
2022-06-07 16:52:25 +00:00
Stig Bjørlykke ad7905e8da coap: Use correct conversation_new() options
Fix conversation_new() options after they was changed/improved
in commit 709593ee.
2022-06-07 16:35:58 +00:00
Stig Bjørlykke 4829f8c04e jxta: Use correct conversation_new() options
Fix conversation_new() options after they was changed/improved
in commit 709593ee.
2022-06-07 17:29:38 +02:00
João Valverde 104cc42008 Make it easier to call tools/make-enums.py from the source dir 2022-06-07 14:31:08 +01:00
João Valverde e21aa6c36e epan: Update instrospection enums 2022-06-07 14:18:33 +01:00
Roland Knall 4b9d152767 Qt: Auto apply "Limit to display filter"
If a display filter had been applied during the opening
of the conversation or endpoint dialog, automatically check
the entry for "Limit to display filter" to ensure that
the filtered result is being shown, as expected by the user.
2022-06-07 14:38:58 +02:00
Martin Mathieson 0b6bb6949e DCT2000: Fix format of string with PDCP-NR keys 2022-06-06 17:58:07 +01:00
mGhony99 218821f2c1 Packaging: Fixed a bug config.nsh not found
In commit 8c7e3f0d30, the config.nsh.in
was renamed as wireshark-config.nsh.in, and the config.nsh was renamed
as wireshark-config.nsh as well, but the wireshark-common.nsh still
includes the config.nsh, which will cause the packaging failed.
2022-06-06 15:41:31 +00:00
John Thacker a3e0d93bed debian: Remove removed symbols
Commit 5cd591129f removes a number
of conversation related functions. Remove them from the debian
symbol list.

The commit also removed the implementation of conversation_hash_exact,
so remove the declaration from the header file.
2022-06-05 22:48:43 -04:00
Gerald Combs 286f57a2c7 epan: Check for null addresses in find_conversation.
Make sure we don't pass null address pointers to conversation_lookup_*.
Fixes #18126.
2022-06-05 17:58:50 -07:00
Jakub Jirutka 3187fbbd61 Qt: Fix segfault when some ICU codec is not available
$ gdb --args wireshark
    (gdb) run
    Starting program: /usr/bin/wireshark
    [New LWP 10363]
    [New LWP 10364]
     ** (wireshark:10356) 13:13:14.137941 [GUI WARNING] -- codecForName: ucnv_open failed ISO-8859-2 U_FILE_ACCESS_ERROR
    (gdb) bt
    Thread 1 "wireshark" received signal SIGSEGV, Segmentation fault.
    0x00005555557b1959 in MainWindow::findTextCodecs (this=0x7fffecdfd390) at wireshark-3.6.5/ui/qt/main_window.cpp:2029
    2029            QString key = codec->name().toUpper();
    (gdb) bt
    #0  0x00005555557b1959 in MainWindow::findTextCodecs (this=0x7fffecdfd390) at wireshark-3.6.5/ui/qt/main_window.cpp:2029
    #1  0x00005555557b4ce3 in MainWindow::MainWindow (this=this@entry=0x7fffecdfd390, parent=parent@entry=0x0) at wireshark-3.6.5/ui/qt/main_window.cpp:362
    #2  0x000055555564f0af in main (argc=<optimized out>, qt_argv=0x7fffffffe748) at wireshark-3.6.5/ui/qt/main.cpp:725

See https://gitlab.alpinelinux.org/alpine/aports/-/issues/13814 for more
information.

Conflicts (cherry-picked from 635286ce):
	ui/qt/main_window.cpp
2022-06-05 17:01:04 -07:00
Jaap Keuter fe4210029a Qt: Reword menu item Seconds Since Beginning of Capture 2022-06-05 23:55:59 +00:00
John Thacker 9d716d793c Follow Stream: Allow using spin boxes with no packets visible
It's only necessary to check that cap_file_.capFile()->edt is
not NULL if use_stream_index is FALSE.

This prevents failure and an inaccurate error message about the
capture file being invalid when using the spinbox to cycle through
a stream when all packets are filtered out.(E.g., Follow a stream,
append to the filter looking for something, no packets match, try to
go to the next stream.)
2022-06-05 22:19:39 +00:00
João Valverde 2939c6d0dc Version info: Do not show plugin count
Plugin count is dependant on initialization order and showing
zero plugins loaded can be misleading.
2022-06-05 21:31:36 +00:00
Gerald Combs 2ac2b0670a Git+CMake: Add support for CMake presets.
CMake 3.19 added support for CMakePresets.json and
CMakeUserPresets.json, which let you prepopulate various configure,
build, and test options. Add CMakeUserPresets.json to .gitignore as
recommended by the documentation and add an example to the Developer's
Guide. CMake uses 2-space indentation; specify that for CMake*.json in
.editorconfig.
2022-06-05 13:04:07 -07:00
João Valverde c0bd7266ad Gitlab-CI: Add tfshark to code check job
Building tfshark is disabled by default in CMake options.

The tfshark code should be continuously tested or removed from the
main repo. It should not be allowed to exist in a broken state.

Add it to the code check job to make sure that it at least compiles.
2022-06-05 19:47:10 +00:00
Gerald Combs 5cd591129f epan: Convert remaining conversation code to elements.
Convert the address+port conversation code to element lists. Make our
conversation keys element lists. Document more of the conversation API.

Update the Conversation Hash Table dialog to use the new API.

Describe an alternative key type and data structure at the top of
conversation.c.
2022-06-05 19:05:33 +00:00
Gerald Combs 729b4d3b69 [Automatic update for 2022-06-05]
Update manuf, services enterprise numbers, translations, and other items.
2022-06-05 16:40:02 +00:00
Stig Bjørlykke b05678b40e nvme: Fix uint32 to pointer conversion
Use GUINT_TO_POINTER to convert guint32 to pointer, and
GPOINTER_TO_UINT to convert pointer to guint32.
2022-06-05 14:10:36 +00:00
Roland Knall b06c1c451c Qt: Make TrafficTable detachable
Allow the endpoint and conversation dialogs to have detachable
tabs. At the same time move the tree functionality to a subclass
to better be able to handle the context menu when detached.

Right now, still a lot of tree stuff is in the tabwidget, but
could be moved to the tree for the future
2022-06-04 21:28:05 +02:00
Roland Knall 9edf06383a Qt: Move most Contextmenu stuff to TrafficTree
Create a new class, which handles the context menu stuff for
the traffic data, as well as remove unnecessary signals used
by the sub-dialogs.
2022-06-04 15:57:02 +02:00
Elijah Conners f72a33fc1c dot11decrypt: explicitly cast *pmk_len and msk_len
In a typical setting where int is 32 bits and the type guint8 is 8 bits,
the overflow check in Dot11DecryptDerivePmkFromMsk will automatically
promote the sum of msk_len and *pmk_len to an int. Since int is 32 bits
and guint8 will always be 8 bits, the sum will never overflow.
Therefore, an explicit casting of the sum of msk_len and *pmk_len to
the type guint8 is necessary.

Signed-off-by: Elijah Conners <business@elijahpepe.com>
2022-06-03 23:13:34 +00:00
Darien Spencer 8fd9d1d274 AT: Implementing a session context
Some AT commands and responses need context to be parsed correctly.
For example AT+CGMI's and AT+CGSN's responses are arbitrary strings
without "AT+" or "+" prefix (So saving the command is needed).
Another use case is when a command/response is followed by its data in
the following line, like AT+CGML (SMS content's listed in the line after
the "+CGML" line).

The implementation utilizes the USB conversation of the session to
pass information between packets.
Every new packets takes a 'snapshot' of the data stored in the conversation
before starting to parse and re-uses it when parsing & re-parsing of
that packet occurs.
2022-06-03 21:49:48 +00:00
Gerald Combs 8c7e3f0d30 Packaging: Add a Logwolf NSIS config.
Create Logwolf-specific copies of the various Wireshark NSIS config files
and modify them to install and uninstall Logwolf. There are still a bunch
of rough edges, but the installer works for a test capture I have here.
2022-06-03 21:24:21 +00:00
Gerald Combs 06f0b78ce6 NSIS: Deprecate 32-bit installs.
Recommend 3.6 or earlier for 32-bit users.
2022-06-03 10:26:19 -07:00
Gerald Combs 9e7a2b7699 NSIS: Fix our indentation.
The NSIS project uses 2-space indentation. Make sure we conform to that.
2022-06-03 10:26:14 -07:00
Roland Knall 05759d3ec5 Qt: Better handle retapping for traffic tables
Retapping can have some side-effects and was done in
an overflowing way. Reducing the number of times retapping
is required and done, and also giving control for taps
reload to TrafficTab
2022-06-03 10:25:15 +02:00
Gerald Combs 056fd8a1e3 NSIS: Update some target and filenames.
Rename the following build targets, similar to the recent macOS target
name changes:

nsis_package_prep to wireshark_nsis_prep
nsis_package to wireshark_nsis

Rename some NSIS files to reflect that they're specific to Wireshark.
Update the documentation and CI configurations.
2022-06-02 16:33:31 -07:00
Jaap Keuter 709593ee91 Make distinction between conversation options for creation and search 2022-06-02 22:58:15 +00:00
Gerald Combs a930a78686 Docs: We no longer require Bison / YACC.
f21cd2e23f Removed our last Bison / YACC file. Update the Developer's
Guide to match.
2022-06-02 13:24:48 -07:00
Stefan Metzmacher 9ec5208873 IWARP_DDP_RDMAP: reassemble fragmented iWarp RDMA Send messages
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2022-06-02 18:20:08 +00:00
Stefan Metzmacher b18646baca IWARP_DDP_RDMAP: make use of wmem_new(wmem_packet_scope(), rdmap_request_t)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2022-06-02 18:20:08 +00:00
Dylan Ulis 3aae474c49 CIP: Minor updates
1. Improve code documentation
2. Expose common variables,functions to let other dissectors to use them
2022-06-02 17:43:24 +00:00
Roland Knall fc505eed29 Qt: Fix coverity warnings for TrafficView 2022-06-02 16:50:31 +00:00
João Valverde 693820b90d lrexlib: Disable MSVC narrowing warnings 2022-06-02 14:47:04 +00:00
João Valverde caacdae870 epan: Add a post_init() plugin routine
Epan plugins init runs before proto_init() to setup for that but there
is also a need to have a routine that runs at the end of epan_init(),
which can do pretty much anything using epan, like runnning tests.
2022-06-02 14:11:17 +00:00
John Thacker 06871d27df wiretap: merge support for IDBs in the middle of a file
Support merging files with IDBs in the middle of the file.
Use wtap_get_next_interface_description when doing the initial
list of interfaces so that we can correctly get IDBs later.

Note that while IDB merge modes "any" and "none" work as expected, the
default "all" mode can't really work for IDBs in the middle of the file
without adding a two-pass mode. In "all" mode, if there are any such IDBs,
merge them with duplicates iff the interfaces at the beginning of the
files were merged.

Related to #15502 and #16542.
2022-06-02 12:51:52 +00:00
John Thacker ea2ddd40f5 Qt: Fix leak in CaptureFileDialog
Instead of instantiating CaptureFileDialog with a reference to
the filter (which means allocating a new empty QString when using
it for Save As and Export Packets, which don't use a filter), pass
the filter reference into the open and merge functions.

This plugs a memory leak that happened each time the Save As or
Export Packets dialog was created.
2022-06-02 12:31:01 +00:00
Roland Knall f725bbef5e Qt: Minor changes to TrafficTrees
Move the corner button to a QToolButton and put it in a widget
to better handle size constraints. Also fix some fallthroughs
and remove unneeded code
2022-06-02 12:30:41 +02:00
Stig Bjørlykke 335795ab16 Qt: Fix build withouth MaxMindDB 2022-06-02 08:56:22 +02:00
Roland Knall dd9e4fd3fa Qt: Fix warning for TrafficData 2022-06-01 20:21:53 +02:00
Roland Knall 7306d7681a Qt: Save Trafficdata as raw
Allow the option to save the data from the traffic dialogs
as raw data and enable it as the default option for 4.0. The
option to display the data with pretty formatting is still
available.
2022-06-01 11:51:39 +02:00
Roland Knall cb56345175 Qt: Move Traffic Tables to Model/View
The current model makes it very hard to extend the traffic tables
with new functionality. For instance, having a total view column
additionally to the normal columns when filtered.

This change removes the QTreeWidget and moves to a more generic
approach using QAbstractListModel elements.

It is implemented in thtree parts:
- ATapDataModel implements the basic collection and handling of
  the tap data information, as well as updating if new data is
  becoming available
- EndpointDataModel / ConversationDataModel handles the display
  and representation of the data
- Implementing TrafficTab as a TabWidget which will handle the
  adding/removing of new protocol tabs
2022-06-01 11:26:22 +02:00
Guy Harris 6014d7ad2b cpuid: clean up, update. and expand some comments. 2022-06-01 00:42:47 -07:00
Guy Harris 02eb128bef cpuid: don't use __cpuid on non-x86 Windows.
We aren't *yet* building ARM64 Wireshark for Windows, but throw in a bit
of future-proofing.  (I guess nobody ever built it for Itanium.)
2022-06-01 00:07:59 -07:00
John Thacker 356a6ab0ea file: Free fname_new when rename successful.
Plug a memory leak.
2022-06-01 02:17:47 +00:00