aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2014-08-02CompiledFilterOutput dialog fixes and updates.Gerald Combs4-50/+62
Apply a layout to the "Compiled Filter Output" dialog. Render the filter as monospaced text. Don't add an "expert OK" icon to the list. It doesn't seem to indicate any sort of status. Use a "Close" button instead of "OK". According to http://uxmovement.com/buttons/why-the-ok-button-is-no-longer-okay/ "OK" implies we're going to perform some sort of action. Add a "Copy" button while we're here. Change-Id: Ia63f3032916e322fa9f4f2d465140b128b4f8078 Reviewed-on: https://code.wireshark.org/review/3338 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-01Move the AirPcap stuff into caputils.Guy Harris11-22/+21
Change-Id: I64b45dad36a3ec491aeb9de3439b4fe19b46f9d8 Reviewed-on: https://code.wireshark.org/review/3308 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31addr_resolution_dlg.c: "OK" button should *do* something: treat as cxl.Bill Meier1-1/+1
Also: remove vestigial line of commented-out code. Change-Id: Ieb41a0e39a4e0ec14031b1dbd38fc0d7ad47a635 Reviewed-on: https://code.wireshark.org/review/3278 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-31addr_resolution_dlg.c: Fix crash when 'Statistics ! Show address resolution' ↵Bill Meier1-1/+1
is invoked. (Introduced when the ipv4_hash_table key format was changed in 5d98ab67) Change-Id: Ie5d1314f7c7cc8bc71dca8a2db05e34a0a7776d7 Reviewed-on: https://code.wireshark.org/review/3277 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-30Fix dist.Gerald Combs1-0/+3
Add ui/cli/tshark-tap.h and packaging/nsis/windeployqt-to-nsis.ps1. Change-Id: I00465aed3f33595ad50be0ba5d0ed0eae54e1137 Reviewed-on: https://code.wireshark.org/review/3268 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30Fix the build: add a few more G_GINT64_MODIFIER's when printing 64-bit numbers.Jeff Morriss1-1/+3
Also use %u instead of %d for these unsigned numbers. Change-Id: I3d1df3bdcc3c68193b49ba8daf1dc56171356290 Reviewed-on: https://code.wireshark.org/review/3266 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-30Apply refactored "conversation" (tap) data to TShark.Michael Mann2-480/+75
I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature. But at least all types of conversations allowed are in sync with Wireshark GUI. Bug:6310 Change-Id: I722837df510a39dadc1f9a07a99275509516698c Reviewed-on: https://code.wireshark.org/review/3212 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-29Fix Argument with 'nonnull' attribute passed null found by ClangAlexis La Goutte1-0/+5
Change-Id: I719d8adeb4bc6dbd1e34fe56f7cf68e4c6286dc9 Reviewed-on: https://code.wireshark.org/review/3246 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29Ensure that QT5_BASE_DIR is known by QtShark.proPascal Quantin1-1/+1
Otherwise the call to winqtdeploy will fail if it is not already in the PATH Change-Id: I74db604a6fd45204bda8d6ac9d9c98c0c12598ec Reviewed-on: https://code.wireshark.org/review/3218 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-07-29Fix heap-use-after-free via setlocalePeter Wu6-6/+49
setlocale returns a statically-allocated memory which can be modified by subsequent calls of setlocale. This triggers a heap-use-after free in ASAN when the setlocale function is called again with the previous pointer. This was found when trying to use the "Show All Streams" option via the Telephony -> RTP menu. While at it, add some modelines Change-Id: Ide47e877ce828734fd8c5c1b064d9c505ba2b37a Reviewed-on: https://code.wireshark.org/review/3234 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-28From 竹下 恵 (Megumi Takeshita)Martin Kaiser2-192/+192
update the japanese translation for the Qt user interface Change-Id: Ib4a0f6fc1d58cd71310703950c0f1e646b1d74ad Reviewed-on: https://code.wireshark.org/review/3232 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-27Make value_string_ext const-correct.Kevin Cox1-1/+1
There is still some const-incorrect usage of them but those can be ironed out after this change has been made. Change-Id: Iba0631c804bdab34d7c0232b49967130e3370488 Reviewed-on: https://code.wireshark.org/review/3199 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>
2014-07-26Refactor "common" Conversation table functionality.Michael Mann36-2760/+426
Refactor (non-GUI) conversation table functionality from gtk/Qt to epan. Also refactor "common GUI" conversation table functionality. The idea is to not have to modify the GUI when a dissector adds a new "conversation type" Change-Id: I11f08d0d7edd631218663ba4b902c4a4c849acda Reviewed-on: https://code.wireshark.org/review/3113 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-25Don't use capture_interface_list() in this dialog.Guy Harris1-19/+17
Instead, if we have no interfaces in global_capture_opts.all_ifaces, use the refreshLocalInterfaces() method of the main WiresharkApplication to try to fetch them; that way, if we do find interfaces, a signal will be emitted to cause the rest of the UI to reflect their arrival. Change-Id: I59077ef855127fd6bddaa40126c1835a659ffc30 Reviewed-on: https://code.wireshark.org/review/3202 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-25Make Capture -> Refresh Interfaces work.Guy Harris4-0/+25
Add a "refresh the local interfaces" method to WiresharkApplication, which reloads the interface list and emits the "interface list changed" signal, and invoke it from the Capture -> Refresh Interfaces menu item. Change-Id: I9641e4b341eb44d773c556691d8bb9dac776ea9d Reviewed-on: https://code.wireshark.org/review/3195 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-25Handle empty interface lists when the list changes.Guy Harris3-81/+53
Don't assume that a change to the interface list is from a non-empty interface list to a different non-empty interface list. Change-Id: I94054ca0cf2661704aff1869385aa2155c19677d Reviewed-on: https://code.wireshark.org/review/3193 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-23Fix (-W)documentation error found by ClangAlexis La Goutte2-13/+5
Change-Id: I2d2bbc211e98ad24a27c855031f670b7bdbd530e Reviewed-on: https://code.wireshark.org/review/3162 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-23Clean up indentation (consistent two-space indentation).Guy Harris1-72/+72
Change-Id: I90210a051f820e70b8b41e5376f881f812c9539f Reviewed-on: https://code.wireshark.org/review/3173 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-23Clean up indentation (consistent 4-space indentation).Guy Harris1-18/+18
Change-Id: I16062c173ed72af266ff3b3d36f2afb92a49c60c Reviewed-on: https://code.wireshark.org/review/3171 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-22Get rid of NO_INTERFACES_FOUND - it's not an error.Guy Harris4-29/+19
It just means "pcap didn't give me any interfaces, and didn't report an error". Hopefully, in the future, there will be pcap APIs that distinguish between the (admittedly unlikely, these days) case of "there really *are* no interfaces on which *anybody* can capture" and "you don't have sufficient permission to capture", and we can report the latter as an error. (Given that pcap supports more than just "regular interfaces", though, there are cases where you don't have permission to capture on those but you have permission to capture raw USB traffic, for example, so perhaps what's really needed is per-interface indications of permissions.) Change-Id: I7b8abb0829e8502f5259c95e8af31655f79d36a1 Reviewed-on: https://code.wireshark.org/review/3169 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-22Don't return an error string for NO_INTERFACES_FOUND.Guy Harris1-3/+7
Most callers of capture_interface_list() don't expect an error string for NO_INTERFACES_FOUND, because that's not really an error, it's just a statement of face (and perhaps an error of 0 should be returned), so they don't bother freeing the error string, causing a leak. Instead, have the one place that *did* expect it to return an error string just put "No interfaces found" itself. Also, have that place not check for an error string if interfaces *were* found, as no error code or string is returned in that case. Change-Id: I9cb8ed7ad22810b23e2251d2833d9b7ab02eec03 Reviewed-on: https://code.wireshark.org/review/3165 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-22Fixed C++ style commentGraham Bloice1-1/+1
Change-Id: Ife56bb2849b4384c8ea6af3b3913b1a0fbe9ff9e Reviewed-on: https://code.wireshark.org/review/3160 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-22Makes the RTP Player graphs work with GTK3Patrice Fournier1-0/+19
Change-Id: I91c689eb3a35f02f8fa4de64fb6e3337d42c9190 Partial-bug: 9891 Reviewed-on: https://code.wireshark.org/review/3090 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-07-22Our users are not particpants in a comedy sketch.Gerald Combs3-11/+24
In way too many places in the GTK+ code we wait for the user to do something wrong, leap out from behind the bushes, yell "AHA!", and hit them in the face with a herring^W error dialog. We really need to not do that. We also shouldn't carry that behavior over to the Qt UI. If the user shouldn't press a button it should be disabled. Do so for the "Compile BPF" and "Start" buttons. Change-Id: Iad9c15951d5ae640ea82ca74d5f0c26e88bd2554 Reviewed-on: https://code.wireshark.org/review/3156 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-22Don't connect to non-existent slots.Guy Harris3-2/+7
(Run-time warning, not compile-time error, alas.) Change-Id: I002ca132d2c7cbc2cfd802438edb4509ff76bcbc Reviewed-on: https://code.wireshark.org/review/3155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-21Rename ifListChanged to localInterfaceListChanged.Guy Harris5-5/+5
That better indicates that it reflects changes to the list of local interfaces on the system, as supplied by libpcap/WinPcap, not to any other interface list we maintain, such as lists of remote interfaces, or the list of non-hidden interfaces. Change-Id: Idf79b365e07f2e3eaa83c105ae9cd7ace54c435e Reviewed-on: https://code.wireshark.org/review/3154 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-21[WIP] Add a conversation dialog.Gerald Combs63-1265/+3511
Items are sorted by value. Move common conversation code to ui/conversation_hash.[ch]. Add a conversation_type_e enum along with convenience functions for fetching titles, tap names, etc. We have a single main dialog instead of a main dialog + individual protocol dialogs. It de-clutters the statistics menu and results in simpler code. Conversation type tabs can be added and removed within the dialog itself. The tab list is sticky and saved with the current profile when the dialog closes. Data can be copied as CSV or YAML. Add a FilterAction class and a corresponding filterAction slot to MainWindow. Use it for the Conversations context menu. Add an addressResolutionChanged signal and related plumbing. Get rid of the iterator members in the conversation item struct. Update the GTK+ code accordingly. Excercise for the reader: - Update TShark to use the common hash code. Ping-Bug: 9231 Ping-Bug: 8703 Ping-Bug: 6727 Change-Id: I8728d771fc5b1a85937bed9d898e53c3ecc3a544 Reviewed-on: https://code.wireshark.org/review/2987 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-21Have the interface "tree" directly connect to ifListChanged.Guy Harris2-1/+2
Then have the capture interfaces dialog connect only *its* code to update *its* list of interfaces to ifListChanged, rather than connecting a routine that then emits interfaceListChanged. This makes it the responsibility of each widget that displays local interfaces to connect to the ifListChanged signal. Change-Id: Iff8e8ca4202c8784eed58c8f05175d986a16baea Reviewed-on: https://code.wireshark.org/review/3153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-21Make the Qt version update displays when interfaces appear or disappear.Guy Harris4-0/+84
Change-Id: If1218baaae9dcd93ddb1cea81ac5457f90a57c6c Reviewed-on: https://code.wireshark.org/review/3152 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-21Add a warning that not all command line options are implementedJoerg Mayer1-0/+1
Change-Id: If1b12fed6d04623a4265131a2ff666d4a937d382 Reviewed-on: https://code.wireshark.org/review/3151 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-20Get rid of #if 0'ed out includes of capture-pcap-util.h.Guy Harris6-18/+0
Change-Id: Ie3678a08ed9b3d46b22e7c59eef74e6e9636ae59 Reviewed-on: https://code.wireshark.org/review/3140 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-20Add qtshark_ja_JP.qm to the list of .qm files we distribute.Guy Harris1-4/+5
Change-Id: I95a724c196bd5730af96439f8854169166c59e7a Reviewed-on: https://code.wireshark.org/review/3135 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-20start support for the Japanese language in the Qt versionMartin Kaiser8-0/+8563
just the framework and some simple translations Change-Id: I7653a9c6ab26b391bfe2942d088d233996030576 Reviewed-on: https://code.wireshark.org/review/3134 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-07-20Use forward slashes in paths to runlex.shРоман Донченко1-1/+1
This gets rid of "MS-DOS style path detected" warnings from Cygwin. Change-Id: Id10429669704aa371dbf56a9398947c8002260ad Reviewed-on: https://code.wireshark.org/review/3024 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Wireshark Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-17Try to make tap operations in the Qt UI more responsive.Gerald Combs1-0/+3
Add single-shot timers to ramp up the tap update interval and update taps when we finish reading the capture file. Change-Id: Ia1694b47ffd2705b6a06aa50c21e675a64aefeac Reviewed-on: https://code.wireshark.org/review/3099 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-16Mark unused parameter as suchEvan Huus1-1/+1
Change-Id: I6a7fa5943957712fbd9e4801702a57dbb2d21b81 Reviewed-on: https://code.wireshark.org/review/3079 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-16Allow expert info to show only items in the display filter.Michael Mann1-17/+59
This was started by Chris Maynard before Qt was announced and I just polished it off for inclusion in GTK version of Wireshark. This also can be used as input into the Qt version of the Expert Info "dialog" since it hasn't been written yet. Personally I like the "template" the Qt statistics dialog has with the display filter built it. I think that would work well for the Expert Info dialog as well. bug:1860 Change-Id: Icaada6e7900f22b0a3d97c2a5656edfd8d8c8b7f Reviewed-on: https://code.wireshark.org/review/3035 Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-16Move the monitor-for-interface-list-changes stuff to the caputils library.Guy Harris1-1/+1
Change-Id: Ie0d4504688602c2aa8e9788643b079930ca7d305 Reviewed-on: https://code.wireshark.org/review/3076 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-16The plural is "PDUs", not "PDU:s".Guy Harris3-4/+4
Change-Id: I4bef734ef17b02e254b742744e2debd3038e98a0 Reviewed-on: https://code.wireshark.org/review/3074 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-16"Export PDUs to File" pops up a dialog, so put "..." after it.Guy Harris6-7/+7
Also, capitalize "File" in the GTK+ version (it's already capitalized in the Qt version). Change-Id: I27eb27022930b1c0e0321cd1a1446c3b9dc1bd17 Reviewed-on: https://code.wireshark.org/review/3072 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-15Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-9/+12
Change-Id: I3e84e987ad26019d7536baf4d90d6b0c684f6ec1 Reviewed-on: https://code.wireshark.org/review/3054 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-15Cleanup the "export PDU" common code.Guy Harris4-8/+7
exp_pdu_file_open() isn't used outside ui/tap_export_pdu.c; make it static. do_export_pdu() isn't a tap routine, it's called *from* tap routines, so its last argument doesn't need to be a generic pointer; its last argument must be a pointer to an exp_pdu_t, so declare it as such. Clean up comments while we're at it. Change-Id: Iab51b54a0c272052d7876110a095f2fff66fa2c1 Reviewed-on: https://code.wireshark.org/review/3060 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-14Treat CR-LF at the end of a line like LF.Guy Harris1-13/+37
That way, if we're reading a Windows-format file on UN*X, we handle it the same way we'd handle a UN*X-format file. This handles bug 10272 for the cfilter and dfilter file; there are other configuration files that may need code changes as well. While we're at it, don't hand non-ASCII characters to isspace(). Change-Id: I4f5efeaa938bcb2d85737ab136c3ca19ea1ddb5b Reviewed-on: https://code.wireshark.org/review/3045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-12fix scan_local_interfaces()Martin Kaiser1-0/+19
when we delete an interface from all_ifaces, delete it from ifaces as well remove its selected status if it was selected at the moment, an interface that was used for capturing before will never be removed from the list of interfaces even if it becomes unavailable as it remains in ifaces and will be re-added to all_ifaces in scan_local_interfaces() new helper function capture_opts_del_iface() to delete an entry from ifaces and free all its components Change-Id: Ie3271a7ed086367e511d3a971f3b68cfc014115d Reviewed-on: https://code.wireshark.org/review/2965 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-11Add plumbing for stat commands ("-z ...").Gerald Combs9-67/+145
Trigger dialog creation by passing a method name to QMetaObject::invokeMethod. I'm not entirely sure this is sane but it seems to work OK. Move getopt processing further down in the main initialization sequence to more closely match GTK+ and allow for stat command registration. Change-Id: I5cd5375fa71dbadac69d528b2ba3bb13598dc3f6 Reviewed-on: https://code.wireshark.org/review/2964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-11Try to fix the build.AndersBroman2-6/+6
Change-Id: I06e813db6af41d9fa4effcf2b23cf91d72c8c0ec Reviewed-on: https://code.wireshark.org/review/2998 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11GTK Remote CapturingIrene Ruengeler9-314/+210
Move the GTK files necessary for managing the recnet remote host from capture_dlg.c to recent.c in order to use them in QT, too. Change-Id: I3f3fd31ce928162de08c6db7309ef2a9b1e97760 Reviewed-on: https://code.wireshark.org/review/2955 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-11Strip some trailing whitespace; Fix some indentation; Add editor-modelines ↵Bill Meier2-23/+23
as needed. Change-Id: I943153e28f468070d86535abad7be032e1386118 Reviewed-on: https://code.wireshark.org/review/2994 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-10Revert "See if we can get rid of the "lib" in front of "wsutil" on Windows."Guy Harris1-2/+2
This reverts commit c5a50df51f38e10e3a3618d9394364f60a1ca8af. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I6ead152fc308480d02266b0f3f0caaa873caf6d2 Reviewed-on: https://code.wireshark.org/review/2973 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09See if we can get rid of the "lib" in front of "wsutil" on Windows.Guy Harris1-2/+2
"libXXX" is a UN*X convention; see whether we can do without it on Windows. Change-Id: I03a377ed5121a8dff7a53203b34e441abffcbb85 Reviewed-on: https://code.wireshark.org/review/2968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 06:47:54 +0000