summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2014-08-09Now that Python is mandatory on Windows, remove checks for it from nmakefilesРоман Донченко2-27/+2
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-09Qt: Fix when build with Qt < 4.8.0Alexis La Goutte2-1/+11
StyleName is not available in Qt < 4.8 Change-Id: Icbfcef7c62b124ce67f1a02ed928a96233ae2d9d Reviewed-on: https://code.wireshark.org/review/3508 Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
2014-08-09Qt: Add missing text to translationAlexis La Goutte1-2/+2
Change-Id: I49d00f73e3e1cf662ead1b01e5d1c0b420c6ccef Reviewed-on: https://code.wireshark.org/review/3504 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-08Qt: Make buildbot happyAlexis La Goutte1-1/+1
capture_interfaces_dialog.cpp: In member function ‘void CaptureInterfacesDialog::updateStatistics()’: capture_interfaces_dialog.cpp:483:100: error: operation on ‘points’ may be undefined [-Werror=sequence-point] QList<int> *points = points = ti->data(col_traffic_, Qt::UserRole).value<QList<int> *>(); Change-Id: I63afb0f207142d516403968f6a3e988f8ad61d4d Reviewed-on: https://code.wireshark.org/review/3491 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-08Use a QTreeWidget instead of QTableWidget.Gerald Combs10-336/+380
Even though Qt's widget naming suggests otherwise, a QTreeWidget is usually a better choice for tables than QTableWidget. The former gives you a nice, clean Plain Old Table while the latter gives you something that looks and acts like a spreadsheet. In this particular instance using QTreeWidget also gives us the option of adding sub-items with detailed information. Do so for attached addresses. Allow sorting by traffic while we're here. Simplify the column hiding logic. Make sure the sparkline delegate isn't editable. Change-Id: Ia36ba2e12c1c0cb86ae5b2154e6afcf6549ae049 Reviewed-on: https://code.wireshark.org/review/3466 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-05Fix whitespace/indentation to match editor modelines.Bill Meier5-173/+173
Change-Id: I3445ae22f10584582d465bf632942e016f5f70ca Reviewed-on: https://code.wireshark.org/review/3452 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-05 device.remote_opts.sampling_method and device.remote_opts.sampling_paramAndersBroman1-0/+2
only exists if we have HAVE_PCAP_SETSAMPLING. Change-Id: I60b98fd0539d1a8f4fcdd3a079f39f8062a43844 Reviewed-on: https://code.wireshark.org/review/3429 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-05Windows: Manage remote interfacesIrene Ruengeler13-321/+1567
Add remote interfaces to capture from a remote host. Change-Id: I34e31d865304f3c6dd972ab9ab1c23829d564665 Reviewed-on: https://code.wireshark.org/review/3405 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-04Write out decode_as entries from the actual dissector tables.Guy Harris4-69/+72
Have a save_decode_as_entries() routine in ui/decode_as_utils.c, that does all the work of saving the entries by iterating through all the changed entries with dissector_all_tables_foreach_changed(). When doing so, write out the selector for integral values in decimal, as older versions of Wireshark only handled decimal values, and some of those older versions are EOLed and won't be fixed. Change-Id: I2dab461604524b98e3515867839a4b86c86c5d7b Reviewed-on: https://code.wireshark.org/review/3426 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Squelch a compiler warning.Guy Harris1-2/+2
Change-Id: I8916bb3cc136c03c39fbdaf5d7bb61c3dae137e6 Reviewed-on: https://code.wireshark.org/review/3422 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Add in a missing newline.Guy Harris1-1/+1
Change-Id: I704be0f8a87c939b5058d574da833b237a32148d Reviewed-on: https://code.wireshark.org/review/3419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-04Support both decimal and hex values for uint dissectors.Guy Harris1-1/+12
And, while we're at it, reject entries with invalid numbers. Change-Id: Ifefe28396cfe391d2d5c7f7ff335d0f041e35a03 Reviewed-on: https://code.wireshark.org/review/3417 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03Fix TCP/UDP/SCTP conversations broken by g59ef97d and g31ecdf5Pascal Quantin1-2/+2
Bug: 10336 Change-Id: Ia0dbe3abfade59a1c9714eacd8a854eafa6cf879 Reviewed-on: https://code.wireshark.org/review/3379 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-03Have ConversationDialog retain data between captures.Gerald Combs1-0/+6
Remove our tap listeners when the capture file closes. This lets us view conversation data for multiple capture files. Change-Id: Ifaa1d2c9d3cd10b1d282aa0070ee2edacc7ce3b0 Reviewed-on: https://code.wireshark.org/review/3376 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-02Rename buffer_ routines to ws_buffer_ to avoid name collisions.Guy Harris5-10/+10
In particular, epan/wslua/lrexlib.c has its own buffer_ routines, causing some linker warnings on some platforms, as reported in bug 10332. (Not to be backported to 1.12, as that would change the API and ABI of libwsutil and libwiretap. We should also make the buffer_ routines in epan/wslua/lrexlib.c static, which should also address this problem, but the name change avoids other potential namespace collisions.) Change-Id: I1d42c7d1778c7e4c019deb2608d476c52001ce28 Reviewed-on: https://code.wireshark.org/review/3351 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-07 10:18:32 +0000