aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2020-06-01Fix some cppcheck issues:Martin Mathieson1-1/+1
- Some redundant assignments or tests. - Some declarations were changed to match definitions in terms of including _U_ for the same parameters - Some parenthesis added/changed to made precedence more obvious epan/color_filters.c:533: style: Variable 'name' is reassigned a value before the old one has been used. epan/color_filters.c:534: style: Variable 'filter_exp' is reassigned a value before the old one has been used. asn1/tcap/packet-tcap-template.c:2199: warning: Function 'dissect_tcap_ITU_ComponentPDU' argument order different: declaration '_U_, tvb, offset, _U_, tree, _U_' definition '_U_, tvb, offset, actx, tree, _U_' epan/dissectors/packet-aim.c:2546: warning: Function 'dissect_aim_tlv_value_icq' argument order different: declaration 'ti, subtype, tvb, _U_' definition 'ti, _U_, tvb, pinfo' epan/dissectors/packet-arp.c:1133: style: Clarify calculation precedence for '&' and '?'. epan/dissectors/packet-arp.c:1143: style: Clarify calculation precedence for '&' and '?'. epan/dissectors/packet-arp.c:1158: style: Clarify calculation precedence for '&' and '?'. epan/dissectors/packet-arp.c:1168: style: Clarify calculation precedence for '&' and '?'. epan/dissectors/packet-gtpv2.c:5997: warning: Function 'dissect_gtpv2_mbms_service_area' argument order different: declaration 'tvb, _U_, tree, _U_, _U_, _U_, _U_, _U_' definition 'tvb, _U_, tree, item, _U_, _U_, _U_, _U_' epan/dissectors/packet-gtpv2.c:6291: warning: Function 'dissect_gtpv2_mbms_time_to_data_xfer' argument order different: declaration 'tvb, _U_, tree, _U_, _U_, _U_, _U_, _U_' definition 'tvb, _U_, tree, item, _U_, _U_, _U_, _U_' epan/dissectors/packet-gtpv2.c:6369: warning: Function 'dissect_gtpv2_epc_timer' argument order different: declaration 'tvb, _U_, tree, _U_, _U_, _U_, _U_, _U_' definition 'tvb, _U_, tree, item, _U_, message_type, _U_, _U_' epan/dissectors/packet-knxip.c:2939: style: Condition 'mac_error' is always false (just added comment) epan/dissectors/packet-mac-lte.c:4386: style: Clarify calculation precedence for '&' and '?'. epan/dissectors/packet-nas_5gs.c:1828: style: Variable 'nas5gs_data->payload_container_type' is reassigned a value before the old one has been used. (noted confusing recursion) epan/dissectors/packet-rpcrdma.c:587: warning: Identical condition 'offset>max_offset', second condition is always false epan/dissectors/packet-rsl.c:2098: style: Assignment of function parameter has no effect outside the function. Change-Id: Ib5c9a04cfb6e6233972bc041434601c8ef09c969 Reviewed-on: https://code.wireshark.org/review/37343 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-06-01Qt: Fix some Qt 5.15 deprecation warnings.Gerald Combs9-16/+16
Use Qt::ItemFlags() instead of 0. Use QFileDialog::Options() instead of 0. Use QComboBox::textActivated instead of QComboBox::activated. Switch to just using Qt::WindowFlags() in GeometryStateDialog. This *should* work for Qt 5.5 and earlier, but if it doesn't we can switch back. Change-Id: Iaf4e7efa1a11fc7f3325b449eef1be308cd21b45 Reviewed-on: https://code.wireshark.org/review/37349 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-31[Automatic update for 2020-05-31]Gerald Combs1-239/+241
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I85f6df38480057cab59cf3edc6b6fb12dd116afc Reviewed-on: https://code.wireshark.org/review/37339 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-05-30Qt: improve performance of related packet delegateNardi Ivan1-3/+3
Use proper functions to lookup/iterate elements in QHash Avoid useless lookup Change-Id: I7a115ae5ed35b31599f33050e36bf68007167a96 Reviewed-on: https://code.wireshark.org/review/37304 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2020-05-30Qt: Make our exported and saved line endings consistent.Gerald Combs3-4/+18
Make sure we set QIODevice::Text on our QTextStreams when saving and exporting text so that we get native line endings on Windows. Change-Id: I4602157d2d170eb9a2c79032254ea5be236c7589 Reviewed-on: https://code.wireshark.org/review/37336 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-30Qt: Updates for 5.15.Gerald Combs20-43/+69
Fix the following deprecation issues for Qt 5.15: Use Qt::WindowFlags() instead of 0 in Qt >= 5.6. Pass Qt::SkipEmptyParts instead of QString::SkipEmptyParts to QString::split() in Qt >= 5.15. Use QMultiMap instead of QMap where we were using QMap::uniqeKeys(). Use QCP::Interactions() instead of 0. Use '\n' instead of QTextStream::endl. Use QWheelEvent::angleDelta() instead of QWheelEvent::angle(). Change-Id: Ie2d69d3a396c0821c2c34f506ddad6f8e22f7049 Reviewed-on: https://code.wireshark.org/review/37334 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-24[Automatic update for 2020-05-24]Gerald Combs3-654/+654
Update manuf, services enterprise numbers, translations, and other items. Change-Id: If34f97445bfdd336cd369567fbbd004129e487d5 Reviewed-on: https://code.wireshark.org/review/37293 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-05-17[Automatic update for 2020-05-17]Gerald Combs2-493/+503
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I48106b3648d1a699f3153210f68765604e226e8e Reviewed-on: https://code.wireshark.org/review/37238 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-05-10[Automatic update for 2020-05-10]Gerald Combs10-616/+584
Update manuf, services enterprise numbers, translations, and other items. Change-Id: If6b68e242160198aed0de5947813d0db20c799f2 Reviewed-on: https://code.wireshark.org/review/37173 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-05-09More PVS-Studio issues flagged by Valerii Zapodovnikov.Martin Mathieson2-6/+4
/opt/SourceCode/wireshark/epan/dissectors/packet-frame.c 818 warn V547 Expression 'fi' is always true. /opt/SourceCode/wireshark/epan/dissectors/packet-gsm_sms.c 2692 warn V547 Expression 'length <= (offset - saved_offset)' is always false. /opt/SourceCode/wireshark/epan/dissectors/packet-isup.c 4688 warn V1037 Two or more case-branches perform the same actions. Check lines: 4688, 4697 /opt/SourceCode/wireshark/extcap/androiddump.c 1237 warn V560 A part of conditional expression is always true: data_str. /opt/SourceCode/wireshark/extcap/androiddump.c 1603 warn V547 Expression is always true. /opt/SourceCode/wireshark/ui/qt/models/packet_list_model.cpp 497 warn V560 A part of conditional expression is always true: ok_r1. For the voip_calls.c change, I preferred to initailize along with every other field, rather than set to actual value it gets set to later. For the isobus-vt change, I could not find a spec but followed the pattern from other error bit fields. Bug: 16335 Change-Id: Ie55082222b582f6fff4e8c7a992d863acee6cf15 Reviewed-on: https://code.wireshark.org/review/37160 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-08Qt: Respect user preference to hide packet listTomasz Moń2-6/+6
Instead of hiding whole packet list widget when freezing, hide only the header. This prevents unwanted column resizes while keeping the widget on screen while capture file is loading. Prevent flickering by showing master_split_ only after all widgets are in correct place. Ping-Bug: 16063 Ping-Bug: 16491 Change-Id: I3bb0763c44b23b1e4118003502d4bf3903591f34 Reviewed-on: https://code.wireshark.org/review/37159 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-07ConversationDialog: fix a TCP graph race conditionMartin Kaiser2-4/+23
When the user opens the conversation dialog, selects a tcp conversation and presses the Graph button, the ConversationDialog kicks off these two actions 1.) apply a display filter "tcp.stream eq X" (where X is the number of the stream) 2.) open the tcp stream graph Both actions are asynchronous and, at least on my machines, the graph is opened before the filter is applied. The graph requires that the current packet be part of the selected tcp conversation. If it's not (because the filter isn't applied yet), we get the "Selected packet isn't a TCP segment or is truncated" error message and the graph is not shown. Fix this by enforcing the correct order for the two actions. MainWindow sends the displayFilterSuccess signal when a display filter was applied. Listen to this signal in ConversationDialog and launch the tcp graph when the filter was applied successfully. Change-Id: I63debe2125ba8f0a737ff4882a9fca0a7bcdb0f5 Reviewed-on: https://code.wireshark.org/review/37130 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-06More changes arising from PVS-Studio output.Martin Mathieson1-5/+15
/opt/SourceCode/wireshark/epan/dissectors/packet-ip.c 1556 err V547 Expression 'opt == (1 | 0x00)' is always true. /opt/SourceCode/wireshark/epan/dissectors/packet-ipdc.c 739 warn V547 Expression 'payload_len < 4' is always false. /opt/SourceCode/wireshark/ui/text_import.c 1049 err V547 Expression 'info->offset_type == OFFSET_DEC' is always true. None of these are actual bugfixes. Bug: 16335 Change-Id: I6d0d3bb92c70ea625fc8b559e7a2bc5ba4e29e25 Reviewed-on: https://code.wireshark.org/review/37136 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-06Qt: Stretch last packet list header sectionTomasz Moń3-3/+7
Programatically show the master split widget before elements are added to prevent pending resize events from resizing packet columns to insane widths (in my case orders of magnitude higher than display resolution) Such resize was occuring when loading capture file if configuration file included hidden columns (e.g. 55 defined columns, 8 visible). The resize was not directly visible to user. Resize event call chain included calls to recent_set_column_width() that changed width stored in configuration. Modified configuration column width value would become effective after user added or removed columns. Hide PacketList when freezing and show it when thawing. Do not call setUpdatesEnabled(false) as it leads to widget/preferences columns missynchronization. Clear packet list before freeing frame data. This prevents accessing freed memory in ProtoTree on file close if packet list was in focus and the next widget to get focus is packet details. Ping-Bug: 16063 Bug: 16491 Change-Id: I2c21d928348681af1793b3263815c81ee73d41b0 Reviewed-on: https://code.wireshark.org/review/37029 Petri-Dish: Tomasz Moń <desowin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-05Last batch of changes from PVS-Studio scan.Martin Mathieson1-3/+1
/opt/SourceCode/wireshark/epan/dissectors/packet-flip.c 155 warn V547 Expression 'chksum_hdr_chksum == computed_chksum' is always false. /opt/SourceCode/wireshark/epan/dissectors/packet-zbee-zcl-meas-sensing.c 1295 err V590 Consider inspecting the '(value > 0x0000) || (value > 0xfffd)' expression. The expression is excessive or contains a misprint. /opt/SourceCode/wireshark/ui/qt/lte_rlc_statistics_dialog.cpp 504 warn V668 There is no sense in testing the 'channel_item' pointer against null, as the memory was allocated using the 'new' operator. The exception will be generated in the case of memory allocation error. Bug: 16335 Change-Id: Ief19a82e84bd16df33c453d6cc30db37f1c589ea Reviewed-on: https://code.wireshark.org/review/37150 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-04ui/capture.h: add missing include to fix build with GCC 9.3Aurelien Aptel1-0/+1
ui/capture.h has a function prototype using capture_file struct without it being defined yet. This fails to compile with recent GCC (9.3.1) Bug: 16547 Change-Id: I84f932de2e7ed70f14aa157b9c3b1d1f80b0016f Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/37024 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-03Generate a dummy description if we don't have an interface name.Guy Harris1-2/+5
Just have a display name and description of "(Unknown)" if we have no display name, no description, *and* no interface name. Change-Id: I8403779c17c1e6d96d5ba29941081f560ad5339c Reviewed-on: https://code.wireshark.org/review/37086 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-03Clean up some issues with get_iface_list_string().Guy Harris1-30/+13
Remove an assignment of NULL to a variable when it's in a branch of code where the variable's already known to be NULL. Found by PVS-Studio. Pull get_display_name_for_interface() into the one place it's used. That: allows us to eliminate a test as, inside the loop where it's called, the loop index is what's passed to it, and the loop tests whether it's in range, so the test will never fail; means we just set interface_opts once, for both of the places it's used. Then we fix that code so that it sets interface_opts->descr to a generated descriptive name if it *is* null, rather than if it's *not* null. That should clean up some issues found by 1) PVS-Studio and 2) me. Change-Id: I4188ca8f5c7306477ef11117016691d1c9f0267f Reviewed-on: https://code.wireshark.org/review/37082 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-03voip_calls: Fix leak of GString from unistim handling.Martin Mathieson1-0/+1
/opt/SourceCode/wireshark/ui/voip_calls.c 3786 err V773 The function was exited without releasing the 'g_tmp' pointer. A memory leak is possible. Tested with unistim_call.pcap from SampleCaptures. Bug: 16335 Change-Id: I8518a3e277e8acec15e09ca5f36672b5bdd181fe Reviewed-on: https://code.wireshark.org/review/37028 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-03Some more issues identified by PVS-Studio.Martin Mathieson1-0/+4
/opt/SourceCode/wireshark/epan/dissectors/packet-osc.c 367 err V562 It's odd to compare 0 or 1 with a value of 0. /opt/SourceCode/wireshark/epan/dissectors/packet-rpc.c 960 note V576 Incorrect format. Consider checking the eighth actual argument of the 'proto_tree_add_subtree_format' function. The SIGNED integer type argument is expected. /opt/SourceCode/wireshark/epan/dissectors/packet-rpc.c 980 note V576 Incorrect format. Consider checking the third actual argument of the 'proto_item_append_text' function. The SIGNED integer type argument is expected. /opt/SourceCode/wireshark/epan/dissectors/packet-rpc.c 2473 note V576 Incorrect format. Consider checking the fourth actual argument of the 'col_prepend_fstr' function. The SIGNED integer type argument is expected. /opt/SourceCode/wireshark/epan/dissectors/packet-rpc.c 2482 note V576 Incorrect format. Consider checking the fourth actual argument of the 'col_append_fstr' function. The SIGNED integer type argument is expected. /opt/SourceCode/wireshark/epan/dissectors/packet-rpc.c 2633 note V576 Incorrect format. Consider checking the fourth actual argument of the 'col_append_fstr' function. The SIGNED integer type argument is expected. /opt/SourceCode/wireshark/epan/dissectors/packet-rpc.c 2650 note V576 Incorrect format. Consider checking the fourth actual argument of the 'col_prepend_fstr' function. The SIGNED integer type argument is expected. /opt/SourceCode/wireshark/epan/dissectors/packet-stun.c 565 warn V1051 Consider checking for misprints. It's possible that the 'reported_length' should be checked here. /opt/SourceCode/wireshark/epan/dissectors/packet-umts_fp.c 4126 warn V1051 Consider checking for misprints. It's possible that the 'reported_length' should be checked here. /opt/SourceCode/wireshark/epan/dissectors/packet-umts_fp.c 4942 warn V1051 Consider checking for misprints. It's possible that the 'reported_length' should be checked here. /opt/SourceCode/wireshark/ui/voip_calls.c 1444 err V773 The 'comment' pointer was assigned values twice without releasing the memory. A memory leak is possible. /opt/SourceCode/wireshark/wsutil/filesystem.c 1531 err V773 The function was exited without releasing the 'files' pointer. A memory leak is possible. /opt/SourceCode/wireshark/wsutil/filesystem.c 1717 err V773 The function was exited without releasing the 'files' pointer. A memory leak is possible. Bug: 16335 Change-Id: I8df3ba6d070823dcb43c4152d9156358f701e8dc Reviewed-on: https://code.wireshark.org/review/37069 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-03[Automatic update for 2020-05-03]Gerald Combs11-413/+487
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Iee0627e305ea5b5b9b01c69175a0ea8a52195586 Reviewed-on: https://code.wireshark.org/review/37062 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-05-01Remove some single-SHB assumptions.Guy Harris1-99/+123
Make wtap_file_get_shb() take a section number argument, and update code that called it. In most cases, we convert the code to iterate over sections; in cases where a big code change would be required, we temporarily pass it 0 and mark the code as "needs to be updated for multiple sections". Eliminate cf_read_section_comment(); in calls outside file.c, other code directly calls the libwiretap routines it calls and, inside file.c, we just transplant the code and then fix it not to assume a single SHB. Change-Id: I85e94d0a4fc878e9d937088759be04cb004e019b Reviewed-on: https://code.wireshark.org/review/37000 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-04-30Qt: Allow renaming personal profileRoland Knall2-1/+7
If a personal profile has the same name as a global profile (which is usually the case if it has been copied without changing the name afterwards), there was a bug where renaming the profile was no longer possible. Bug: 16423 Change-Id: Idafd216d007179a4c6221eafc2ff296d277d5b1d Reviewed-on: https://code.wireshark.org/review/36902 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2020-04-29LteMacStatisticsDialog: fix memory leaksMartin Kaiser2-2/+8
Remember the delegates that we use and free them explicitly in the destructor. Change-Id: Iba07c3e9952dc152d94468b6b7c7e2c2a74c1f65 Reviewed-on: https://code.wireshark.org/review/36965 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-29WlanStatisticsDialog: fix memory leaksMartin Kaiser2-2/+8
Remember the delegates that we use and free them explicitly in the destructor. Change-Id: I79698eb6ee4f565efcb3f02ac6239914c6acf3f5 Reviewed-on: https://code.wireshark.org/review/36964 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-28Qt: workaround a C4138 warning generated by MSVC2019Pascal Quantin1-1/+1
MSVC falsely reports a '*/' found outside of comment warning Change-Id: I41366c9760f6b698a1c6a4309cdfa2f9828bb0c2 Reviewed-on: https://code.wireshark.org/review/36961 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-04-27Qt: Fix export of dissectionRoland Knall4-8/+14
Exporting dissected bytes did not consider the selection of packets on Windows, if multiple packets had been selected Bug: 16516 Change-Id: I9d914fe1fed22f842d73caea397a3f37ffc0d523 Reviewed-on: https://code.wireshark.org/review/36958 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-04-26TCPStreamDialog: prevent access to uninitialized memoryMartin Kaiser1-1/+2
If we launch a TCPStreamDialog in a situation where we can't select a corresponding tcp stream, we leave the constructor before graph_ is initialized. Later on, the destructor calls graph_segment_list_free(&graph_). This requires that graph_ was initialized before. Make sure that we initialize graph_ in the constructor, regardless of errors. (There's other aspects of this issue. We shouldn't be able to launch a TCPStreamDialog when we have no tcp stream...) Change-Id: I7b4ddadca8f699d30ec45f0fe6021ae9d36ced53 Reviewed-on: https://code.wireshark.org/review/36935 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-26ProfileTreeView: fix a memory leakMartin Kaiser2-0/+6
In the constructor, we allocate a delegate for the name column and assign it by calling QAbstractItemView::setItemDelegateForColumn(). This does not pass ownership of the delegate to QAbstractItemView, it's still up to us to free the delegate. ASAN warns about this Indirect leak of 48 byte(s) in 1 object(s) allocated from: ... #1 ... in ProfileTreeView::ProfileTreeView(QWidget*) ui/qt/widgets/profile_tree_view.cpp:46:17 #2 ... in Ui_ProfileDialog::setupUi(QDialog*) ui/qt/qtui_autogen/include/ui_profile_dialog.h:67:31 #3 ... in ProfileDialog::ProfileDialog(QWidget*) ui/qt/profile_dialog.cpp:59:13 #4 ... in MainWindow::on_actionEditConfigurationProfiles_triggered() ui/qt/main_window_slots.cpp:2239:36 Add a destructor for ProfileTreeView and free the delegate there. Change-Id: I2a76abb7ec174c91ad15bfac91f2b47bea29f511 Reviewed-on: https://code.wireshark.org/review/36934 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-25Docs+help: Remove "-m".Gerald Combs1-1/+0
Support for the -m (monospace font) flag was removed from Wireshark in 2.3/2.4 in g37252634c4. Remove it from the man page and help output. Change-Id: Idaafeb6cd30d7deea6086a065168c91affd6f0ad Reviewed-on: https://code.wireshark.org/review/36926 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2020-04-24Check the validator in ExtArgText::isValid().Guy Harris1-0/+28
The validator doesn't prevent the input focus from being transferred out of the QLineEdit, and it merely prevents the user from entering a value that's considered "invalid" rather than "not valid but "intermediate"". For QIntValidator(), values that have more digits than the maximum value are "invalid", but values that have the same number of digits but that are larger are just "intermediate". This means the user will be able to send such a value to the extcap module. So we explicitly check the validator in ExtArgText::isValid(), so that 1) we provide visual feedback (at least to people who can detect a red background) for out-of-range values that don't have too many digits and 2) prevent them from being treated as valid and passed to the extcap module. Bug: 16510 Change-Id: Ie5b90cf5dbb57c91744f6a28a71674b65ef21bb6 Reviewed-on: https://code.wireshark.org/review/36914 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net> Reviewed-by: Roland Knall <rknall@gmail.com>
2020-04-22Qt: update import via GUI to match import features using text2pcapAndre Luyer1-6/+18
Update "Import From Hex Dump" via GUI to allow the same timestamp format as supported by the command line tool text2pcap. Added support for: %F Equivalent to %Y-%m-%d (the ISO 8601 date format). %s The number of seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC). While at it changed the following: - Subsecond timestamp dot format (.) is now shown in the timestamp Example Label. - A timestamp format without any format (%) now disables Import button. The field "Timestamp format" in the GUI now accepts exactly the same formatting as the text2pcap's -t time format option. Change-Id: Ie48362f86ed3214288635767d1fc4161599d1907 Reviewed-on: https://code.wireshark.org/review/36417 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-04-21Qt: Fix compilation errorRoland Knall2-3/+1
and also remove unnecessary method Change-Id: If6dfc5ae2f5ddab97926beeaa611372cd487b98a Reviewed-on: https://code.wireshark.org/review/36900 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2020-04-21Qt: Allow folders for filter buttonsRoland Knall2-49/+172
Filter buttons can be sorted into folders, by separating different depths by the parent separator "&&". Context menu for filter buttons work also in submenus, and the depth of submenus is only limited by the character limit for the label Bug: 16498 Change-Id: I9c784a36e8c46eede11f679a4c1ac830213de7ce Reviewed-on: https://code.wireshark.org/review/36885 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2020-04-20wireshark_zip_helper(Qt): fix no previous prototype for functionAlexis La Goutte1-1/+1
wireshark_zip_helper.cpp:153:15: warning: no previous prototype for function 'qDateToDosDate' [-Wmissing-prototypes] Change-Id: Ic9ffb4219321347c077e08931d6fe51bc1702a29 Reviewed-on: https://code.wireshark.org/review/36889 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-04-19Qt: Fix filling bluetooth device addressSignat Sibirskiy2-7/+8
When filling bd_addr from tap_device->bd_addr[], only the first octet was used Change-Id: I3cb281d96126d77e5e6862e44704c7f9ab34cb78 Reviewed-on: https://code.wireshark.org/review/36152 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-19ColumnPreferencesFrame: fix memory leaksMartin Kaiser2-1/+6
Delete model and proxy model in the destructor. QAbstractItemView::setItemDelegate() does not take ownership of the delegate that is passed to it. We have to store it ourselves and free it. Change-Id: I5d08d16e94a162d2a25450aec05ef672d4eaf528 Reviewed-on: https://code.wireshark.org/review/36878 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-19[Automatic update for 2020-04-19]Gerald Combs10-119/+99
Update manuf, services enterprise numbers, translations, and other items. Change-Id: If24a5f418d53424553a303957eea0133b9d718b2 Reviewed-on: https://code.wireshark.org/review/36881 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-04-17Qt: Remove unnecessary private variableRoland Knall2-2/+1
Variable is only needed locally, so it can be moved to the local entity. Change-Id: I790c1616e27d5e85b3dabbdc327e3f54fc663d25 Reviewed-on: https://code.wireshark.org/review/36863 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-15FrameInformation: fix a crash in the destructorMartin Kaiser2-11/+17
It's possible to create a FrameInformation object that's not backed by any frame data. In this case, fi_ is NULL and loadFrameTree() does not run a dissection. However, we run epan_dissect_cleanup() unconditionally in the destructor, even if edt_ is uninitialized. This causes a crash when wireshark is closed. Convert edt_ into a pointer. Run the cleanup only if we ran the dissection before. The issue can be reproduced by applying a display filter that makes the list of the packets smaller than the packet list window. Right click onto an "empty" part of the packet list and select "Mark/Unmark Frame". Exiting wireshark at this point causes a segmentation fault Thread 1 "wireshark" received signal SIGSEGV, Segmentation fault. tvb_free_chain (tvb=0xf000e000d000c) at ../epan/tvbuff.c:124 124 tvb_free_internal(tvb); (gdb) bt #0 tvb_free_chain (tvb=0xf000e000d000c) at ../epan/tvbuff.c:124 #1 0x00007ffff430491e in epan_dissect_cleanup (edt=0x555558075b48) at ../epan/epan.c:648 #2 0x00005555558fa5a6 in FrameInformation::~FrameInformation (this=0x555558075b20, __in_chrg=<optimized out>) at ../ui/qt/utils/frame_information.cpp:57 #3 0x00005555558fa5e9 in FrameInformation::~FrameInformation (this=0x555558075b20, __in_chrg=<optimized out>) at ../ui/qt/utils/frame_information.cpp:55 ... #12 0x00005555559a74f7 in PacketList::~PacketList (this=0x55555602e930, __in_chrg=<optimized out>) at /usr/include/x86_64-linux-gnu/qt5/QtCore/qstring.h:1130 Change-Id: I347dd4901b4e08c37008ff25ac1f20a67555d9fd Reviewed-on: https://code.wireshark.org/review/36825 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-14Qt: Fix memory leak in TCP Stream DialogStig Bjørlykke3-74/+37
Do not copy addresses at when dialog opens, they will be initialized in tapall_tcpip_packet(). Do not clear addresses when switching stream, they will be properly removed in graph_segment_list_free(). Correctly free addresses in graph_segment_list_free() which is called when switching stream and when closing the dialog. Free copied addresses when switching direction (address swap). Remove redundant and unused code. Change-Id: I4328aa4df333f59c587f841b74a24dc71d329079 Reviewed-on: https://code.wireshark.org/review/36840 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Tomasz Moń <desowin@gmail.com>
2020-04-13Qt: Fix a memory leak in ByteViewTabStig Bjørlykke1-2/+6
FieldInformation::parentField() allocated a new FieldInformation, so ensure to delete this when done. Change-Id: Id0f538cc696551ec47169103be823eb1e55d1777 Reviewed-on: https://code.wireshark.org/review/36823 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2020-04-13PacketList: ignoreFrame: remove write-only variableMartin Kaiser1-2/+0
Like in markFrame, the integer list of selected rows is not used in ignoreFrame. Remove it. Change-Id: Ic2bf4b1d2d330767370a2e831e321e285cb00e91 Reviewed-on: https://code.wireshark.org/review/36805 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13PacketList: markFrame: remove write-only variableMartin Kaiser1-2/+0
The "rows" variable is populated with the indices of all selected rows. It seems that rows is never read and can be removed. (In parallel, there's QModelIndexList frames. This list is used when it comes to actually marking the selected packets.) Change-Id: If2b97a2f5d87fe24717b9ad56444e2a779e0b3fc Reviewed-on: https://code.wireshark.org/review/36804 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13Qt: don't use a widget if not set.Dario Lombardo1-4/+2
Bug: 16489 Change-Id: I9585120fb07f3c41ac2ddc7fb9eeb9b17542f5e8 Reviewed-on: https://code.wireshark.org/review/36789 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-04-06Qt: fix endpoint map file creation and presentationJaap Keuter1-8/+7
At least with Qt 5.12 on Debian/testing the following needs to be changed: - The temporary file name created for the endpoint map file needs to be retrieved at least once when the file is open to be available later on. - The temporary endpoint map file needs to remain on temporary storage because the external presentation process (web browser) needs to have access to it when it starts (asynchronously) and for as long as it needs. Change-Id: I554110a5a3ffa48b44575b1cb45f5971baac5e9c Reviewed-on: https://code.wireshark.org/review/36599 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-05[Automatic update for 2020-04-05]Gerald Combs11-46/+242
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Iceb3f6c0575ae29b6991023288177a633eaf050a Reviewed-on: https://code.wireshark.org/review/36709 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-04-02Remove duplicate status messages.Gerald Combs1-41/+39
Adding back progress titles in g3069129fe5 revealed the fact that we had duplicate messages in the Qt UI and in file.c. Remove the ones in file.c in favor of the Qt UI, since the latter are translated. Change-Id: I5ff8f1bd34e963e9e66c01420ad8c5fe9c2f0caa Reviewed-on: https://code.wireshark.org/review/36646 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-01Handle -k better on platforms that don't support it.Guy Harris1-1/+1
Have ws80211_init() return an indication that channel setting isn't supported on those platforms. In dumpcap, try to set up ws80211 before checking the channel argument and, if it fails, report the failure, rather than failing because the "convert channel name to channel code" routine fails. See https://ask.wireshark.org/question/15535/dumpcap-k-is-not-accepting-channel-type-values/ for an example of confusion caused by the previous behavior. Change-Id: I303f560704700bbcd4f0ecea041f8632744212f3 Reviewed-on: https://code.wireshark.org/review/36659 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-04-01QT/UI: Fix shortcutUli Heilmeier1-2/+2
Shortcut should be in text and not in tooltip Bug: 16472 Change-Id: I2139eab83dfbca51126a555476948373fee15237 Reviewed-on: https://code.wireshark.org/review/36651 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 13:36:35 +0000