aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2017-09-20plugins: Be more descriptive in "about wireshark"->"folders"João Valverde2-33/+51
Display separate entries for binary plugins and lua scripts. This is explained in the user guide, that the binary folder is a subfolder of the lua folder, but it's probably a good idea to be more explicit about it, at the risk of cluttering the interface a bit. Move GeoIP information down because it seems the least important. Add helper functions to provide plugin version subdir. Change some #ifdefs while at it for legibility. Change-Id: Ieb8665df029b3c14de19e2c973bd9b1cc4ec4621 Reviewed-on: https://code.wireshark.org/review/23609 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-20Qt: Restore ability to display RTT by sequence numberKevin Hogan3-10/+70
Adds a checkbox to the TCP Stream Dialog's "Round-trip-time" graph tab that allows user to choose sequence number on the x-axis rather than time. Bug: 13740 Change-Id: Iaf881318437c7eecd16cf6c1f8745283ce9b4a7d Reviewed-on: https://code.wireshark.org/review/23376 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-09-20qt: Fix some leaked menu objectsMikael Kanstrup9-17/+18
Calling QPushButton.setMenu and QMenu.addMenu does not transfer ownership of the menu. Fix some leaks by letting "receiving" object act parent for the menu object. Bug: 14071 Change-Id: Id4edaf895503ef5dd4597eac99c2cdd6ad09b2ff Reviewed-on: https://code.wireshark.org/review/23600 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-09-20Fix leaks related to recent settingsMikael Kanstrup2-8/+33
Fix leaks related to recent settings reported by Valgrind simply after starting/stopping application. Bug: 14071 Change-Id: Ib4f205218945c8776724899c0dd99cc81b79a41d Reviewed-on: https://code.wireshark.org/review/23599 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-09-20Integrate LBM UIM Flow dialog into "regular" Flow diagram.Michael Mann13-1620/+0
Reduce all of the code duplication and just register the sequence analysis functionality in LBM dissector. Change-Id: I6cb5a7f0a92b04357334bbae301fa2d730a21994 Reviewed-on: https://code.wireshark.org/review/23630 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-09-20Rename get_plugin_dir() for consistencyJoão Valverde2-2/+2
WS_DLL_PUBLIC const char *get_plugin_dir(void); WS_DLL_PUBLIC const char *get_plugins_pers_dir(void); Opt for the plural form consistently (for public functions at least). Change-Id: I8a5861ad7f90f9c87168bd3275bd9dbc5c83b749 Reviewed-on: https://code.wireshark.org/review/23608 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-19Qt: main window slots: don't connect setCaptureFile to DecodeAsDialogMartin Kaiser1-2/+0
The refactored DecodeAsDialog class has no setCaptureFile slot any more. It seems it's always in the foreground and there's no way to change the capture file while the DecodeAsDialog is active. The dangling connection caused a warning QObject::connect: No such slot DecodeAsDialog::setCaptureFile(capture_file*) in ../ui/qt/main_window_slots.cpp:2881 QObject::connect: (sender name: 'MainWindow') QObject::connect: (receiver name: 'DecodeAsDialog') Change-Id: Ibb12b9cdded3c6b7cca40ce08874bc4f1af4eec7 Reviewed-on: https://code.wireshark.org/review/23623 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: Michael Mann <mmann78@netscape.net>
2017-09-19Sequence (flow) analysis: fill timestamp when creating item.Jakub Zawadzki1-12/+0
Change-Id: Ie1b82d016b632162a91e2ed54a964662bc25e9d5 Reviewed-on: https://code.wireshark.org/review/23620 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-09-19Disable flex-generated [-Wsign-compare] warningsJoão Valverde1-0/+2
Change-Id: Iace0462e6bb50573f3e4603f7a19e4b7ee1f9733 Reviewed-on: https://code.wireshark.org/review/23541 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-19Sequence analysis (flow graph) optimizations for dissectorsMichael Mann4-10/+4
1. Remove protocol member from seq_analysis_item_t. It's not used by any GUI, so don't burden dissectors with populating it. 2. Allow any dissector to change colors display by flow graph 3. Provide helper functions that may be common if other dissectors want to create sequence analysis. Change-Id: I04fa3c9f3cf6879ab9a8d7d6f4896b4979d010d7 Reviewed-on: https://code.wireshark.org/review/23613 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: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-19qt: Fix leaked style for OverlayScrollBarMikael Kanstrup2-3/+14
The QWidget::setStyle method does not transfer ownership of supplied style object. Fix leak by letting OverlayScrollBar free styles created. Bug: 14071 Change-Id: Ibc14cadfc6d012e8a909be21b4f8974009fa75f5 Reviewed-on: https://code.wireshark.org/review/23601 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-09-19Qt: Add key events to accept and reject changes in FilterExpressionFrameStig Bjørlykke3-1/+24
Change-Id: Iba3fe50b3ca4953fc59ebd6235d04f6878d183a4 Reviewed-on: https://code.wireshark.org/review/23607 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-09-19Qt: Fix FilterExpressionFrame layoutStig Bjørlykke1-29/+12
- Use QToolButton for "Filter Buttons Preferences..." button - Remove QVBoxLayout layout for Cancel and OK buttons Change-Id: Ic5d4e96ca1c421750dc45f81a7d15f8ad637649d Reviewed-on: https://code.wireshark.org/review/23606 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-09-19Qt: Add key events to accept and reject changes in PreferenceEditorFrameStig Bjørlykke3-0/+22
Change-Id: I4a9c4b80b0438cd33c38b274a24a3b1b5db46cb8 Reviewed-on: https://code.wireshark.org/review/23605 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-09-19Qt: Make ColumnEditorFrame use FieldFilterEdit to get a autocomplete listStig Bjørlykke2-1/+9
Change-Id: I81d5f46d572aa3f0fa1b5b94741697fc72554d2e Reviewed-on: https://code.wireshark.org/review/23587 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-09-19Qt: Add key events to accept and reject changes in ColumnEditorFrameStig Bjørlykke3-0/+26
Change-Id: I5f9ee01ee3aca5b2d75136fff3d8dc3e90ca1a4e Reviewed-on: https://code.wireshark.org/review/23585 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-09-18Move most of sequence analysis code from ui/ to epan/Jakub Zawadzki8-503/+103
Create registration system to allow creation of analysis items to be localized to the dissector. For now only frame (all) and TCP are supported. VOIP functionality will be covered in a separate patch. Change-Id: I5b05ef6d5afff8d0b162b03a0f451ab810602e81 Reviewed-on: https://code.wireshark.org/review/23571 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-18Qt: Fix -Wimplicit-fallthrough with GCCJoão Valverde1-0/+1
../../../ui/qt/models/decode_as_model.cpp: In member function ‘virtual QVariant DecodeAsModel::data(const QModelIndex&, int) const’: ../../../ui/qt/models/decode_as_model.cpp:155:13: error: this statement may fall through [-Werror=implicit-fallthrough=] Change-Id: I29654a0f6ce6cce7bc778231bc8d6e602875104f Reviewed-on: https://code.wireshark.org/review/23589 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-09-18Qt: Improved ColumnEditorFrame validation checksStig Bjørlykke2-16/+12
Use common validation checks for fieldsNameLineEdit and occurrenceLineEdit. No need to check for COL_CUSTOM and empty occurrence because this will give a valid value anyway. Change-Id: I8981a15954e9a55a9a43e4a5760b34d83aa2e1ca Reviewed-on: https://code.wireshark.org/review/23584 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-09-17[Automatic update for 2017-09-17]Gerald Combs7-120/+72
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I0b157ca377ef2e8f1a2502e51b542322dc0d36b2 Reviewed-on: https://code.wireshark.org/review/23580 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-17Fix the trivial fix.Joerg Mayer1-2/+2
Change-Id: I95743eb53a3f30206a496163dea3b79f92a54b4e Reviewed-on: https://code.wireshark.org/review/23579 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-09-16_U_ is wrong in c++, as is Q_UNUSED (in most cases).Joerg Mayer1-6/+6
The correct way is to not name the variable. interface_tree_cache_model.cpp is one of the exceptions: Use Q_UNUSED in a conditional compile, instead of unconditionally. Change-Id: If561e632a3a60d2424f454202f233e9a63926e78 Reviewed-on: https://code.wireshark.org/review/23570 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-09-16Add support for dissector tables of type FT_NONE.Michael Mann4-25/+77
This is for dissectors that have "payloads" that don't have a unique identifier to determine a sub dissector. For the command line parameter -d, specifying a selector is no longer required for dissector tables of type FT_NONE. Change-Id: I3370d9e0dc147deeca4f26b842fe35dc3bda876e Reviewed-on: https://code.wireshark.org/review/22574 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-16Refactor Decode As dialog to use a model/delegateMichael Mann9-635/+1306
The model provides a lot more flexibility and abstracting the data from the view (dialog) Noticeable changes from user perspective: 1. Value column doesn't always have a combobox. If registered decode as structure doesn't support multiple values, a simple edit box is used. 2. Existing value will always be a choice (default) in the Value combobox. 3. Duplicate values in Value combobox have been removed (for things like UDP port where source port and dest. port are same) 4. When adding/copying a decode as item, only first column (table) is editable, not the whole column. 5. Separator always present in Current protocol column to distinguish "none" from rest of protocols. 6. "Current" protocol defaults to "default value" when first added to the list instead of "none". Noticeable changes from developer perspective: 1. Code is much more spread out, but most new additions (like DCE/RPC support) should be limited to the model class (maybe delegate). The dialog class probably won't change much anymore. 2. decode_as_dialog.ui is much less useful because information is provided through model and delegate. Change-Id: I70a667cab2c07d251ab370430bc51e5c1f4a3a02 Reviewed-on: https://code.wireshark.org/review/22625 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-09-15wireless-timeline: handle generators that report incorrect MCS for some framesSimon Barber1-2/+11
Macbook and QCA generators sometimes report the minimum MCS for subframes in an aggregate that have FCS errors. Change-Id: I77d1a81f5b3d0e3d0755adcb889f1237b0257814 Reviewed-on: https://code.wireshark.org/review/23521 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-09-15Qt: initialize srt_data_ in constructor (CID 1417727)Pascal Quantin1-0/+3
Change-Id: I4977ff102f1ffb11a5ea956537dde3230b4323f7 Reviewed-on: https://code.wireshark.org/review/23550 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-15Qt: Don't show text as invalid in disabled widgetsStig Bjørlykke1-1/+1
In Interface Toolbar the text widget should not be shown as invalid when the widget is disabled. Change-Id: I100a338216b34874064cb9f808a36703157811a4 Reviewed-on: https://code.wireshark.org/review/23549 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-09-14Fix builds without pcap.Guy Harris2-1/+3
Change-Id: I5e327a8147ccd02e4fc689b321718b1910344b33 Reviewed-on: https://code.wireshark.org/review/23527 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-12Fix: Segfault when "Update list of packets in real time" is uncheckedMichael Mann1-1/+4
capture_file structure is not populated with "fixed" captures. Qt menu presumes it has a populated capture_file structure. Just have menu items be disabled until capture file is reloaded for display. Bug: 13024 Change-Id: I9dfb5355c5d421f5344f97e1e9d5b4dd08b11c6e Reviewed-on: https://code.wireshark.org/review/23095 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-09-12Qt: fix a segmentation fault when opening a capture using the menu entryPascal Quantin1-1/+2
Regression introduced in g38b40acb2d Change-Id: I48377345730eb52b03a2016407afda4bc0ff8a79 Reviewed-on: https://code.wireshark.org/review/23509 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-09-11Qt: SequenceDialog no longer emits goToPacket.Gerald Combs1-2/+0
SequenceDialog no longer emits goToPacket as of g7fe45cc0ec. Don't try to connect it in MainWindow. Change-Id: I0f3e47a3cf7c1e29a64da7462c85179e29828c49 Reviewed-on: https://code.wireshark.org/review/23501 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-11wsutil: Initialize and store plugin personal dirJoão Valverde2-5/+2
Obviate allocation on every call to get_plugins_pers_dir(). Change-Id: I089ae499f93739d490d4552f59b5db5996f7d26f Reviewed-on: https://code.wireshark.org/review/23495 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-11Qt: free SRT table once the tree is filledPascal Quantin1-0/+1
Change-Id: Ic1c55852399190f3a3c5b5bf90cf6d90517b247f Reviewed-on: https://code.wireshark.org/review/23444 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-11Qt: fix Diameter SRT statistics displayPascal Quantin2-11/+21
Diameter dynamically create the SRT entries during runtime. Delay the SRT table addition to the end of dissection to properly handle this use case. Bug: 13442 Change-Id: Id498f8d9bb4a1d7c632c9a556239bf74d0530f2a Reviewed-on: https://code.wireshark.org/review/23443 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-11Qt: fix a memory leak when exporting packetsPascal Quantin1-0/+1
Change-Id: I3c99ca838b3def4437ba92794881630b8cdd8cbd Reviewed-on: https://code.wireshark.org/review/23472 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-07Qt: Construct QRegExp only onceStig Bjørlykke2-5/+4
In Interface Toolbar lineedit the QRegExp only needs to be constructed once, not for every validity check. Change-Id: I39e9ab9c57b4ac64a0b9b601fa72646d8c420274 Reviewed-on: https://code.wireshark.org/review/23425 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-09-07CMake: Try to fix build error with i18n.qrc dependency orderJoão Valverde1-16/+17
Change-Id: I7006b435508e72457413cd1b7c5bdf1b7b41ee5b Reviewed-on: https://code.wireshark.org/review/23424 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-06Qt: fix RTP/IAX2 reverse stream export to CSVPascal Quantin2-4/+4
Bug: 14040 Change-Id: Idadfbd3b60124b5f7ac4ace275db94b10daf010a Reviewed-on: https://code.wireshark.org/review/23409 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-09-06plugins: config.h must not be included by public headersJoão Valverde3-0/+4
For a sane plugin build environment. Include config.h as the first header in the .c file instead. Fix by moving required compiler attribute macros to a new "ws_attributes.h" API header. Change-Id: I34f58a927f68c1a0e59686c14d214825149749e1 Reviewed-on: https://code.wireshark.org/review/23400 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-05Fix unitialized variable warnings that popped up with -OgJoão Valverde1-1/+1
Using GCC version 7.1.1. Change-Id: I7447a48fc97efb1eb15a016a29165f69d37f40a6 Reviewed-on: https://code.wireshark.org/review/23399 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-03Qt: Interface Toolbar log dialog for each controlStig Bjørlykke2-24/+30
Have separate log dialogs for each control logger button. Bug: 14033 Change-Id: Iaabcbe38da196ebed1302f66b77864f880121856 Reviewed-on: https://code.wireshark.org/review/23364 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-09-02Have a single IPv6 tapJoão Valverde2-4/+4
Optimize code and open possibility for enriching IPv6 tap data. Change-Id: I5a204d7464cde32123d5bfe664cc9b6bcf08dbe1 Reviewed-on: https://code.wireshark.org/review/23340 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-08-31endpoint_dialog.cpp: remove a useless breakPascal Quantin1-1/+0
Change-Id: I0aafbe27b54969e77ba4df3106b9f35809d848a4 Reviewed-on: https://code.wireshark.org/review/23335 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-08-31Qt: Fix errors when compiling for Qt4.Jens Kilian7-4/+39
This allows Wireshark to be built on RedHat EL 7.2, with Qt 4.8.5. Bug: 13909 Change-Id: Ia39a288cc342afa2bd0217cb59dac84c3227086c Reviewed-on: https://code.wireshark.org/review/23322 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-08-31Fix MacOS buildJim Young1-1/+1
Commit 8d13f14f958b9ee00b59fd869bd1630f76e6fa65 introduced a preprocessor buglet affecting MacOS builds. Change #if to #ifdef. Change-Id: I3d76c83428658abcf382e18066be0e24309ecbba Reviewed-on: https://code.wireshark.org/review/23317 Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jim Young <jim.young.ws@gmail.com>
2017-08-31extcap: fix parameters save in preferences filePascal Quantin2-6/+1
Since g583150198b, extcap_arg structures holds a pointer to the current preference value. So let's not update its value outside of the prefs API otherwise the call to prefs_set_string_value() with pref_current done afterwards will never notify the change and the updated value will not be written in the preference file. Moreover update ExtcapArgument::resetValue() method to have an empty string instead of a NULL pointer. Otherwise prefs_set_string_value() will not notify the change and save the restored default value in the preference file either. Change-Id: Ie70e79d471c75e25705c7654e420a7706ebc4032 Reviewed-on: https://code.wireshark.org/review/23308 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-30Qt: Temporarily disable DP scaling on non-macOS systems.Gerald Combs1-0/+4
Enable device pixel scaling in QCustomPlot only on macOS. Blind attempt at diagnosing / fixing bug 14012. Change-Id: I95e38eaa072d69aef0fe1d642951603800c3a280 Ping-Bug: 14012 Reviewed-on: https://code.wireshark.org/review/23314 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-30Qt: check QVector size before accessing its content and not afterPascal Quantin1-1/+1
Bug: 14017 Change-Id: Ied38551c78b4593f60165d9e3b04bb3913d6b258 Reviewed-on: https://code.wireshark.org/review/23310 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-28extcap: Close control handles when doneStig Bjørlykke1-12/+8
Ensure the event handles are closed when done to avoid leakages. Also improved the control reader to use WaitForSingleObject(). Change-Id: I1679d9c09e247b28117ec05c3e1b0f3ba0e99674 Ping-Bug: 13833 Reviewed-on: https://code.wireshark.org/review/23263 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-08-28iface_lists: Remove locked fieldMikael Kanstrup7-77/+50
It seems the locked field of interface_t was used to avoid simultaneous updates of interface entries from either multiple threads or most likely the recursive UI update callbacks case later identified. Since 802362e ("Avoid recursive scan_local_interfaces operation") the recursive callback behavior is no longer happening. And as code does not have consistent checks the locked field can anyway hardly protect a multi-threaded case if such a case exists. Remove the unnecessary locked field. Ping-Bug: 13864 Change-Id: Idc393f702b82aa6014dd636572d00f0d67120bf3 Reviewed-on: https://code.wireshark.org/review/23262 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>