Commit Graph

2610 Commits

Author SHA1 Message Date
Guy Harris f8c870eee2 Throw in a cast to squelch a compiler warning.
MSVC warns that comparing a gboolean (which is a typedef for int) to a
bool is unsafe; convert the gboolean to a bool (the post-C++11 draft C++
standard I have says that the conversion from integral to bool does
pretty much what you'd expect - zero goes to false, non-zero goes to
true - and is exactly what we want).

Change-Id: Ia7d7b62baf87ca3a29da5140f68c2c5b38b2d6de
Reviewed-on: https://code.wireshark.org/review/20787
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29 16:45:58 +00:00
Peter Wu 601fe5e351 Qt: propagate selection from main screen to dialog
Ensure that the selection in main screen is updated on refreshing
interfaces (InterfaceFrame::interfaceListChanged). Add additional
patches to ensure that selection changes from the main screen propagate
to the dialog and be careful to avoid infinite recursions.

Life of a signal for InterfaceFrame:

    ui->interfaceTree->selectionModel emits selectionChanged
    -> slot InterfaceFrame::interfaceTreeSelectionChanged
      -> emits InterfaceFrame::itemSelectionChanged
        -> slot MainWelcome::interfaceSelected
           -> emits MainWelcome::interfacesChanged
              -> slot CaptureInterfacesDialog::interfaceSelected
                 (updats dialog selection)

Life of a signal for CaptureInterfacesDialog:

    ui->interfaceTree emits itemSelectionChanged
    -> slot CaptureInterfacesDialog::interfaceSelected
       (emission of next signal because sender is ui->interfaceTree)
       -> emits CaptureInterfacesDialog::interfacesChanged
          -> slot InterfaceFrame::updateSelectedInterfaces
             (updates main screen selection)

This should probably be updated to model/view with shared selection
model in the future.

Change-Id: Ibb32c201a92bd2f1310523b3e6e63b03209c9ce4
Reviewed-on: https://code.wireshark.org/review/20487
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-29 15:16:56 +00:00
Michael Mann b56bbb493a Fix "warning C6246: Local declaration hides declaration of the same name in outer scope" warnings
Change-Id: I98edc076fdab40ef1fd05313168011f58e13a4d6
Reviewed-on: https://code.wireshark.org/review/20773
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-29 02:38:29 +00:00
Alexis La Goutte 172107521b voip_calls_infO_model(.h): fix extra ‘;’ [-Wpedantic]
Change-Id: I2f131999cd0337d0d65d52f303c8ab9ca6bda39a
Reviewed-on: https://code.wireshark.org/review/20757
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-28 13:57:12 +00:00
Peter Wu 721182b09b Qt: fix closing editor in capture interfaces dialog
Whenever (every second) the points list is updated, a dataChanged signal
is emitted and Qt decides to close all editors. Workaround this issue by
disabling the dataChanged signal. (Alternatively, we could change the
list into a pointer-to-list again.)

Change-Id: Ie06d118d011a72f5be5608c2324ca2715a3f97c7
Fixes: v2.3.0rc0-2014-gf8dc2346df ("Qt: fix memleak of PointList in interface statistics")
Reviewed-on: https://code.wireshark.org/review/20530
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-28 05:09:39 +00:00
Pascal Quantin 4cc0d1e728 Qt: the maximum packet size is WTAP_MAX_PACKET_SIZE, not 65535
Also ensure that the update of sparkline does not lose focus of the
spinbox currently edited.

Change-Id: Icf7dd180fe3cb1d8bfab9017f923bf38e6210554
Reviewed-on: https://code.wireshark.org/review/20749
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-28 01:35:54 +00:00
Pascal Quantin cea97f225a Qt: fix capture statistics display in status bar
Broken in g414c132

Bug: 13524
Change-Id: I4d579170f925749aa9e7a6015ff17dee08d6e445
Reviewed-on: https://code.wireshark.org/review/20750
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-03-27 19:23:45 +00:00
Michael Mann f5ed8a4306 Fix "warning C6246: Local declaration hides declaration of the same name in outer scope" warnings
Change-Id: I0dbf8d0236b163da568a173ccedc3072bd039caa
Reviewed-on: https://code.wireshark.org/review/20739
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27 15:23:34 +00:00
Michael Mann 520cfcf53b bluetooth_device_dialog.cpp: warning C6246: Local declaration of 'item' hides declaration of the same name in outer scope
Change-Id: If6d2cf5d193b45d972534a3064fea7d290eac7f4
Reviewed-on: https://code.wireshark.org/review/20726
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-27 03:14:02 +00:00
Gerald Combs 2d31c2a93d [Automatic update for 2017-03-26]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I284e7960d0ad30e715a9afc42e4248f2a19f8fa7
Reviewed-on: https://code.wireshark.org/review/20716
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-03-26 15:13:47 +00:00
Peter Wu 370f3b358c Qt: add cache proxy model for Voip Calls dialog
When a capture file is reloaded, the information stored in
VoipCallsInfoModel is invalidated. Add another cache layer to fix this:

    VoipCallsInfoModel          wraps around raw data (invalid on close)
    CacheProxyModel             NEW: use prev. data or cache on close
    VoipCallsInfoSortedModel    provided sorting, etc.
    VoipCallsDialog             actual user of model (callTreeView)

This also fixes a UAF after a file was closed, and when a call is
selected (that got worse with the last model/view patch and is "fixed"
in this patch with the caching layer. Note that the Flow sequence and
Play Streams dialog are not that useful when the file is closed).

Change-Id: Ib4daff9dc01a54863fe1d943bdbdb876418924ee
Reviewed-on: https://code.wireshark.org/review/20574
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-24 23:02:43 +00:00
Peter Wu b4bc6c72c7 Qt: refactor Voip Calls Dialog into Model/View
Functional improvements:

 - "Time of day" option is now propagated to the CSV/YAML export.
 - The sorting order is preserved in the CSV/YAML export.

Other changes:

 - Convert column name identifiers to enum.
 - CSV output will now always be quoted (previously numbers like packet
   count were not quoted, but since CSV has no numeric type it should
   be OK to add quotes). Side-effect of model design decision.
 - Instead of clearing the widgets and re-adding all calls, now it will
   add new calls to the model. Not tested with a live capture, if the
   column data can change, maybe a dataChanged signal is needed.

Due to this patch, it should be easier to add a filter for finding calls
easier (e.g. by From, IP, etc.).

Note: extra QList is used in the model to ensure a O(1) lookup of calls
(rather than O(n) for GQueue).

Change-Id: Ie08462aae038d9c3daf1cc7a152b948724689017
Reviewed-on: https://code.wireshark.org/review/20084
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-24 23:02:30 +00:00
Joerg Mayer ceeb757cd3 Remove the last HAVE_PCAP_REMOTE inside HAVE_PCAP_REMOTE for this file.
Change-Id: I8710c235ae5377c2064097b1d7163c4cb3544fd8
Reviewed-on: https://code.wireshark.org/review/20697
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-03-24 13:11:46 +00:00
Joerg Mayer 383ba15d02 Clean up updateRemoteInterfaceList a bit more.
Add an #if-0'ed add_interface_to_remote_list because it is present in its
gtk pendant insert_new_rows in capture_dlg.c

Change-Id: I90e8f9eaafd3d3ca31140ec8bcd6a2eeb7c849ca
Reviewed-on: https://code.wireshark.org/review/20688
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-03-23 23:30:19 +00:00
Joerg Mayer cbea4c02c4 Split interface update code into its own routine
Change-Id: I568a0785978227924cc6c3b7e9f86f39fa777411
Reviewed-on: https://code.wireshark.org/review/20687
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-03-23 18:53:47 +00:00
Erik de Jong 9e35c0bc8b Fix QT UI bugs in RTP dialogs
- RTP analysis and player dialogs are modal whereas they were not modal in GTK
UI
Only fixed calling up the RTP analysis window being modal when called from the
RTP streams dialog as it is modeless when called from the menu in the main
window with a stream packet selected.

- Action 'Next problem packet' triggers an infinite loop when there are no
'problem packets' and first packet is selected when calling the action.

- Crosshairs not implemented in RTP player/crosshairs context menu item not
working.
Context menu item commented out.

bug: 13500
Change-Id: I0ba954f895b85605462c316e4426280ec4d437b2
Reviewed-on: https://code.wireshark.org/review/20660
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-23 11:53:03 +00:00
Alexis La Goutte 4db2d40ea9 response_time_delay_dialog (Qt): fix typo reponse -> response
Change-Id: Ib29cca71a4ffe4e44f341d9de5e3da603c7b3f15
Reviewed-on: https://code.wireshark.org/review/20627
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-19 16:50:08 +00:00
Gerald Combs 0bcd255a5b [Automatic update for 2017-03-19]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I5d2807ce653df495722663def31164e2342b0d89
Reviewed-on: https://code.wireshark.org/review/20622
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-03-19 15:10:16 +00:00
Joerg Mayer 2e76b58840 Fix warning turning error:
/home/jmayer/work/wireshark/git/ui/qt/manage_interfaces_dialog.cpp:273:33: error: variable ‘link_type_name’ set but not used [-Werror=unused-but-set-variable]
By commenting out all lines using this variable for now.

Change-Id: I8f074b24f86ee2063fc545cabd99d446b31a06ec
Reviewed-on: https://code.wireshark.org/review/20616
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-03-19 12:04:35 +00:00
Stig Bjørlykke 795b459443 Qt: Pluralize packet count in Size string
Change-Id: Ifb23f4d558aa30df4ec436e42a4e23b23c2af110
Reviewed-on: https://code.wireshark.org/review/20566
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-03-17 07:19:17 +00:00
Stig Bjørlykke f190a92bc2 Qt: Disable "Show hidden interfaces"
Disable the "Show hidden interface" option until bug 13354 is fixed
because it's not possible to capture from hidden interfaces yet.

Ping-Bug: 13354
Change-Id: I428c2698485f0c7c2d9a8ab8408d7129af5fecf1
Reviewed-on: https://code.wireshark.org/review/20528
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-03-15 08:44:12 +00:00
Stig Bjørlykke 5d217530a1 Qt: Use em dash when hide the "Show" checkbox
Match the style used in "Capture Interfaces" table when elements
are N/A by using the em dash.  This item should also be disabled
using QPalette::Disabled to get a even better match.

Change-Id: I127ce309318df2c36515996df8584d1e4ce690c0
Reviewed-on: https://code.wireshark.org/review/20527
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-03-13 09:37:15 +00:00
Peter Wu e1d51475b5 Qt: hide the "Show" checkbox for default devices
When marking a previously hidden device as default (e.g. via wireshark
-ocapture.device:eth0), an unchecked checkbox is visible. This is just
confusing, just hide the checkbox completely.

Change-Id: I3f85cfcb659c351c72237dced52f0684733188c4
Reviewed-on: https://code.wireshark.org/review/20478
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-12 18:10:25 +00:00
Gerald Combs 5f789e3fe3 [Automatic update for 2017-03-12]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I5718e7c7df8061f81eb01973f504ebbb0cfe1e44
Reviewed-on: https://code.wireshark.org/review/20511
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-03-12 15:12:38 +00:00
Stig Bjørlykke b0335359e5 Qt: Give discard button focus (but not as default)
Set focus to the discard button in the "Unsaved packet" and
"Unsaved comments" dialogs to enable spacebar for discard and
enter for save.

Bug: 13363
Change-Id: I576b02c4e3f0964aef56a0f1c06ed57c6ba683bf
Reviewed-on: https://code.wireshark.org/review/20485
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-03-12 07:15:19 +00:00
Erik de Jong e003908423 RTP streams dialog: Fix find reverse button
Fix find reverse button

Bug: 13462
Change-Id: I6e19fa38cd333285c9ca3cf01e4c06ff8de56b2a
Reviewed-on: https://code.wireshark.org/review/20462
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-09 23:15:28 +00:00
Stig Bjørlykke e781fdd180 Qt: Fix heap-use-after-free when deleting IO graph
Deleting a IO graph item while editing a field will use the IOGraph
object so ensure we delete in correct order to avoid heap-use-after-free.

Bug: 13234
Change-Id: I6d0de21684f842fbd67c9b38fc6b75b81aec5518
Reviewed-on: https://code.wireshark.org/review/20456
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-03-09 09:22:45 +00:00
Michael Mann 56aaa5b705 Switch conversations to use wmem_tree_t instead of (sorted) GSList.
Change-Id: Ifaf25ca5a7974f1d398ceebbb4c6733d4d3e001a
Reviewed-on: https://code.wireshark.org/review/20006
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-06 11:41:54 +00:00
Gerald Combs 509488b3bd [Automatic update for 2017-03-05]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I074b964d75082adc6ab216514c36abf3d54c6a0a
Reviewed-on: https://code.wireshark.org/review/20395
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-03-05 17:03:16 +00:00
Stig Bjørlykke cf1d07c8e3 Qt: Apply selected bookmark display filter
When selecting a display filter from the bookmark list this filter
should be applied, because that's the most common action for a user.

Holding down the the Alt key will only prepare the filter.

Change-Id: I567ee8a2a70a3de07fea33fa5763d9efba591de3
Reviewed-on: https://code.wireshark.org/review/20317
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-04 00:57:09 +00:00
Roland Knall 807fe8ed99 pluginIF: Allow en-/disable of elements
Allow the enable/disable of an element

Change-Id: I9652e8d74b261ba259cebfba53e7bc7ef560d347
Reviewed-on: https://code.wireshark.org/review/20370
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-04 00:56:51 +00:00
Stig Bjørlykke f22964da50 Qt: Fix goto next/prev packet toolbar buttons
Use bitwise AND to check if a modifier bit is set.

Also changed from MetaModifier to AltModifier to match the comment
and the modifier key used in "Next/Previous Packet in History".

Change-Id: I89072a1dfdd14a2beb7344a672cbc18a3ace8924
Reviewed-on: https://code.wireshark.org/review/20359
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-03-03 19:35:28 +00:00
Peter Wu a539036339 Qt: reduce minimum window size requirement
Strip some padding from the main welcome screen and lower the minimum
width to allow the window to be shrinked. Even when a capture file was
open, the minimum dimensions from the main welcome screen would apply.

The minimum dimensions on Arch Linux with Qt 5.8.0-5 and Plasma 5.9.2
(with the default Breeze theme) for a window have changes as follows:
 - main screen/pcap loaded: 746x626 -> 702x590
 - with search bar opened:  826x658 -> 826x622
(These numbers exclude 35x10 window decoration.)

Change-Id: Iccc43ee55803abb8105c0d9664368aab09e8cfcf
Reviewed-on: https://code.wireshark.org/review/20343
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-03 16:18:56 +00:00
Roland Knall 85aa48cef2 pluginIf: Add/Remove single entries from selector
Allow to add and remove single items from a selector list and also
fixing the selection of items in a selector list

Change-Id: I0c69ea97db6ca1a6932939f0df9049c6fb720f77
Reviewed-on: https://code.wireshark.org/review/20363
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-03 15:13:13 +00:00
Gerald Combs 8e76cfbf54 Qt: Add selection history navigation.
Add the ability to move back and forth in the packet selection history
similar to GTK+. Update the documentation accordingly.

Change-Id: If1fdc1e59b240c0588c292dc0f7f0a5f083c30e1
Reviewed-on: https://code.wireshark.org/review/20320
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-03 05:02:14 +00:00
Peter Wu 8f35d6ff90 Qt: allow Packet Bytes view to be shrinked
Even if a packet has only one or two lines for the byte view, Qt
autoresizing insists to require a minimum of 5.5 lines (or 7.5 lines for
packets without multiple data sources). Remove this artificial
requirement and allow the packet bytes view to be resized to show
nothing (except for possible data sources tabs).

This makes it easier to fit more packets and details for screenshots.

Change-Id: I3ea997b9effa8292b396dc2ceb2ab1c35cead410
Reviewed-on: https://code.wireshark.org/review/20342
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-03 04:58:09 +00:00
Stig Bjørlykke 26e62dfad0 Qt: Fix -Wshorten-64-to-32 warnings
Fix some warnings when building with -Wshorten-64-to-32 flag for
C++ code.

Fixes for warnings from QList, QTimer and QVector has been pushed
upstream, so some time we may be able to enable this flag for C++.

Change-Id: Iae7457f9afc469c63f3edbe23dbf272b5c6c9e5e
Reviewed-on: https://code.wireshark.org/review/20310
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-28 11:41:32 +00:00
Stig Bjørlykke 8b8a3b8d1a Qt: Avoid null pointer dereference (CID 1401573)
Change-Id: I638174a05c6275baf54e000d941f47f8ba572169
Reviewed-on: https://code.wireshark.org/review/20302
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-27 19:42:57 +00:00
Joerg Mayer 257359854a Fix error: extra ';' after member function definition [-Werror,-Wextra-semi]
Change-Id: I53aee8f259c3e855bf71160bbfd1d79254a5cdf4
Reviewed-on: https://code.wireshark.org/review/20290
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-02-26 19:40:39 +00:00
Gerald Combs dcfc288130 Qt: Enable/disable Capture Interfaces buttons consistently.
The "Compile BPFs" and "Start" buttons need to be enabled and disabled
at the same time and according to the same criteria. Make sure we do so.

Change-Id: I708886564dcf569cd71f936119195209ef6dcbd5
Reviewed-on: https://code.wireshark.org/review/20265
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-26 17:51:33 +00:00
Gerald Combs d8e16b79da [Automatic update for 2017-02-26]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I3094033ff26c1d8da5abcc22a25e4075f6bc087f
Reviewed-on: https://code.wireshark.org/review/20285
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-26 16:11:56 +00:00
Alexis La Goutte b3539fdf86 apply_line_edit(.h): fix extra ';' inside a class [-Wextra-semi] (clang) / extra ‘;’ [-Wpedantic] (gcc)
Change-Id: Ie75da8de308a5fe3a063cf929d0bb2ab739ad96f
Reviewed-on: https://code.wireshark.org/review/20276
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26 15:10:32 +00:00
Alexis La Goutte eff417364c preferences_dialog (Qt): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]
Change-Id: I9781fea02e7578f7d940c050a6f405bfe4b347dd
Reviewed-on: https://code.wireshark.org/review/20278
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26 15:09:25 +00:00
Roland Knall 2cfac2c681 pluginif: Adapt code for Qt4.8
Change-Id: I663bb39cc6b186228bee01946c705eb6e12a8a0a
Reviewed-on: https://code.wireshark.org/review/20280
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-26 13:12:15 +00:00
Kim Bäckström f3d52cb534 Bugfix for extcap fileselect functionality, start button in extcap options dialog wouldn't
get enabled if the user had selected a file (and mustexist=true wasn't specified).

This commit also contains minor fixes to doc/README.extcap, it's now more aligned to the
actual implementation.

Added example usage of fileselect, radio and multiselect to doc/extcap_example.py.

Change-Id: Ibfe40a35a26f49322fbe64c0594506a2163f7e20
Reviewed-on: https://code.wireshark.org/review/20274
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-26 09:22:25 +00:00
Peter Wu d464d9cb5c Revert "Qt: call cleanup from destructor in WiresharkApplication."
Calling cleanup() twice (via exit signal and via destructor) results in a
use-after-free on exit via write_profile_recent.

This reverts commit e47f9fbeb0.

Change-Id: Ic3ca0742c03a345fd8cb7f3f782942872a3057f5
Reviewed-on: https://code.wireshark.org/review/20273
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-25 23:08:45 +00:00
Gerald Combs faaff7d180 Replace "n/a" with an em dash.
Replace occurrences of "n/a" with an em dash. It matches what we do
elsewhere and reduces the need for translation.

Change-Id: Ib5b63be765b7da9ae3e66ab19bd25cb497fd722d
Reviewed-on: https://code.wireshark.org/review/20267
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-25 06:32:17 +00:00
Stig Bjørlykke beea6736ab Qt: Code cleanup
Remove whitespace to match coding style used in file.

Change-Id: I4c1649aa02087cd39b2f516db6e40749899c5125
Reviewed-on: https://code.wireshark.org/review/20260
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-24 09:11:47 +00:00
Roland Knall 321386e9f4 PluginIF: AdditionalToolbar
Creates an interface for plugins and other parts of the code, to
add a new toolbar to the system and have various widget types interact
with this toolbar.

All toolbars added via this interface, will be added to an additional
submenu called "Additional Toolbars" within Wireshark.

Also a demo plugin is being provided, demonstrating various features
of the toolbar, including updating the gui elements. It also demonstrates
how to update toolbar items.

Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3
Reviewed-on: https://code.wireshark.org/review/19803
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-24 08:12:46 +00:00
Dario Lombardo e47f9fbeb0 Qt: call cleanup from destructor in WiresharkApplication.
This allow the correct cleanup routine to be called both when user
exits and when application exits by itself (like in WIRESHARK_QUIT_AFTER_CAPTURE=1).

Change-Id: I88e468bde029b4247ac90616f3aba0065a2b8e00
Reviewed-on: https://code.wireshark.org/review/20210
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-22 13:58:10 +00:00
Dario Lombardo f977dddb10 Qt: free memory used by rtd_tables.
Change-Id: Ibb6e3327127840fd01c5410c145ccec07efa4c73
Reviewed-on: https://code.wireshark.org/review/20209
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-22 13:58:04 +00:00
Roland Knall 6dce310305 extcap: Reduce number of scans and storage
Reduce the number of storage arrays and the number
of necessary loads. Also include cleaner methods for
reloading the interfaces and cleanly reload if asked by
the overall system

Change-Id: I529465ec2593d40c955c6cdeaf3a85e3021c0596
Reviewed-on: https://code.wireshark.org/review/20230
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-22 13:40:33 +00:00
Stig Bjørlykke a4d7793b4c Qt: Avoid flicker in filter expressions toolbar
Calling adjustSize() on the display filter toolbar causes flicker
in the filter expression toolbar when switching between profiles
without buttons and in some cases changing to a profile without buttons.

Only calling adjustSize() if adding buttons should be fine to avoid
this issues, even if they may be caused by something else.

Change-Id: I8cca84a51dbbc8244dc4342ac0466e35884c294d
Reviewed-on: https://code.wireshark.org/review/20222
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-22 05:37:49 +00:00
Stig Bjørlykke 6814cf4fa7 Qt: Handle cancel in import coloring rules
Change-Id: I450cfc41d19c0dcb4aa59c0515d8d0834cfee60b
Reviewed-on: https://code.wireshark.org/review/20223
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-21 14:20:52 +00:00
Guy Harris 2798f7c9c4 Have all the remote host list routines' names begin with recent_.
Some did, some didn't - make it consistent.

Clean up some header comments while we're at it.

Change-Id: I978c84167cce3c8f1c0280898aa4d0b60958325b
Reviewed-on: https://code.wireshark.org/review/20218
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-21 02:46:26 +00:00
Guy Harris 72e2c3acfa Have a routine to iterate over the remote host list.
Have a routine that iterates over the remote host list if it exists.

Remove the routine to get the remote host list; all accesses should be
through functions in ui/remote.c.

Change-Id: Idddceba76b50ce85ef8557e132d7552191c2fddc
Reviewed-on: https://code.wireshark.org/review/20217
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-21 02:31:27 +00:00
Joerg Mayer b82f7c5b7d Calling g_hash_table_size with a NULL argument causes a GLib-CRITICAL.
This fixes the first issue appearing in the log of

Bug: 13418
Change-Id: I2fe68a06dd4a19be8300ec34be65a8dc47d0f8b3
Reviewed-on: https://code.wireshark.org/review/20214
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-02-20 23:06:10 +00:00
Gerald Combs d84577fe1a Yell at the user less.
Our user-facing messages should have a helpful (or at the very least
neutral) tone. In English, exclamation points are neither. Replace a
bunch of them with periods.

Change-Id: I29c3b2f84c25e06aae5b559860224559053a0378
Reviewed-on: https://code.wireshark.org/review/20189
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-20 16:53:17 +00:00
Stig Bjørlykke 6c654861d9 Qt: Mystery pixel issue is solved
The mystery pixel issue has probably been mysteriously solved earlier
because the adjustments does not work as expected now.

This fixes an issue where one of the panes increases with 1 pixel at
startup and when changing profile using layout type 3, 4, 5 and 6
(selection number 1, 4, 5 and 6 in “Preferences -> Appearance -> Layout”).

Change-Id: Iab36fa5303dc8628b21e5cf920e7c70a7167d76e
Reviewed-on: https://code.wireshark.org/review/20188
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-20 05:54:19 +00:00
Stig Bjørlykke b3f435ef54 Qt: Add "Reset Layout"
Add menu item "Reset Layout" to manually reset panes to equal sizes.

Change-Id: I1efbf655462e25053062e03f8038dc20f9f555c0
Reviewed-on: https://code.wireshark.org/review/20173
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-20 05:53:44 +00:00
Gerald Combs ef20188bf6 [Automatic update for 2017-02-19]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I2796bfe2a186adfe14adaf09c0fef65e765c474a
Reviewed-on: https://code.wireshark.org/review/20183
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-19 16:12:11 +00:00
Michael Mann 897c750127 Clean up some memory leaks in wsutil/filesystem.c
The fixes involve functions always returning a string that needs to be
freed by the caller.  That way the static string pointers within the functions
don't end up leaking at program end.

Change-Id: I35a8dc37536c2927d88f33217887f62efafcc8ca
Reviewed-on: https://code.wireshark.org/review/20175
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-19 01:27:14 +00:00
Stig Bjørlykke 14e19128dc Qt: Disable pane menu items if not used in layout
If a pane is not used in the layout it should not be possible to show
and hide this from the menu, as this may give unexpected results.

Change-Id: I335168e66e1dffc89992cad480dd7daaea7e9d59
Reviewed-on: https://code.wireshark.org/review/20140
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-16 20:53:22 +00:00
Stig Bjørlykke 384c26622b Qt: Preserve pane sizes when layout content changed
Preserve pane sizes when rearranging layout content in the
preferences dialog.

Change-Id: I2af2a60424a7bf94f1f92e7c63e6a1823985b60d
Reviewed-on: https://code.wireshark.org/review/20145
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-16 20:53:00 +00:00
Gerald Combs a5a8fce06e Qt: Warn the user about DBAR 1.8 on Windows.
At startup, dig through the registry looking for shell extensions. If
any of them match known Dell Backup and Recovery DLL names and the DLL
version matches 1.8.*.*, show the user a warning dialog.

This is a bit extreme but I'm not sure what else to do. Dell is a popular
computer manufacturer and bug reports keep trickling in.

Change-Id: I6d1bd6c56850279356570154d231b07facb30cff
Bug: 12036
Ping-bug: 12701
Ping-bug: 13414
Reviewed-on: https://code.wireshark.org/review/16861
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-16 16:58:12 +00:00
Stig Bjørlykke e2cef4cbbd Qt: Improved pane size auto detect
Split panes in exactly equal sizes.

Change-Id: I4b984931e860160791497a299011489aa26ad4ef
Reviewed-on: https://code.wireshark.org/review/20139
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-16 12:57:55 +00:00
Stig Bjørlykke 34b983666d Qt: Reset pane sizes when layout type changed
Reset pane sizes when layout type has changed in the preferences
dialog to avoid “random” sizes.

Change-Id: I9ca830572e3d21cb4227de3d5d05449b759aec7e
Reviewed-on: https://code.wireshark.org/review/20122
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16 05:15:05 +00:00
Stig Bjørlykke a98eb3c312 Qt: Auto detect pane size when configured zero
The recent file configuration for pane sizes states that
“pane size of zero will auto detect”, so ensure we do this in
all cases where the settings may be zero.

This affects initial startup, Default profile reset and new profiles.

Change-Id: I1430ec1a83b7fb294b92837476f2bf9472384e45
Reviewed-on: https://code.wireshark.org/review/20121
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16 05:13:50 +00:00
Stig Bjørlykke d718b1d7e1 Qt: Preserve pane sizes when changing profile
When changing between profiles having certain different layout types
the size of the last pane was calculated wrong.

This involves switching between this layout types:

   2 -> 3   2 -> 5   3 -> 1   3 -> 2   3 -> 4   3 -> 5
   4 -> 3   4 -> 5   5 -> 2   5 -> 3   5 -> 4   5 -> 6

Change-Id: I6ee3ed92c4c639b720587c0771be0a242e5a8793
Reviewed-on: https://code.wireshark.org/review/20116
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16 05:08:45 +00:00
Stig Bjørlykke 78ce70e908 Qt: Indicate profile created from system provided
Indicate when a profile is created from a system provided profile.

Change-Id: Iaabe5a2dbf17c7baa14e888dfab5f2aeadaedb67
Reviewed-on: https://code.wireshark.org/review/20107
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-15 07:05:41 +00:00
Stig Bjørlykke c01cdd4e47 Qt: Reset Default profile support
Add support for resetting the Default profile by deleting it in
the Profile Dialog.  All profile files will be deleted and all
other files will be kept.

Change-Id: I795a6db3ee7b2c29e7aba461183e6cc411798b75
Reviewed-on: https://code.wireshark.org/review/20097
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-14 18:15:12 +00:00
Gerald Combs 6550b10422 [Automatic update for 2017-02-12]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I84ecfdd35a8f2935f950f72c01a69b70a6a80c07
Reviewed-on: https://code.wireshark.org/review/20070
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-12 16:12:32 +00:00
Dario Lombardo 9ced31a2d7 filter_list: add cleanup function and call it on exit.
Change-Id: I51d8074cc5a63d4fd3af8852df120d6b4163217f
Reviewed-on: https://code.wireshark.org/review/19942
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10 13:34:56 +00:00
Michael Mann b54c438011 Convert conversation hash tables to use wmem.
Simplifies cleanup because wmem can handle the memory cleanup.

Change-Id: Idc6a9bfe5f23c83b59a5278a64b9fb706862342d
Reviewed-on: https://code.wireshark.org/review/20042
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10 13:26:14 +00:00
Alexis La Goutte 424fef1a57 response_time_delay_dialog (Qt): Fix warning: parameter 'user_data/data' not found in the function declaration [-Wdocumentation]
Change-Id: I592b35a3ceec477a8269f5cda0c5c363681a36aa
Reviewed-on: https://code.wireshark.org/review/20048
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-10 10:19:41 +00:00
Michael Mann 70381f774c Switch stat tap to use wmem_tree_t instead of (sorted) GSList.
Change-Id: I172167eb20793113562b69d1e0e93a4882200404
Reviewed-on: https://code.wireshark.org/review/20019
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08 14:25:07 +00:00
Michael Mann 89dfa6bdf4 Switch rtd and srt tables to use wmem_tree_t instead of (sorted) GSList.
Change-Id: I54fec10801eb8f359414f34bf705767964c9725e
Reviewed-on: https://code.wireshark.org/review/20017
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08 14:24:42 +00:00
Michael Mann 243c09fa06 Switch export objects to use wmem_tree_t instead of (sorted) GSList.
Change-Id: Iaaa7b44954337c7857dbb541b727924e2de57c9d
Reviewed-on: https://code.wireshark.org/review/20016
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-08 14:24:28 +00:00
Stig Bjørlykke 64984b7a59 Qt: Add check for valid profile name
Add check for a valid profile name in the Profile dialog and disable
the Ok button and mark the invalid profile if error.

The GTK dialog does not close on errors but the Qt dialog does, so
ensure the user is informed beforehand.

Change-Id: If31ffe75183066cf49e2b5a082112bfe62d6c06e
Reviewed-on: https://code.wireshark.org/review/19995
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-08 09:07:17 +00:00
Gerald Combs 912aaf0304 Adjust startup count for extcap.
The number of extcap splash items is the number of extcap binaries plus
RA_EXTCAP.

Change-Id: I9702da5a94e244ddd95a845a67da9302ee41c826
Reviewed-on: https://code.wireshark.org/review/19981
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-07 05:15:59 +00:00
Gerald Combs e35c21c644 [Automatic update for 2017-02-05]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ic3553d0e987fc7c0eafbe42a517f46212d137edc
Reviewed-on: https://code.wireshark.org/review/19959
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-05 16:12:05 +00:00
Stig Bjørlykke efb5c1537d Qt: Add extcap placeholder parameter
Added a parameter to set placeholder text in textBox.

Change-Id: Iccf92fe60abc78be8f0fa112c0c9eb78890674b5
Reviewed-on: https://code.wireshark.org/review/12463
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-02 10:33:14 +00:00
Michael Mann 51a3014225 format_text_wmem -> format_text
All cases of the "original" format_text have been handled to add the
proper wmem allocator scope.  Remove the "original" format_text
and replace it with one that has a wmem allocator as a parameter.

Change-Id: I278b93bcb4a17ff396413b75cd332f5fc2666719
Reviewed-on: https://code.wireshark.org/review/19884
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-31 17:08:47 +00:00
Michael Mann a402c1ca22 format_text -> format_text_wmem for wlan dialogs
format_text_wmem uses NULL scope in GUI dialogs

Change-Id: Ifaa342e034de9f99b59169cdf0c7ddc52ff67597
Reviewed-on: https://code.wireshark.org/review/19882
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-31 06:35:24 +00:00
Stig Bjørlykke d5b053d26c Qt: Use system DateTimeFormat in QDateTimeEdit
In extcap argument ExtArgTimestamp set DisplayFormat to system DateTimeFormat.

Change-Id: I281d6cc1aa59e785a75d6f1c8ff9780ba5ad9eba
Reviewed-on: https://code.wireshark.org/review/19863
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-30 14:25:13 +00:00
Gerald Combs 4aa8d58911 [Automatic update for 2017-01-29]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I4a55af48f03ec5940c2a5fd902a57c7b06ac0e37
Reviewed-on: https://code.wireshark.org/review/19839
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-29 16:10:51 +00:00
Stig Bjørlykke 990b5dc14c Qt: Add exported packet files to the recent files
Update the recent files list when exporting specified packets to file.

Change-Id: I4e7dd7f943aa99ab9d5f3fd88444d730434970e9
Reviewed-on: https://code.wireshark.org/review/19818
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-01-27 20:24:54 +00:00
Stig Bjørlykke 6313e96e27 Qt: Hide "Go to Packet" frame when closing capture file.
The "Go to Packet" frame cannot be used without a capture file so
ensure we hide this when closing a capture file.

Change-Id: I339bc90b87181a8361e9f0bf27dfdf26d2f05333
Reviewed-on: https://code.wireshark.org/review/19783
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-27 05:07:14 +00:00
Stig Bjørlykke 87f4dc0a9d Qt: Preference editor improvements.
Use correct disconnect() signature to ensure everything is disconnected
before connecting new signals.  Without this all previous connects() are
still active.  This leads to gradually more and more syntax checks being
called for each change, and possibility of a wrong syntax check
(especially for strings which has no syntax check).

Use the textEdited() signal to trigger a syntax check at startup.
This gives consistency.

Do not clear preferenceLineEdit when done because it looks weird when
the preference text disappears while the widget is hiding.  The entry
is cleared before next show anyway.

Change-Id: I21c6fd8ec6bb0ecff1b2c0b66fe97dc3eaecf9b3
Reviewed-on: https://code.wireshark.org/review/19788
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-27 05:04:56 +00:00
Roland Knall d66ee141af Qt: Signal number of active captures
Adds a signal, which emits the number of active captures

Change-Id: I637106294e331e7fc7607f6fd7704492e22fa7ac
Reviewed-on: https://code.wireshark.org/review/19799
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-26 08:28:29 +00:00
Jaap Keuter 795b5d44e5 Add 'in' operator in display filter expression dialog
Add the 'in' operator to the list of available operators, where 'eq'
operator would be present also. Setup the curly bracket expression in
the filter and allow for multiple enums to be selected.

Ping-Bug: 12808
Change-Id: Ibeef52ba9d41549d0684b0069270ff09f5a93e81
Reviewed-on: https://code.wireshark.org/review/19767
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-26 08:20:14 +00:00
Stig Bjørlykke 0385a09739 Qt: Use preference editor for port number entries
After converting port preferences to use Decode As entries the preference
editor was no longer used when changing port number pereferences from the
Packet Details popup menu.

Change-Id: Ifeff3b88bfd96a122b6a58d8917304eb69cf0c38
Reviewed-on: https://code.wireshark.org/review/19781
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-01-25 18:36:30 +00:00
Gerald Combs 82b61bb404 Qt: Reject drag and drop if we're capturing.
Ignore drag enter events in the main window and warn the user if we
can't open files (which presumably means we're in the middle of a
capture).

Don't yell at the user in the corresponding GTK+ code.

Change-Id: Iffb5df5969c7ff76a854247b4b8d10d0e4b02e70
Reviewed-on: https://code.wireshark.org/review/19734
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-23 01:26:41 +00:00
Gerald Combs 73d3f7965e [Automatic update for 2017-01-22]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I75ec9ed3b0ef02d18dee79f629291e7bc1c81467
Reviewed-on: https://code.wireshark.org/review/19726
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-22 16:11:59 +00:00
Kevin Hogan 799827b503 Qt: Add Goodput graph (ACK rate), and minor bug fixes
Add Goodput graph:
 - measures rate of ACKed bytes (including SACKed bytes)
 - useful to compare to throughput during slow-start to estimate
     bottleneck rate

Add graph selection checkboxes to multi-plot graphs:
 - most important for Throughput, since there are good cases
     for showing a subset of graphs at once
 - also added for Window Scale, since the addition is similar
     to that for Throughput

Minor bug fixes:
 - allow zoom rect to work when growing in any direction
     (not just right and up)
 - keep stray mouse clicks from re-doing a previous zoom
 - hide rubber band if active when keypress changes mouse mode
     to drag
 - allow mouse clicks on open space or grpah to return to default focus
     (i.e. focus on graph)

Change-Id: Id29356ceec810ebdbed9c3c0d8415416401fe643
Reviewed-on: https://code.wireshark.org/review/19718
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-01-22 14:41:49 +00:00
Michael Mann 21a3b8cc71 Internalize struct preference
Move "struct preference" into prefs.c, essentially creating a "private"
structure to handle preferences. The 2 motivating factors were:
1. Better memory management so that clients/users of API don't have to worry
about it.
2. Hide the ugliness of the union stuff and make it transparent to the API.

A few bugs related to preference <-> Decode As integration were fixed
while in the neighborhood.

Change-Id: I509b9a236235d066b139c98222b701475e0ed365
Reviewed-on: https://code.wireshark.org/review/19578
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-22 10:43:57 +00:00
Roland Knall 76cf1d0b0a Qt: Implement Custom CMake
Implement the custom cmake calls analog to the gtk version

Change-Id: I426d2a2df5a4bfb6fc385b970e3944415d3c8afd
Reviewed-on: https://code.wireshark.org/review/19563
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-22 10:42:30 +00:00
Guy Harris 0212739598 One more cf_merge_files_to_tempfile() call needed to be changed.
Change-Id: Id109e316714fd1c4843f9ffe1b866ec0e5f5c126
Reviewed-on: https://code.wireshark.org/review/19719
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-21 08:24:24 +00:00
Gerald Combs a5fe96e50a Qt: Fixup drag and drop merging.
Make the behavior of MainWindow::dropEvent match the documentation and
dnd_open_file_cmd. If we've been passed a single file, open it. If we've
been passed multiple files, merge them first. Add an is_tempfile
parameter to openCaptureFile.

Add a note about setting the drop description on Windows.

Bug: 12129
Change-Id: I325a4da5a29e940b4efa7654627d8bcafba15b57
Reviewed-on: https://code.wireshark.org/review/19717
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-21 06:50:56 +00:00
Gerald Combs 05fbb4826b Qt: Show merge progress.
Add "file merge" callback plumbing. Use it to display "Merging files" in
the main statusbar.

Make sure we have a usable window pointer when we merge files.

Change-Id: I236b6edb30685f0b06703ab8304bc88ae592f83c
Reviewed-on: https://code.wireshark.org/review/19716
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-21 06:50:30 +00:00