Commit Graph

2365 Commits

Author SHA1 Message Date
Roland Knall 6eee29bf2a InterfaceTreeList: Enable all editable columns
In preparation for moving to the new interface list, adding all
necessary editors and changes to allow all columns, which are being
handled by CaptureInterfacesDialog or ManageInterfacesDialog to be
edited correctly

Change-Id: I8bfabff92a07950c74a4d7243dadd99ecd2024f4
Reviewed-on: https://code.wireshark.org/review/18446
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-26 07:49:50 +00:00
erikdejong ae88dbcc2a Qt: Enhancements to VoIP call dialog:
1) Added checkbox to toggle format in start and stop time columns from
relative time to time of day.
2) Added column to show duration of call in between the protocol and
packets column.

Change-Id: I56347fa36885e3a71646e2c9cdde2b8b5fb88846
Reviewed-on: https://code.wireshark.org/review/18383
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
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>
2016-10-25 04:14:59 +00:00
Dario Lombardo 7de4c2364d Qt: use ws_strtou function in sctp_chunk_statistics_dialog.
Change-Id: Iffa2d633ef7a0f636c595fb05ad1790d1ea61df0
Reviewed-on: https://code.wireshark.org/review/18402
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-24 12:43:57 +00:00
Michal Labedzki 681b97a047 Qt: Make horizontal spacer size to be fixed
The Search Frame can be used to find frames by a display filter
expression that can be very long, so stretch a text field instead
of free space.

Example of a display filter expression that can be used in
the "search bar":
bthci_cmd.opcode == 0x200d || bthci_evt.le_meta_subevent == 0x0a

Change-Id: I52b30386e96a726824c25a926742a24d653dfcfe
Reviewed-on: https://code.wireshark.org/review/18234
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-10-24 05:56:32 +00:00
Peter Wu 3b502c873f Qt: fix possible crash on sorting custom columns
The sorting function must maintain a strict weak ordering, otherwise it
may result in crashes. In the case of custom columns, this was violated
when exactly one of the two rows had a non-numeric value.

Bug: 13023
Change-Id: Ie338b1cce5156eeb313dd33491ee3d3f2eaddf1c
Reviewed-on: https://code.wireshark.org/review/18406
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-24 04:33:00 +00:00
Dario Lombardo af7fc8b7e4 Qt: add fullscreen feature.
The feature activates/deactivates fullscreen mode of Qt UI.
A new menu item has been added as well as a shortcut (F11 or Ctrl+Cmd+F)
according to browsers common shortcut.

Change-Id: I01906b494d0a13ce70d27c00ebbe03e6ec87cbd7
Reviewed-on: https://code.wireshark.org/review/18332
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-23 23:25:49 +00:00
Gerald Combs 3c3f592ebc [Automatic update for 2016-10-23]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I5127251ce46aa668cd12daacc7c6702564c04c8f
Reviewed-on: https://code.wireshark.org/review/18412
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-23 15:12:04 +00:00
Martin Kaiser 3576394ed4 interface_sort_filter_model: don't dereference a NULL pointer
This fixes a crash in InterfaceSortFilterModel::mapToSource().

sourceModel was set to match the sourceModel of the underlying
InterfaceFrame. When Wireshark is closed,
InterfaceSortFilterModel::mapToSource() is called after
InterfaceFrame was freed, the sourceModel is NULL in this case.

 #0  0x000000000079a81e in InterfaceSortFilterModel::mapToSource
 (this=0xe9fab0, proxyIndex=...)
 /home/martin/src/wireshark.git/ui/qt/interface_sort_filter_model.cpp:250
 ...
 #7  0x0000000000797ed9 in InterfaceTreeModel::~InterfaceTreeModel
 (this=0xe9ff90, __in_chrg=<optimized out>)
    at /home/martin/src/wireshark.git/ui/qt/interface_tree_model.cpp:72
 #8  0x00000000006c4e20 in InterfaceFrame::~InterfaceFrame
 (this=0xe643b0, __in_chrg=<optimized out>)
    at /home/martin/src/wireshark.git/ui/qt/interface_frame.cpp:109
 #9  0x00000000006c4ec9 in InterfaceFrame::~InterfaceFrame
 (this=0xe643b0, __in_chrg=<optimized out>)
    at /home/martin/src/wireshark.git/ui/qt/interface_frame.cpp:112

Change-Id: Ibe7f75ccd7a0af5f04febf967c47ada1a05bc3d3
Reviewed-on: https://code.wireshark.org/review/18411
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-23 10:41:07 +00:00
Martin Kaiser 44cf0bdccf main_welcome: include QUrl
This fixes compilation with Qt4.

.../main_welcome.cpp: In member function ‘void MainWelcome::on_helpLabel_clicked()’:
.../main_welcome.cpp:509:69: error: invalid use of incomplete type ‘class QUrl’

Change-Id: Ib31a4e28f67a27d3f644e8a8cfd3e6d848e034c4
Reviewed-on: https://code.wireshark.org/review/18388
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-10-22 16:11:55 +00:00
Michal Labedzki d32fee2d62 Qt/Bluetooth: Add Display Filter Edit field to HCI Summary dialogue
Display Filter can be useful for this summary dialogue,
for example to reduce number of frame that were analyzed, like:
"frame.number >= 100 && frame.number <= 4674"

Change-Id: I19587b9d41f3b253d1ca2683d198f7d7af2ad50f
Reviewed-on: https://code.wireshark.org/review/18265
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-10-22 09:22:02 +00:00
Gerald Combs a63b5eb711 Qt: Make "Learn" on the welcome screen clickable.
Make the "Learn" header a ClickableLabel to match "Open" and "Capture".
Link to the docs page for now. Adjust its stylesheet and properties to
match ast well.

Change-Id: Id9c7c05269de8134af28f0f9c1e2820a60442236
Reviewed-on: https://code.wireshark.org/review/18358
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>
2016-10-22 06:32:50 +00:00
Guy Harris 528894e72f On UN*X, st_ctime is the last status change time, not the creation time.
That's the time the file's inode last changed, so size changes,
permission changes, etc. affect it.  It's *not* the time the file was
created; most UN*Xes don't provide that.  Newer versions of FreeBSD,
NetBSD, OpenBSD, and macOS do, but other UN*Xes don't appear to.

On Windows, at least according to Microsoft's documentation, st_ctime
*is* the creation time.  Hopefully that's not the result of confusion on
the part of somebody at Microsoft.

Change-Id: I20743703f6ef66e40dff9004dc91bed46af6fad0
Reviewed-on: https://code.wireshark.org/review/18378
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22 05:20:22 +00:00
Guy Harris 49cf42c571 localtime() can return NULL, even if it's unlikely.
ANSI C says it can return NULL - and, at least on Windows with the MSVC
library, it *will* return null for dates prior to the Epoch.  Check for
a null return and handle it.

Fixes CID 1374109.

Change-Id: Ib18566d1a75e4109adb21834b157e87532fcac10
Reviewed-on: https://code.wireshark.org/review/18365
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22 00:08:42 +00:00
Michal Labedzki d142e7f403 Fix build for Qt 4.8
setCurrentText is only available in Qt5, so select the item manually.
https://doc.qt.io/qt-5/qcombobox.html#currentText-prop

Fixes: v2.3.0rc0-1002-g1cd2255 ("Qt: convert UatDialog to model/view pattern, improve UX")
Change-Id: I402e7d159d512e870849ee54d851276c4cc7cf34
Reviewed-on: https://code.wireshark.org/review/18351
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-21 15:07:57 +00:00
Peter Wu 991e0747a3 Qt: fix weird tree expander that results in a crash
According to the Qt documentation, rowCount and columnCount must return
0 when a valid parent index is passed to a table model. Otherwise deep
recursion would occur resulting in a stack overflow in Qt4.

Change-Id: I60bb15384470861013591e149c0f285ea1bdf9a7
Fixes: v2.3.0rc0-1002-g1cd2255 ("Qt: convert UatDialog to model/view pattern, improve UX")
Reviewed-on: https://code.wireshark.org/review/18354
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-21 14:13:43 +00:00
Jaap Keuter b50888de99 WelcomeUI: Enhance Open and Capture clickable labels
Open and Capture are now clickable labels, but they are sensitive
throughout the whole width of the central column. Without background
highlighting, as in the file list, this may be non-intuative.
To more closely resemble a button, limit the sensitivity to the text
of the label only, by limiting the label size.

Change-Id: I0b703af02abc71a48dfbcee81f336bba955b4a70
Reviewed-on: https://code.wireshark.org/review/18349
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>
2016-10-21 08:02:54 +00:00
Roland Knall 3fb32662a8 InterfaceList: Add button to toggle hidden interfaces
Add a button to the context menu, to allow for easy display of hidden
interfaces, and make that a storable preference

Change-Id: I8df5562b3ce8119b0ed38f9893c1879127f40c47
Reviewed-on: https://code.wireshark.org/review/18005
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-20 15:50:44 +00:00
Dario Lombardo 4a87ecb52b Qt: remove unused private member (found by clang).
Error:
ui/qt/wlan_statistics_dialog.cpp:462:9: error: private field 'retry_packets_'
is not used [-Werror,-Wunused-private-field]

Change-Id: I10785eab098db14a53ef8085421c0f1046c269f3
Reviewed-on: https://code.wireshark.org/review/18337
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-20 15:26:54 +00:00
Mikael Kanstrup 269b54c2e0 Fix compilation error without PCAP (using correct define)
Incorrect define HAVE_PCAP was checked for. That one was
never set even with PCAP enabled and thus broke the wireless
toolbar functionality.

Change-Id: I856c836de75b198340661d5e5b734c7d8ada70ac
Reviewed-on: https://code.wireshark.org/review/18335
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-20 15:16:22 +00:00
Alexis La Goutte 60f5c57163 wlan_statistics_dialog (Qt): Add percent of retry
Change-Id: I1b77805d0bb71cda0ba8296f88854eec7111eff4
Reviewed-on: https://code.wireshark.org/review/18307
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>
2016-10-20 09:38:58 +00:00
Michal Labedzki afcbcdf272 Qt/Bluetooth: Add Mark/Unmark functionality
Add Mark/Unmark functionality for tree/table widget items, user can now
mark row or cell.

Change-Id: I31b9ca128d97da4fb959ae2d92f5c1646ebea478
Reviewed-on: https://code.wireshark.org/review/18266
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>
2016-10-20 07:34:37 +00:00
Roland Knall 961b05315d WelcomeUI: Make Open and Capture clickable
Make the texts "Open" and "Capture" clickable, and have them open
the FileOpen and CaptureOptions dialogs respectively

Change-Id: I2a3efbc4cdf160aa0b4efc6496d09228affbff46
Reviewed-on: https://code.wireshark.org/review/18303
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-20 05:09:58 +00:00
Peter Wu 9c3d81adde Officially require Qt 4.8 or newer
Since v2.3.0rc0-1002-g1cd2255, Qt 4.8 became mandatory, reflect this in
the version requirements. This will not affect a lot of distributions
(RHEL and SLES only had Qt 4.6).

For a more complete list of supported platforms, see
https://wiki.wireshark.org/Development/Support_library_version_tracking

While at it, correct some other minimum versions in documentation.

Change-Id: I11f2dfba72c75429f6838404a81ed3b3dc302d5f
Reviewed-on: https://code.wireshark.org/review/18314
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-20 05:03:07 +00:00
Alexis La Goutte f252831b43 wlan_statistics_dialog: Add number of retry
Change-Id: I27194670dcd2e6c2ec6502c562e50ee6925c4c45
Reviewed-on: https://code.wireshark.org/review/18306
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>
2016-10-20 04:58:34 +00:00
Roland Knall 5ab49c623d InterfaceList: Changing text clears the cell
If the cell is double-clicked to edit an existing text, it is cleared
upon start of the edit widget

Change-Id: I9d718635de5c4b091aab1f88c2482434aaae1286
Reviewed-on: https://code.wireshark.org/review/18319
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>
2016-10-19 18:59:56 +00:00
Dario Lombardo 11e8bac88e Qt: add include to fix compilation without pcap.
Regression introduced in 864f750be5.

Change-Id: I306903e8252d932425f420e1901a8f3e949f5568
Reviewed-on: https://code.wireshark.org/review/18309
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 15:04:50 +00:00
Hessam Jalali 10c46fc308 Qt: declare one_em to fix compile error when HAVE_PCAP_REMOTE is defined
Occured on Windows(10) x64 build.

Change-Id: I04d88bec1660dae20f459d2e03c88864c9366dc3
Reviewed-on: https://code.wireshark.org/review/18315
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-19 11:33:22 +00:00
Roland Knall e68247e1fd InterfaceTree: Change foreach to const_iterator
Change all occurences of the foreach macro to while loops with
const_iterator for performance reasons

Change-Id: I1cd378696136b3d6cc100b9bfff95295baa2ff83
Reviewed-on: https://code.wireshark.org/review/18286
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 07:44:48 +00:00
Roland Knall 864f750be5 ManageInterfacesDialog: Implement View/Data Model
Implement the same interface view/data model as used for
the interface_tree selection in this dialog, to encapsulate
all access to global_capture_devices from the dialog.

Change-Id: I0e568fe236d077befa2a79765638db8bb3ed1a3f
Reviewed-on: https://code.wireshark.org/review/18062
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 07:43:45 +00:00
Guy Harris 41c6b944b4 Rename a function to have a name different from a data object's name.
Change-Id: Iefef8b2161b43900fd81fb1b163a4feee69fd069
Reviewed-on: https://code.wireshark.org/review/18285
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-18 20:08:40 +00:00
Michal Labedzki 2898c2a244 Fix wrong local function names
Copy->Paste issue.

Change-Id: I77bc755c772df0fb95a9e4ce91b8b3bc8a8e019d
Reviewed-on: https://code.wireshark.org/review/18282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18 19:33:17 +00:00
Roland Knall 4a4698259c WiresharkApplication: Add signal emitter for Interface Changes
Change-Id: I468ef9462aa91d02c5568cec0d08081a2b3840bb
Reviewed-on: https://code.wireshark.org/review/18269
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-18 14:46:39 +00:00
Gerald Combs 41e9bbac91 Qt: Main welcome show/hide interface updates.
Pluralize the text in the main welcome show/hide interfaces button.
Remove the styling, which matches other places we use a pushbutton +
menu.

Change-Id: I7559f98d0c1afbfb2920b09c3885d9b1fbdf76f1
Reviewed-on: https://code.wireshark.org/review/18260
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-18 14:04:05 +00:00
Roland Knall 81904c70a8 InterfaceList: Change Buttons to combobox
Change the buttons to a combobox selector, and move that selector
to the right of the capture filter box.

Bug: 12971
Change-Id: Ib85d51cca128ed76eb08886e92660ede51d5982f
Reviewed-on: https://code.wireshark.org/review/18186
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-17 14:43:22 +00:00
Joerg Mayer 4ff7799be8 Some get rid of the remaining trivial Q_UNUSED cases.
Fix the placement of Q_UNUSED inside #ifdef

Change-Id: I015ff87fcb300a701bf8ccb42bd85e3068a08138
Reviewed-on: https://code.wireshark.org/review/18228
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17 05:37:29 +00:00
Joerg Mayer e552b319b5 Get rid of the trivial Q_UNUSED cases
Change-Id: Ia7ddde278158f3321eb4244189375bdd51c8976d
Reviewed-on: https://code.wireshark.org/review/18227
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17 05:16:41 +00:00
Gerald Combs b240082cf4 [Automatic update for 2016-10-16]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I016f035d04c44a68163ea0670e27fa454f4ba660
Reviewed-on: https://code.wireshark.org/review/18217
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-16 15:11:55 +00:00
Joerg Mayer faa74f86e2 Inspired by prevous commit: grep for wlan_mgt turned up a few more occurrences. Fix them.
Change-Id: I6661f483f7bf1e34c96467917358dbddf45f808e
Reviewed-on: https://code.wireshark.org/review/18216
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-16 14:15:29 +00:00
Gerald Combs ad0a016bd2 Qt+macOS: Fix the default font name.
"SF Mono" is the name of the new monospace font in Sierra. Note that it
appears to have limited availability and that we're outside those
limits.

Fix up a comment.

Change-Id: I97f0077098ea78d4550b58fb92645f4d62342b2e
Reviewed-on: https://code.wireshark.org/review/18168
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-10-13 18:10:29 +00:00
Dario Lombardo a40f3eebce Fix compilation error without PCAP.
Change-Id: I414f11387ec5a48dfe7c1debb3bcef1dbc846b28
Reviewed-on: https://code.wireshark.org/review/18184
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-13 14:37:30 +00:00
Roland Knall 4f6ed3852d Interface List: Fix display of zero entries
If WS is started with zero entries, no text is being displayed, and
pushing a button does not yield the display of the list. This fixes
it.

Change-Id: I70b0637e5f95e805b54780afb7eb2e43b3e5f21c
Reviewed-on: https://code.wireshark.org/review/18180
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Roland Knall <rknall@gmail.com>
2016-10-13 11:53:46 +00:00
Peter Wu 1cd22559a8 Qt: convert UatDialog to model/view pattern, improve UX
Fixes:
 - Fix crash (heap-use-after-free) on removing a record while editing.
 - Mark a record as invalid if any of the fields fail the validation.
   (Fixes crash in at least the ISAKMP dissector.)
 - Prevent saving of invalid UAT entries (e.g. empty UATs).
 - Do not close the dialog on pressing Enter/Escape while editing,
   close the editor instead.
 - Fix HTML injection in the error messages.

Improvements:
 - Tab-navigation now works between fields.
 - The field editor is now closed once the focus is lost.
 - Fields that fail validation are marked (currently with a pink color).
 - The error hint selection has become smarter (see comments in
   UatDialog::checkForErrorHint).
 - Properly recognizes PT_TXTMOD_HEXBYTES formats like "aa:bb"
   (previously it would not expect the ":" and report a bad length).
   A validator prevents invalid strings from being entered.
 - The OK button is disabled when new/edited records are bad. Notably,
   existing (possibly invalid) records are skipped. (Bug 7471).

Live validation (while typing in the editor) was dropped during
conversion, but it can be added later if desired.

Drag and drop reordering still needs to be implemented.

Bug: 11714
Bug: 7471
Change-Id: Ic0b6a177f90503fbd65b5001d8a87a10e38f4d64
Reviewed-on: https://code.wireshark.org/review/17994
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>
2016-10-12 03:53:27 +00:00
Gerald Combs 83df30ee53 [Automatic update for 2016-10-09]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I84adcfee2652783d1b3b7d7e3ff9b209f8b23d96
Reviewed-on: https://code.wireshark.org/review/18130
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-09 15:12:30 +00:00
Michael Mann 268841f3e0 Combine Decode As and port preferences for tcp.port dissector table.
This patch introduces new APIs to allow dissectors to have a preference for
a (TCP) port, but the underlying data is actually part of Decode As functionality.
For now the APIs are intentionally separate from the regular APIs that register a
dissector within a dissector table.  It may be possible to eventually combine the
two so that all dissectors that register with a dissector table have an opportunity
to "automatically" have a preference to adjust the "table value" through the
preferences dialog.

The tcp.port dissector table was used as the guinea pig.  This will eventually be
expanded to other dissector tables as well (most notably UDP ports).  Some
dissectors that "shared" a TCP/UDP port preference were also converted. It also
removed the need for some preference callback functions (mostly when the callback
function was the proto_reg_handoff function) so there is cleanup around that.

Dissectors that has a port preference whose default was 0 were switched to using
the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference

Also added comments for TCP ports used that aren't IANA registered.

Change-Id: I99604f95d426ad345f4b494598d94178b886eb67
Reviewed-on: https://code.wireshark.org/review/17724
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-08 02:44:53 +00:00
Jaap Keuter dd589f5c16 Qt: valign text in RTP Stream Analysis window.
The text on the left hand side of the RTP Stream Analtsis window is
a (HTML) table of table headers followed by table data. For some reason
the table data is center aligned in the cells of the table. This does not
line up with the text in the table header cells.

See http://imgur.com/a/QIQFd

Also the HTML document is not compliant. Closing tags are missing, for
td and html itself.

Change-Id: I1cd58e8702db12433c863757141a6b68c1e2550c
Reviewed-on: https://code.wireshark.org/review/18074
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-07 22:50:34 +00:00
Roland Knall d58da8ec90 Interface View/Model: Correct column ordering
This orders the columns correctly in the sequence the developer
has intended when adding them with setColumns. Also it allows for
disabling and inverting the filtering by type, as well as query
additional roles instead of only Qt::DisplayRole from the tree model.

Change-Id: I90469e8e3f3caa50debb3c839590d42719a6fb10
Reviewed-on: https://code.wireshark.org/review/18096
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-07 14:31:30 +00:00
Dario Lombardo c8143e2077 Qt: add condition to compile without extcap.
Change-Id: Ieabccb5dfc7884bebf9f2b68caaa16a82609bd30
Reviewed-on: https://code.wireshark.org/review/18060
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-04 09:59:11 +00:00
Roland Knall fc234708a7 Interface View/Model: Fix pcap-less build
Change-Id: I88bc6c939b7ce6986299e4ebf99358437b758bd2
Reviewed-on: https://code.wireshark.org/review/18045
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-04 01:26:31 +00:00
Jaap Keuter 1fdbdf7fca Qt: Have logo in the center of the about dialog
Change-Id: I5dca338e7e3eda3f4b0fa827fe6f7177337f5393
Reviewed-on: https://code.wireshark.org/review/18011
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-04 00:10:36 +00:00
Gerald Combs 1320ea4d57 Be more forgiving about invalid Coloring Rules.
In ColoringRulesDialog:

Only check a rule's display filter if that rule is enabled. This keeps
us from disabling the OK button when we shouldn't.

Adjust the "Your coloring rules file contains unknown rules" dialog text
and buttons for accuracy.

In color_filters.c:

Don't try to compile disabled filters in color_filters_apply. Don't warn
about disabled and invalid filters in read_filters_file.

Bug: 12814
Change-Id: I7143bf8e7a6162d296f1e93769344b69763195c8
Reviewed-on: https://code.wireshark.org/review/17823
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: Michael Mann <mmann78@netscape.net>
2016-10-03 17:47:39 +00:00