summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2016-08-04Qt: fix a NULL pointer dereference in extcap_argument_multiselect.cppPascal Quantin1-1/+2
Guard treeView dereference by a cehck on viewModel (as it is done elsewhere in the file, both are allocated at the same time). This can happen for example when USBPcap lists a USB Hub with no devices connected. Change-Id: Iee412b8c95539e9e3d65706c14f62194cafcaffc Reviewed-on: https://code.wireshark.org/review/16885 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-02Qt: remove dead code.Dario Lombardo1-9/+0
Fix CID: 1362828, 1362829, 1362889. Change-Id: I15045c32e96896323ae4d788b7891b2608a0c102 Reviewed-on: https://code.wireshark.org/review/16833 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-08-02autotools: Fix make dist without QtJoão Valverde1-2/+1
Change-Id: I62b1d73eede471535b4ccc7ca68c9f94f25b7417 Reviewed-on: https://code.wireshark.org/review/16826 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-08-01Remove proto_help.[ch]Michael Mann7-759/+0
The functionality hasn't been used for awhile and was deprecated with GTK 2.4 (while our minimum support is at least 2.14). It's also causing unnecessary checkAPI warnings. Change-Id: Ib8da8300a50e2129a46ad188b4ed4d7b2d44b1ca Reviewed-on: https://code.wireshark.org/review/16813 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>
2016-07-31Qt: remove unused constructors.Dario Lombardo1-2/+0
Fix CID 1356297 and 1356300. Change-Id: I17e882addc2fb4a12630940cc1ae3ad62f0b793c Reviewed-on: https://code.wireshark.org/review/16818 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-07-31Qt: add initializer (CID 1159352).Dario Lombardo1-0/+1
Change-Id: I2603b1873acb82bd9840ea4deddcbbb422c018e8 Reviewed-on: https://code.wireshark.org/review/16817 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-07-31lbm_uimflow_dlg.c: Pacify another GTK checkAPIs.pl warning.Michael Mann2-1/+2
Add another "Wireshark" macros to old-gtk-compat.h for GTK API that has been deprecated. Change-Id: Icae4ebae365329fad076324c23d5cee4c89893b5 Reviewed-on: https://code.wireshark.org/review/16803 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-31[Automatic update for 2016-07-31]Gerald Combs7-27/+34
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia414edeaf04efafd0b5eb2e899dbc69d5b42f07d Reviewed-on: https://code.wireshark.org/review/16807 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-31extcap: fix a compile error with Qt4Martin Kaiser1-0/+1
declare ExtcapArgument * as a metatype so it can be used by QVariant CXX extcap_argument.moc.o In file included from /usr/include/qt4/QtCore/qvariant.h:48:0, from /usr/include/qt4/QtCore/qabstractitemmodel.h:45, from /usr/include/qt4/QtGui/qabstractitemview.h:46, from /usr/include/qt4/QtGui/qtreeview.h:45, from /usr/include/qt4/QtGui/qtreewidget.h:45, from /usr/include/qt4/QtGui/QTreeWidget:1, from ./interface_tree.h:38, from ./extcap_options_dialog.h:35, from extcap_options_dialog.cpp:26: /usr/include/qt4/QtCore/qmetatype.h: In instantiation of ‘static int QMetaTypeId2<T>::qt_metatype_id() [with T = ExtcapArgument*]’: /usr/include/qt4/QtCore/qmetatype.h:230:44: required from ‘int qMetaTypeId(T*) [with T = ExtcapArgument*]’ /usr/include/qt4/QtCore/qvariant.h:341:47: required from ‘bool QVariant::canConvert() const [with T = ExtcapArgument*]’ extcap_options_dialog.cpp:378:74: required from here /usr/include/qt4/QtCore/qmetatype.h:169:80: error: ‘qt_metatype_id’ is not a member of ‘QMetaTypeId<ExtcapArgument*>’ make[2]: *** [extcap_options_dialog.o] Error 1 Change-Id: Ib7d052a5cb550ab2595b8d9580d35ffeb62093da Reviewed-on: https://code.wireshark.org/review/16799 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>
2016-07-29Don't discard unknown coloring rules.Gerald Combs1-1/+1
When processing the colorfilters file, keep and disable unknown coloring rules instead of skipping over and discarding them. This should hopefully keep people from losing the standard "Checksum Errors" rule (and it's less rude in general). Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f Reviewed-on: https://code.wireshark.org/review/16673 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-07-29extcap: Restore functionality for optionsRoland Knall7-37/+155
Allow stored options to be restored to their default values. This adds a global cleanup method for extcap and globally defined preference values, which fixes the parameter problem with windows Change-Id: I48e0cf846ef81f4732d652c6a2ad0020db5df08e Reviewed-on: https://code.wireshark.org/review/13741 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-07-28Fix build on NetBSD.Thomas Klausner1-4/+4
sys/siginfo.h (which is included by this file) defines si_code. Change-Id: I59cfe1ea3ec01345965028db4bba3223752459e3 Reviewed-on: https://code.wireshark.org/review/16750 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-26CLI/GTK: Fix compare_stat checksum to include IPv4 offset againJoão Valverde2-2/+2
BYTES was not changed to account for the change of ip_len from 16 to 32 bits. Change-Id: I37b472971fe42a05eb612f88bd38c753f5cf0a08 Reviewed-on: https://code.wireshark.org/review/16706 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-26Cleanup some checkAPI warnings that were missed in previous patches.Michael Mann1-1/+1
Some search/replace of printf, g_warning and GTK APIs were changed to use a ws_ prefix Change-Id: I9beb763a975530a4006d1afbcad079a7d8d4ebf9 Reviewed-on: https://code.wireshark.org/review/16704 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-26Ensure to have a valid string pointer when writing OS SHB optionPascal Quantin2-2/+12
Change-Id: Ib0b6dcdf1700e88383d30bf43739312fce10e1c7 Reviewed-on: https://code.wireshark.org/review/16696 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>
2016-07-26Use a variable consistently.Gerald Combs1-1/+1
We test against "field" in ServiceResponseTimeDialog::filterExpression. Make sure we use it within the test as well. Bug: 12627 Change-Id: If11ab9fcdb8394f4366569185808ec1ddfc34dfe Reviewed-on: https://code.wireshark.org/review/16672 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-07-24Pacify GTK checkAPIs.pl warnings.Michael Mann15-43/+61
Add "Wireshark" macros to old-gtk-compat.h for GTK APIs that have been deprecated. The macros are setup by version number to limit their proliferation (not that I suspect much development will really be done there since GTK is deprecated). Just want to make buildbots happy for the time being. Change-Id: I095f850065166a0bc2e2456fb2e886ab64fdd97d Reviewed-on: https://code.wireshark.org/review/16635 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-24Replace strlen with NULL checks to pacify checkAPIs.plMichael Mann2-4/+4
Change-Id: I5db39cbd531c228da73447bf8899599f82e1889d Reviewed-on: https://code.wireshark.org/review/16624 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-24[Automatic update for 2016-07-24]Gerald Combs7-245/+245
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9a88b1d2ac3fd54cd2b7bfbb652ba504db81df65 Reviewed-on: https://code.wireshark.org/review/16626 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-24Enable "Save As..." iff cf_can_save_as() returns TRUE.Guy Harris1-1/+3
Currently, cf_can_save() really means "*there's something to save* and we can write it out"; "Save As..." should be enabled even if there are no changes to save, in case the user just wants to write the existing file contents out to a new file and have the new file be the current file. That matches the behavior of the GTK+ version. (We might want to enable "Save" even if there are no changes to save; some other programs do that, such as the TextEdit, WordPad, KWrite, and gedit simple text editors. If so, however, we should make "Save" write stuff out even if there are no changes to save. Note, however, that we're a bit different from most "editors", in that we don't read the entire file into memory - we keep the file open and read packet data from it, because we want to be able to read files that won't fit into memory. That *might* change what we ultimately want to do with "Save".) Bug: 12630 Change-Id: I8a2327b5d6ddab7c4f0367f132460b507da38577 Reviewed-on: https://code.wireshark.org/review/16612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-23Replace an #ifdef with g_path_is_absolute()João Valverde1-7/+2
Change-Id: I0df8ea363502bb5e313192b6a10f6df032031699 Reviewed-on: https://code.wireshark.org/review/16601 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-23Suggest using a task dialog, so we can label the buttons.Guy Harris1-18/+16
Change-Id: I2827ab8b5d4a9c17e6c178d9397fcf897a356c9f Reviewed-on: https://code.wireshark.org/review/16603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-23Qt follow stream: don't clear the text widget when doing Save-As.Jeff Morriss1-2/+9
... Otherwise the user will see an empty stream after the Save-As operation. Change-Id: Ibafcb4e4b670807702a8d8a5756544471f2eccc3 Reviewed-on: https://code.wireshark.org/review/16521 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-23Update struct ws_ip with flow label and commentsJoão Valverde2-4/+4
Change field ip_v_hl to version. Change-Id: Ic7ce8d6d083f6413284a7b9ba91a2387b11b29fb Reviewed-on: https://code.wireshark.org/review/16555 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>
2016-07-22Qt: Don't force a repaint in update_progress_dlg.Gerald Combs1-3/+0
Remove a call to update() in order to force a repaint for large capture files. Doing so incurs a small-but-nonzero delay on Windows and it should no longer be needed since we switched to timer-based updates in gb5a585c. Change-Id: I01ff2eed165d15dd1d3218550baa664f43dd442a Reviewed-on: https://code.wireshark.org/review/16589 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-07-22Qt: Add hovered byte lock on left-clickJoão Valverde2-1/+10
Allows marking/unmarking a single byte in the bytes view pane. Ping-Bug: 11547 Change-Id: I574ad7c6218eb08018094ea92ba79b69dbe4b45d Reviewed-on: https://code.wireshark.org/review/16563 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> 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>
2016-07-21Qt: Set the LabelStack CSS only when it changes.Gerald Combs1-1/+4
We call fillLabel repeatedly while loading a capture. Try to avoid applying a style sheet when we do since it can affect performance. Change-Id: I9ee188cb79f7cad340ba35b12011b82004ed8262 Reviewed-on: https://code.wireshark.org/review/16571 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-21No need to check for string option values being null.Guy Harris2-11/+11
A string option, if present, always has a value; it might be a null *string*, but you won't get a null pointer (if the option isn't present, it simply isn't present). Fix some comments while we're at it. Change-Id: I9c1420f56998a7d04de5c5cc2e92631b181f303a Reviewed-on: https://code.wireshark.org/review/16564 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-19Qt: Fix Windows taskbar progress behavior.Gerald Combs1-2/+3
Connect the valueChanged signal each time we show the taskbar progress indicator and disconnect it each time we hide. Fixes stuck behavior seen here when reloading a capture. Change-Id: I11c6205675823e041cda7816237e54fa8a8afb7a Reviewed-on: https://code.wireshark.org/review/16544 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-18Mark the file as having unsaved data if you change address resolution.Guy Harris3-14/+19
That information can, and will, get saved in some file formats, so mark the file as changed so it can and will get saved by "Save". XXX - we need to treat it as a type of data that can be discarded when saving in some file formats, just like comments. Bug: 12629 Change-Id: I1fd69b95f4f7345c339961b4c53c28b98b364e4e Reviewed-on: https://code.wireshark.org/review/16538 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-18Use follow_record_t in SSL follow stream.Jeff Morriss2-133/+2
... rather than a structure (SslDecryptedRecord) which looks (mostly) like a follow_record_t. (The biggest different is the former carries its data in a StringInfo while the latter uses a GByteArray.) With this change following SSL no longer needs its own special code. This also fixes a crash after saving a followed SSL stream (in the Qt UI). Bug: 12616 Change-Id: Ibdb2b85f8a6a30712743a5da420be1e6b78f5b92 Reviewed-on: https://code.wireshark.org/review/16516 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-07-18Rename iph->ip_p to iph->ip_nxtJoão Valverde2-2/+2
struct ws_ip is IP version agnostic. "ip_p" is too terse and less appropriate. Change-Id: I06b8740ab420e20781bf7b9efcf5dce19ad22ab2 Reviewed-on: https://code.wireshark.org/review/16519 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: João Valverde <j@v6e.pt>
2016-07-17[Automatic update for 2016-07-17]Gerald Combs7-476/+476
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I0ca539cf81e1708a6ea8eafbdf91488086e9ee2d Reviewed-on: https://code.wireshark.org/review/16513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-17Fix printf style parameters complaints from VS Code AnalysisMichael Mann2-5/+5
Change-Id: I5669e2442582f899643fae4a9f86ab6d505dde07 Reviewed-on: https://code.wireshark.org/review/16505 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-17Fix sscanf VS Code Analysis warnings.Michael Mann2-4/+5
Some needed to check return value, others were converted to use strtoul. Change-Id: I55aae216f95362b67e006f6e682abbd5ae2c8dcc Reviewed-on: https://code.wireshark.org/review/16502 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-16Use timers instead of packet counts to update our UI.Gerald Combs2-9/+0
In file.c, update our UI based on the time elapsed since we last finished updating the UI instead of on the number of packets we've processed. Remove the timer code from progress_frame.cpp since it's now redundant. This makes the UI more responsive here for captures with large numbers of packets and it should mean that packets_bar_update spends less time repainting, at least on Windows. Change-Id: I9edfa944c44192350bef75b8c0c3ad63bae9c131 Reviewed-on: https://code.wireshark.org/review/16476 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-07-16always update the status bar at the end of a captureMartin Kaiser1-3/+5
We used to update the status bar when we get a stopCapture signal. This does not work for extcap interfaces like randpktdump which creates 1000 packets and then exits. The status bar message "Live capture in progress" is not deleted. For randpktdump, the only reliable indication to detect the end of the "capture" is when the pipe to dumpcap is destroyed. Update the status bar at this time. Change-Id: I59768e7f518625283b2c27c34c428bb115e27a61 Reviewed-on: https://code.wireshark.org/review/16479 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-07-15Qt: Reserve packet list model vectors.Gerald Combs1-7/+15
Preallocate and hold onto the data in the various packet list model vectors. I'm not sure how much this will affect performance, but the documentation suggests that it's the right thing to do in our case. Change-Id: If2d5ad142bf2d61e0bc2302990bd288274447df5 Reviewed-on: https://code.wireshark.org/review/16475 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-14Redo the block options APIs.Guy Harris5-59/+74
A block can have zero or more instances of a given option. We distinguish between "one instance only" options, where a block can have zero or one instance, and "multiple instances allowed" options, where a block can have zero or more instances. For "one instance only" options: "add" routines add an instance if there isn't one already and fail if there is; "set" routines add an instance if there isn't one already and change the value of the existing instance if there is one; "set nth" routines fail; "get" routines return the value of the instance if there is one and fail if there isn't; "get nth" routines fail. For "multiple instances allowed" options: "add" routines add an instance; "set" routines fail; "set nth" routines set the value of the nth instance if there is one and fail otherwise; "get" routines fail; "get nth" routines get the value if the nth instance if there is one and fail otherwise. Rename "optionblock" to just "block"; it describes the contents of a block, including both mandatory items and options. Add some support for NRB options, including IPv4 and IPv6 option types. Change-Id: Iad184f668626c3d1498b2ed00c7f1672e4abf52e Reviewed-on: https://code.wireshark.org/review/16444 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-14Qt: Replace a QMap with a QVector.Gerald Combs2-3/+7
Use a vector to map packet numbers to their respective rows. This reduces load times slightly here. Change-Id: I80dc8656e1d0b6b1b7c75d33c001397b6221d25e Reviewed-on: https://code.wireshark.org/review/16438 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-14Build 2.1.1.Gerald Combs7-154/+154
Change-Id: I2895d29415bb191bf2d7fc0a4468f085085bd4d9 Reviewed-on: https://code.wireshark.org/review/16437 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-14Qt: Allocate packet list records using wmem.Gerald Combs2-10/+41
Add PacketListRecord::operator new, which uses wmem_alloc. Roughly matches the GTK+ UI behavior. Add ColumnTextList which also uses wmem_alloc. Lazily allocate our column text. Change-Id: I86a63cd8ace7764eaab1561bf71b4358af72fe03 Reviewed-on: https://code.wireshark.org/review/16418 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-07-12Add resource usage logging.Gerald Combs1-0/+13
Add log_resource_usage, which prints the current and elapsed user and system times. Add a usage example in packet_list_model.cpp. Change-Id: I747161c754a3731e540821715cc9bb10b3dc821d Reviewed-on: https://code.wireshark.org/review/16383 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-10[Automatic update for 2016-07-10]Gerald Combs7-1183/+1218
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9d1c7b06a449a3b0dc02dd99f33c4e7634e2d1c0 Reviewed-on: https://code.wireshark.org/review/16368 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-10Remember query after closing Follow StreamDavid Morsberger2-4/+31
Update main filter after follow stream dialog is closed - Use: previous_filter if new 'Back' button (passed in follow() method) filter_out_filter_ if 'Filter Out This Stream' button (built by appending !current_stream to previous_filter) leave filter alone if window closed using Close button or window close. (current stream) Change-Id: Ic02edeaffdc65ff0f33cac4cb9afb8cde28963c7 Reviewed-on: https://code.wireshark.org/review/16277 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-07-10Qt: add assert (CID 1311486).Dario Lombardo1-1/+2
Change-Id: I62290f1f1c7856ee431705a64fae2022b850234a Reviewed-on: https://code.wireshark.org/review/16361 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-08Qt: Update scrollbars when change byte view formatStig Bjørlykke1-0/+1
Update scrollbars when changing display format between hex and bits view because the height of the phane will change. Change-Id: I81556c8dbdfb0a34f6c97e76834646a40aed62bb Reviewed-on: https://code.wireshark.org/review/16336 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-07-08Qt: add initializers (CID 1261463).Dario Lombardo1-0/+5
Change-Id: I5c2d5c73e188586a91dde342d6347d25495e0263 Reviewed-on: https://code.wireshark.org/review/16325 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-08Qt: add initializer (CID 1269610).Dario Lombardo1-1/+1
Change-Id: I483e5d3f239f4708f9fc6b11c98869bb1381fb44 Reviewed-on: https://code.wireshark.org/review/16324 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-08Qt: add initializers (CID 1317257).Dario Lombardo1-2/+12
Change-Id: I61a63c187990b119b62e99871832913a0e3f75e4 Reviewed-on: https://code.wireshark.org/review/16323 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>