aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2019-05-09Qt: Fix debug assert in Manage Interfaces dialogTomasz Moń1-1/+1
ManageInterfacesDialog local view model hierarchy is as follows: * InterfaceSortFilterModel * InterfaceTreeCacheModel * InterfaceTreeModel Each model should return model indexes associated with itself. The InterfaceTreeCacheModel::index() broke the data flow by returning model index associated with InterfaceTreeModel. This lead to InterfaceSortFilterModel to pass model index associated with InterfaceTreeModel to a InterfaceTreeCacheModel instance. This resulted in asserts in debug builds. Fix the problem by returning model index associated with the InterfaceTreeCacheModel. Bug: 13744 Change-Id: I03a08dbda0bf7cce8f6832e1f34c1a75b8d3cfab Reviewed-on: https://code.wireshark.org/review/33014 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-05[Automatic update for 2019-05-05]Gerald Combs1-88/+110
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I84a108f730e3ca5247befee360dbb2aaf76b16d0 Reviewed-on: https://code.wireshark.org/review/33081 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-03CMake: Remove wsutil pcap dependencyJoão Valverde3-3/+3
Change-Id: Ic5a3653cb8bcc33e0be108c8b201567e7090f9f5 Reviewed-on: https://code.wireshark.org/review/33043 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2019-05-03CMake: Add libpcap imported library targetJoão Valverde1-0/+2
Change-Id: I5326b87784817fb353329e2d686fe0515c32f6cb Reviewed-on: https://code.wireshark.org/review/33038 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2019-05-02CMake: Check for and use system SpeexDSP libraryJoão Valverde3-1/+8
Change-Id: I8443379d23a2946dd21c12e5e0bd5464ab73ca25 Reviewed-on: https://code.wireshark.org/review/31857 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-05-02Move the Winsock initialization and cleanup to wsutil routines.Guy Harris1-13/+9
Those routines exist on both Windows and UN*X, but they don't do anything on UN*X (they could if it were ever necessary). That eliminates some #ifdefs, and also means that the gory details of initializing Winsock, including the Winsock version being requested, are buried in one routine. The initialization routine returns NULL on success and a pointer to a g_malloc()ated error message on failure; report the error to the user, along with a "report this to the Wireshark developers" suggestion. That means including wsutil/socket.h, which obviates the need to include some headers for socket APIs, as it includes them for you. Change-Id: I9327bbf25effbb441e4217edc5354a4d5ab07186 Reviewed-on: https://code.wireshark.org/review/33045 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-02Qt: Remove the border around inactive+selected packet list itemsStig Bjørlykke1-41/+0
It was a bad idea to bring back the border around inactive+selected packet list items in g009283a6 because it will move the text some pixels down. Revert this part because we now have support for customize the colors. Remove the old "style_inactive_selected" handling because it has no effect. Change-Id: I7599591a957a11d42964f7dc0981411cf3b28b4f Reviewed-on: https://code.wireshark.org/review/32964 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-05-01Windows: Modernize our WSAStartup usage.Gerald Combs1-1/+1
Make sure we link each application that calls WSAStartup with ws2_32.lib. Pass version 2.2 to WSAStartup. Wikipedia says it was introduced in 1996, so we should be OK. Ping-Bug: 15711 Change-Id: I431839e930e7c646669af7373789640b5180ec28 Reviewed-on: https://code.wireshark.org/review/33033 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Tomasz Moń <desowin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-28[Automatic update for 2019-04-28]Gerald Combs1-6/+6
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ib9889adaa79ed8d62895186a8c9eb435b295add7 Reviewed-on: https://code.wireshark.org/review/33002 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-27Move another print dialog reference outside #ifdef HAVE_LIBPCAP/#endif.Guy Harris1-1/+1
Change-Id: I394360c892ca47772604f1e97a6daa23be49f8b4 Reviewed-on: https://code.wireshark.org/review/32995 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-27Umm, you don't need to be able to do live captures in order to print....Guy Harris2-2/+2
Change-Id: I4605a83f9dc5b28447b89639f05e074d05ca5400 Reviewed-on: https://code.wireshark.org/review/32994 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-26Expert Info: Displays comment of each packet in the expert information tabZachary1-0/+6
Bug: 15516 Change-Id: I7e492576cfa53df6dddd016ecc3d977e57bf0f Reviewed-on: https://code.wireshark.org/review/32931 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-26Saving printing preferences from one print window to anotherLuke Lynch4-172/+188
Bug: 14961 Change-Id: I324ac7526da29dca0b484b4dec6d1732e6247d66 Reviewed-on: https://code.wireshark.org/review/32953 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-26Qt: do not fail Conversations -> Follow Stream based on packet listPeter Wu1-5/+7
When a stream index is explicitly given (as is done for items from the Conversations statistics dialog), it does not have to query the stream index from the packet list. Skip checking the packet list then. Bug: 15672 Change-Id: I3f79e6a0997726535c38f9766b894b042ffbf916 Reviewed-on: https://code.wireshark.org/review/32972 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-26Qt: Omit calls without values on selector reloadTomasz Moń2-4/+6
When extcap is started for capture, the argument call is appended to extcap commandline if the associated value is not empty or the argument is boolflag. Unfortunately such rule did not apply when constructing the arguments list for selector reload action. This could lead to extcap being called with the argument calls without required values (eg. multicheck, selector, string). This change makes the --extcap-reload-option selector to not contain argument calls for which the value is not available. Bug: 15725 Change-Id: Ic2456c03b3eb7c7525d19e64ea02afd99ed5f6cb Reviewed-on: https://code.wireshark.org/review/32967 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-24Qt: Support setting custom preferencesTomasz Moń2-0/+4
This makes it possible to set the console.log.level from the Advanced preferences window. Change-Id: I5c5551f089a935eef77f54fdcad0ba060f14edfd Reviewed-on: https://code.wireshark.org/review/32930 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-20Qt: Fix deadlock in extcap toolbar creationTomasz Moń1-2/+2
Deadlock happened if extcap was writing to control pipe before it sent the pcap data and the pipe buffer was not able to hold all the data. The solution is to start reading data from extcap control pipe in capture prepare. This bug was introduced in 018f6bff18785a1c3971a1ccfe3b1b5243d4d154 which was reviewed on https://code.wireshark.org/review/23211 Unfortunately neither the commit message nor the review contains any explaination why it delays the extcap control pipe opening. Bug: 15261 Change-Id: I10d006128f6eb7d63f751d230edbd905eb46416b Reviewed-on: https://code.wireshark.org/review/32898 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-20text import: make TCP dest port truly direction dependantJaap Keuter1-1/+0
During introduction of proper direction support this line was left over, causing TCP dest port to remain independant of direction. This change simply drops the line. See CID 1444115 Change-Id: I4ff362925e422bc57cfa3842127ddaf8695cf303 Reviewed-on: https://code.wireshark.org/review/32902 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-19Qt: Do not turn empty parameter values into spacesTomasz Moń1-1/+1
Before this change extcap parameters without value would be silently changed into a single space on parameters load. This could lead to not only passing unexpected values to extcap call arguments but also "auto-fill" text values without user consent. Example scenario to observe this problem using extcap_example.py was: 1. Open "Example interface 1 for extcap" configuration 2. Click Restore Defaults 3. Enter message, so the capture can be started 4. Make sure "Save parameter on capture start" is enabled 5. Start capture 6. Notice that capture starts normally and extcap arguments are ok 7. Stop capture 8. Start capture again 9. Notice that parameters were reloaded and the extcap was called with following unwanted arguments: --logfile " " --radio " " --multi " " Bug: 15065 Change-Id: I9cd87d9cc8c7e4f8893a066e9f10aa760b52bb97 Reviewed-on: https://code.wireshark.org/review/32887 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-15Don't pass "-g deprecated-gtk" to checkAPIs.pl.Gerald Combs1-2/+1
The deprecated-gtk and deprecated-gtk-todo API groups were removed last year in g7853d0e354. Change-Id: I9b299d54da043bbda91d639ec7c94a58f459149f Reviewed-on: https://code.wireshark.org/review/32865 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-04-15Hava a routine to read the currently-selected frome.Guy Harris10-16/+15
Have cf_read_current_record() take a capture_file as an argument and read, into its wtap_rec and Buffer for the currently-selected frame, information for the currently-selected frame. Rename cf_read_record_r() to cf_read_record(). That gives us 1) a routine that reads the currently-selected frame into the wtap_rec and Buffer for the currently-selected frame and 2) a routine that reads an arbitrary frame into the wtap_rec and Buffer supplied to it. If you *want* the currently-selected record, use the former, otherwise use the latter. Change-Id: If6bd5915dd5bc18334d7b89859822a19234153a4 Reviewed-on: https://code.wireshark.org/review/32858 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-15Qt: Do not pass empty values for extcap boolflagsTomasz Moń1-1/+3
For extcap boolean flags inserted into arguments hash table, the key should be the "call" option and value should be NULL. extcap_add_arg_and_remove_cb() takes care of NULL values by simply omitting them from generated argument list. ws_pipe_spawn_async() appends arguments until either: * argument string is NULL * argument string points directly to NULL terminator (empty string) This bug resulted in extcap arguments being "cut off" after the first "boolflag" present in the commandline arugments. Because arugments hash table is unordered the actual commandline passed to extcap depended on the order in which options were changed in extcap configuration dialog. Bug: 15586 Change-Id: I00f136d3b627064cbfb539b3429aa5e4aef319e1 Reviewed-on: https://code.wireshark.org/review/32848 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-15Give a PacketDialog a Buffer and read directly into it and into its wtap_rec.Guy Harris2-15/+13
We may or may not be working on the currently-selected packet, so there's no reason to use read into the capture_file's wtap_rec and Buffer for the currently-selected packet. We already have a wtap_rec of our own, and we currently have a pointer to a raw packet data array that we can replace with a Buffer of our own; just read into them. Use wtap_rec_init() on the wtap_rec, rather than using its implicit constructor - there's no guarantee that the initial values of the structure members, as defined by C (and C++), are what we want. Use wtap_rec_cleanup() in the destructor; it might do more than the implied destructor (which does nothing). wtap_rec and Buffer are C structures, so they don't get C++ constructors and destructors - we have to use the C ones, which are explicit functions. I think there are memory leaks that this fixes (packet comments and Buffer for the options data, leaked when a PacketDialog window is closed). Change-Id: Ica1d937fd00e4d2f5e4e2275bcd8edddb7a7921b Reviewed-on: https://code.wireshark.org/review/32832 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-13Qt: Display checkboxes for extcap multicheckTomasz Moń2-21/+21
Multicheck was introduced to make it easy to configure USBPcap to capture only from selected devices instead of the whole Root Hub. In GTK+ interface the multicheck enabled options featured a checkbox next to the item entry. Displaying the checkboxes made it intuitive to the user that the items can be checked/unchecked. During the GTK+ to Qt transition, the checkbox idea got lost. The GTK+ interface up to its very last days did show the checkboxes. While it is possible to select the individual devices in Qt UI and actually have USBPcap to capture only on selected devices, it is really unintuitive and the user simply has to know how the multicheck is implemented to take advantage of it. This change brings the multicheck checkboxes to Qt UI. Ping-Bug: 13355 Change-Id: Ia677ff2222c46b9816b8dca4c47e93c72cee834f Reviewed-on: https://code.wireshark.org/review/32813 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-10Qt: use toLocalFile() instead of path() to check for existence.Dario Lombardo1-13/+9
path() incorrectly gives paths as /C:/Program Files/Wireshark/udpdump.html under windows. The leading slash gives a wrong test on the file. Instead toLocalFile() handles it correctly. isLocalFile() has been used to get if we have a local file or a network URL. The reported bug occurred under Windows only, but the change is compatible with Linux paths as well. Accidentally when the test on the file was successful, nothing got called. The routine has been reworked to open an existing local file. Bug: 15592 Change-Id: Id6e3a91dfb4c9d20ae8cb0735eabab64caeff47f Reviewed-on: https://code.wireshark.org/review/32772 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-04-08Use a single wtap_rec and Buffer for an entire capture session.Guy Harris1-27/+36
That way we aren't allocating memory, reading packets from a batch, and freeing the memory for each batch of packets delivered by dumpcap; we do the allocation when the capture starts and the freeing when it finishes. Change-Id: If012ab865f3a99d869535ad10827ad8680c1b10c Reviewed-on: https://code.wireshark.org/review/32766 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-08Use a common wtap_rec and Buffer for all packets.Guy Harris1-13/+15
That way we don't do initialization, possible expansion of the buffer from its initial size, and cleanup for every packet. Change-Id: If967bd8f0cc65631b8b128b2c048d32ba54c8033 Reviewed-on: https://code.wireshark.org/review/32774 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-07[Automatic update for 2019-04-07]Gerald Combs5-20/+0
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I89082c842c38ace16a57b0834c80fae19401794e Reviewed-on: https://code.wireshark.org/review/32767 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-07The wtap from which we're reading to get statistics isn't a statistic itself.Guy Harris1-8/+9
Move it to the capture_session structure from the info_data_t structure, and pass it as an argument to capture_info_new_packets(). Change-Id: I822392bbf48eeb27ba9e17b73775d2fc4349bc17 Reviewed-on: https://code.wireshark.org/review/32765 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-061514 is a better initial Buffer size than 1500.Guy Harris5-5/+5
Ethernet packets without the CRC are 1514 bytes long, not 1500 bytes long; using 1514 bytes will avoid a reallocation for a full-sized Ethernet packet. Change-Id: Ie8da3f13bf3df07e23e4478b7dcf84f06dec6a9d Reviewed-on: https://code.wireshark.org/review/32761 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-06Revert "Get rid of the per-capture_file wtap_rec and Buffer."Peter Wu11-92/+31
This reverts commit 9445403f9558901dc54c88754ff21795ea1803f3. cf_select_packet frees the buffer backing the dissection result (cf->edt) which results in use-after-frees when callers try to access the contents. See for example this call trace: * PacketList::selectionChanged * cf_select_packet(cap_file_, row) * frameSelected(row) -> ByteViewTab::selectedFrameChanged * addTab(source_name, get_data_source_tvb(source)) get_data_source_tvb returns the buffer that backs the dissection and must remain valid even after dissection has completed. If this is not done, then a possibly expensive redissection must be done in order to populate the byte view. The temporary memory savings are not worth it. Bug: 15683 Change-Id: Ia5ec2c7736cdebbac3c5bf46a4e2470c9236262d Reviewed-on: https://code.wireshark.org/review/32758 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-05file_dialog.c: initialize wtap_rec and Buffer in get_stats_for_preview()Pascal Quantin1-0/+5
Change-Id: If491e56cd207feef661d88c8a3c86e86e7f90b77 Reviewed-on: https://code.wireshark.org/review/32733 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-04-05Clean up white space.Guy Harris1-1/+1
Change-Id: I01436a16a81dc8aca28c21e6a0121fbddf3216b7 Reviewed-on: https://code.wireshark.org/review/32734 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-05Get rid of the per-capture_file wtap_rec and Buffer.Guy Harris11-31/+92
Most code that reads from a capture_file already has its own wtap_rec and Buffer; change the remaining ones to do so as well. Change-Id: I9b7c136642bbb375848c37ebe23c9cdeffe830c3 Reviewed-on: https://code.wireshark.org/review/32732 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-05Have wtap_read() fill in a wtap_rec and Buffer.Guy Harris1-6/+6
That makes it - and the routines that implement it - work more like the seek-read routine. Change-Id: I0cace2d0e4c9ebfc21ac98fd1af1ec70f60a240d Reviewed-on: https://code.wireshark.org/review/32727 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-04epan: Convert our PROTO_ITEM_ macros to inline functions.Gerald Combs1-2/+2
Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-02Qt: Add hover style to packet list and proto treeStig Bjørlykke3-1/+40
Highlight the row in packet list and proto tree when mouse hovers above the row. This mimics the behaviour on Windows. Change-Id: I28461f9d7740269bad39893597232fe775f77a86 Reviewed-on: https://code.wireshark.org/review/32619 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-02Qt: Bring back border around inactive+selected packet list itemsStig Bjørlykke1-16/+29
The border around inactive+selected packet list items from aaba30a3 was removed in 00776f83 and 53dfec9b. Add this back again. Use solid color in flat_style_format, no need for a gradient between the same color. Remove the empty default_style_format, it does not add anything. Ping-Bug: 12010 Change-Id: I97df7147b196c73e9f6ec4b9c370ddb6bd54488a Reviewed-on: https://code.wireshark.org/review/32676 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-31Fix -z hosts output if it's from a live capture.Guy Harris1-1/+2
Giving the pathname of a temporary file that will be deleted once TShark exits isn't useful; just refer to "the temporary capture file". Change-Id: I7333ac3cef4e4ae1076a5b0e3c46a04e0328d505 Reviewed-on: https://code.wireshark.org/review/32645 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-03-31[Automatic update for 2019-03-31]Gerald Combs10-603/+108
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I9bea4df366b3d26a0d98f24bd9c420b7368dac9e Reviewed-on: https://code.wireshark.org/review/32641 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-26Print extcap plugins with "tshark -G plugins".Guy Harris1-12/+1
This makes it match the "Plugins" tab of the "About" dialog. While we're at it, use the same code to enumerate extcap plugins in that dialog. Change-Id: I50f402a7ab5d83d46baab070d145558ed8f688f4 Reviewed-on: https://code.wireshark.org/review/32589 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-03-24[Automatic update for 2019-03-24]Gerald Combs10-93/+581
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ib05f06638757aa7d96f6ebfd4cfb5baaf347bf99 Reviewed-on: https://code.wireshark.org/review/32552 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-23Qt: Fix our Expert Info foreground color logic.Gerald Combs2-4/+23
Set the foreground color of an expert info item only when we set its background color, otherwise we show black text on a dark background. Remove an unneeded include while we're here. Change-Id: Ibb835d26d7aa18bfb406b7820b321dc372aed599 Ping-Bug: 15511 Reviewed-on: https://code.wireshark.org/review/32534 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-23Clean up the new-file selection criteria in the GUI.Jeff Morriss2-15/+97
Inspired by looking into https://ask.wireshark.org/question/8009/wireshark-ring-buffer-settings-from-command-line/ ... in which the user was confused because a duration set on the command line was not reflected in the GUI. That's because I0180c43843f5d2f0c2f50153c9ce42ac7fa5aeae added the `interval` ring-buffer option and made the GUI use this rather than `duration`. This was not at all clear in the GUI, though. Since `duration` and `interval` have quite different use cases, expose both in the GUI. Try to clean up and unify the tooltips at the same time. I'm not entirely convinced the tooltips need to be on the checkbox, the spinbox, and the combobox but leave it that way for now. Add some to the man page description of the interval option to hopefully make it clearer what the option does. Change-Id: I3b45fe71c33af64d980dffb5e5ba93e2a15a6b96 Reviewed-on: https://code.wireshark.org/review/32526 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-22Fix order of ring buffer and auto-stop items on the Capture Options page.Jeff Morriss1-148/+148
Apparently the order of the items defined here affects the order in which order tab will cycle through them. See: https://ask.wireshark.org/question/8010/wireshark-ring-buffer-settings-page-tab-sequence/ Sort the items by row and then by column; this gives a natural order when tabbing through. Change-Id: I1137ef59a3fbf506734d828d9bdfa87bddb96c3b Reviewed-on: https://code.wireshark.org/review/32500 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit 19bdf734f753713241adeccf7de0934a2d0c5032) Reviewed-on: https://code.wireshark.org/review/32516
2019-03-22Qt: Welcome page dark mode fixes.Gerald Combs1-2/+2
Adjust the welcome page helpLinks colors. Change-Id: I2befee142253c7f38aa1976f024c97bbc212cb8f Ping-Bug: 15511 Reviewed-on: https://code.wireshark.org/review/32507 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-22Qt: Fix our ColorUtils::themeIsDark comparison.Gerald Combs2-1/+7
Change-Id: Ice109cdd5451b67651f10da7e4001d6d4cb0c7f0 Reviewed-on: https://code.wireshark.org/review/32506 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-21Get rid of unnecessary include.Guy Harris1-1/+0
Change-Id: Ie33b8335acd84d32d282ea8eedac3f5d06f2c5d3 Reviewed-on: https://code.wireshark.org/review/32495 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-03-20Clean up comments and white space.Guy Harris1-4/+4
This is a collection of routines, not a program. Change-Id: I76296576443602b7ea016c5311e66a52a73ee941 Reviewed-on: https://code.wireshark.org/review/32491 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-03-20Put back EOF rule, but without exporting write_current_packet().Guy Harris3-4/+19
Instead, add a new T_EOF token type, call parse_token() with it when we get an EOF, and, in parse_token(), write the current packet if we get a T_EOF token. That's a bit simpler, and would let us treat EOFs in different places differently, if, for example, we want to report warnings for half-finished packets. Change-Id: Ie41a8a1dedf91c34300468e073f18bf806e01892 Reviewed-on: https://code.wireshark.org/review/32489 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 15:24:01 +0000