aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
AgeCommit message (Collapse)AuthorFilesLines
2015-07-03rpc: use direct hashing rather than malloced intsEvan Huus1-3/+3
Equivalent but saves some allocations and is slightly simpler. Change-Id: Id0fde980e11256018641d8fb39330c07f33ee3f5 Reviewed-on: https://code.wireshark.org/review/9474 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-03Add ServiceResponseTimeDialog.Gerald Combs2-19/+17
Add ServiceResponseTimeDialog as a subclass of TapParameterDialog, similar to StatsTreeDialog. Add initial plumbing for statistics menu items and command line invocation. Don't append "..." to menu item names. Don't add menu icons. In each case this avoids repetitive UI clutter. Change-Id: I463b95c93090160bb81d2e80b16aad389dc0bd6c Reviewed-on: https://code.wireshark.org/review/8864 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Convert BOOTP/DHCP tap stats to new "generic stat API".Michael Mann3-286/+0
Change-Id: I0edc3909516452e6497a050b4617f9aafcea2688 Reviewed-on: https://code.wireshark.org/review/9112 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Create very basic "generic" stat tap API to create a "GUI" independent table.Michael Mann23-849/+422
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API. The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there. Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt) Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab Reviewed-on: https://code.wireshark.org/review/9110 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Move some frame control field #defines to a header and use them elsewhere.Guy Harris1-33/+33
Move a bunch of #defines that involve the frame control field to packet-ieee80211.h and have the WLAN statistics tap use them rather than hardcoded numbers. Change-Id: I893cc50e546af67c910755357cefd86c39a1c783 Reviewed-on: https://code.wireshark.org/review/9476 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-02Try to fix: warning C6244: Local declaration of 'airpcap_if_list' hidesAndersBroman8-32/+32
previous declaration. Change-Id: Id0c3b74ac52c427d9c1efdf749dc410bc5bb450f Reviewed-on: https://code.wireshark.org/review/9460 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Have RPC dissector use real dissector tables for its subdissectors instead ↵Michael Mann1-4/+8
of a "homegrown" method. Change-Id: I06d7d4e9747ed8593cf40506cae3a09ae237846b Reviewed-on: https://code.wireshark.org/review/9456 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Have RPC program hash table use native gtk hash functions.Michael Mann1-4/+4
Change-Id: Ie3c6daf69a1ac155ac09794a5ec87c89bbf0607d Reviewed-on: https://code.wireshark.org/review/9454 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-01Explicitly check for DCE/RPC dissector name in the Decode As dialog because ↵Michael Mann1-3/+2
it doesn't have a specific subdissector table to invoke the DCE/RPC "Decode As" tab. bug:10368 Change-Id: Iff94ddaf0c9f4d002be89dab480b6f9550ebd82f Reviewed-on: https://code.wireshark.org/review/3575 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Cal Turney <cturney@charter.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-30Disable overlay scrollingPeter Hatina1-0/+3
Overlay scrolling causes problems when selecting eg. the last packet in Packet List. The last packet gets covered by the scollbar. Change-Id: If23152721a457c7834d6727fc342ee0501a07302 Reviewed-on: https://code.wireshark.org/review/9169 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-06-29gtk: Fix use-after-free on removing recent filePeter Wu1-2/+3
Change-Id: I930b0522d116d53aeef366ae0b43f818b9a81d7f Reviewed-on: https://code.wireshark.org/review/9211 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-29Take all epan_column_info members that always get allocated to "number of ↵Michael Mann4-28/+32
columns" to share their own data structure. Change-Id: Ib982662db6cf68730a7d121eac60d9bc5ae67429 Reviewed-on: https://code.wireshark.org/review/9195 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-25Add Makefile_common.common to wireshark-tap-register.c dependencies (windows)Bill Meier1-1/+1
Change-Id: I22d60e10554e419acda945732faa192fbc21aee6 Reviewed-on: https://code.wireshark.org/review/9163 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-25Regenerate *-tap-register.c when associated Makefile.common is updated (*nix)Bill Meier1-3/+3
Change-Id: I638e4362bbc24e5a0a990dc7339e285e2ac55839 Reviewed-on: https://code.wireshark.org/review/9158 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-25Remove the other g_hash_table_containsEvan Huus1-7/+6
Missed a bunch of them in g131f8f0. Change-Id: I5b1df810a31c26c3ab3cd778f8774519283217c8 Reviewed-on: https://code.wireshark.org/review/9143 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-25Limit the text displayed for the Filter label in the SRT dialog so it ↵Michael Mann2-2/+16
doesn't push the table off of dialog. Add tooltip that displays entire filter string Bug: 6399 Change-Id: I094f3785eb15daf6e05485748f01c36a9a98e163 Reviewed-on: https://code.wireshark.org/review/9142 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-25Plugin Interface: Add GUI callbacksRoland Knall3-1/+49
Rename ext_menubar to a more appropriate plugin_if. External menus can be implemented by plugins to present additional menus for deep-packet analysis. One side-effect of such menus being implemented as plugins is, that they are being executed in different threads and therefore can only use limited access to the main GUI. Also, there is no safe cross-gui (GTK and Qt) way for many features. This patch implements a first functionality, by which a plugin implemented using ext_menubar can apply a display filter to the main view. For now the implementation supports filtering, as well as saving a preference. Change-Id: Iffe4caa954bbeb8ce356352de4dae348a50efba9 Reviewed-on: https://code.wireshark.org/review/8773 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-25Stop using atof/strtod (fixes column sorting of float types)Peter Wu2-4/+4
atof is locale-dependent. In locales such as Swedish, German and Dutch, the dot is a thousand separator, resulting in wrong conversions for floats. While at it, make the mate dissector also be independent of locale. Blacklist atof in checkAPIs. Lemon is still using strtod, but that is not our problem for now. Bug: 11297 Bug: 8964 Change-Id: I6fe3e45eb1d6d95d41aa4f3af1f81a6204a60c63 Reviewed-on: https://code.wireshark.org/review/9116 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-24Remove the last deprecated tvb_length callsEvan Huus1-1/+1
And remove the shims themselves! Change-Id: I511c06eb21eaf68d1dc36bbb9558408807472f9c Reviewed-on: https://code.wireshark.org/review/9088 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-23Regenerate *-tap-register.c when associated Makefile.common is updatedBill Meier1-3/+3
Change-Id: Id9a83aeb285466f409a0e5ee651ef0c9f26ddda8 Reviewed-on: https://code.wireshark.org/review/9055 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-23Use RTD functionality for H.225Michael Mann3-348/+0
This got missed in the initial refactoring. Change-Id: I98dcc0816e065efab9b497f753c8d2d388349ff3 Reviewed-on: https://code.wireshark.org/review/9044 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-22gtk,qt: Fix minor buffer underrunPeter Wu1-1/+1
Avoid accessing the first byte before an empty dirname. No idea why this was not triggered before. Reproduced with an empty Wireshark profile and wireshark and wireshark-qt. Caught with ASAN. Change-Id: I44f8fdab03ad0f24e663df63a1c54567996a3dfc Reviewed-on: https://code.wireshark.org/review/9037 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-22Refactor RTD stats.Michael Mann8-970/+439
Very similar to the refactoring of SRT stats, it provides more commonality of the stats for all GUI interfaces. Currently implemented for TShark and GTK. Affected dissectors: MEGACO, MGCP, Radius Change-Id: Icb73a7e603dc3502b39bf696227fcaae37d4ed21 Reviewed-on: https://code.wireshark.org/review/8998 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>
2015-06-22service_response_time_table.h: fix parameter 'gui_data' not found in the ↵Alexis La Goutte1-1/+1
function declaration [-Wdocumentation] Change-Id: Ie214d654aa91b91da2a1435dce63a822e404669a Reviewed-on: https://code.wireshark.org/review/9010 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-21Further refactor SRT stats.Michael Mann17-3121/+535
Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-16Don't include <wsutil/frequency-utils.h> if it's not needed.Guy Harris3-4/+0
Change-Id: I7c958a31681defb5297428fdb77aa43462b2d160 Reviewed-on: https://code.wireshark.org/review/8953 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16Add the wireless toolbar.Gerald Combs5-4/+1409
Add the wireless toolbar to the Qt UI. Start adding AirPcap support to ui/80211_utils. Add FCS validation routines to ws80211_utils. Move a bunch of AirPcap routines that require epan from caputils to ui/gtk. They were required for driver key management, which we'll leave to the AirPcap Control Panel in the Qt UI. Move frequency-utils to wsutil. Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1 Reviewed-on: https://code.wireshark.org/review/8910 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-12Fix some CMake compiler tests for Win64Graham Bloice1-1/+1
Change-Id: I03244b48e6593d1fe5f4d139fa5d171debeb9fd7 Reviewed-on: https://code.wireshark.org/review/8909 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-12Squelch PortAudio warnings on Windows x64 cmake buildGraham Bloice1-0/+12
pa_win_wmme.c generates 4 warnings due to converting size_t down to a long All 4 get the size_t from a strlen() call on a device path so are unlikely to exceed a long. Change-Id: I1d768b96abf42514149db067b24c98d0b9bdfaed Reviewed-on: https://code.wireshark.org/review/8893 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>
2015-06-11Replace tabs in files with editor modeline "expandtab"Bill Meier2-2/+2
Change-Id: I4667fd4091c510a4c798f79dae333a07dc42dad6 Reviewed-on: https://code.wireshark.org/review/8880 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-10[MSVC 2015] Use intptr_t to make MSVC happy.AndersBroman1-4/+4
Change-Id: I1a39495bc2a752070db8c62136b17d9567bc33ab Reviewed-on: https://code.wireshark.org/review/8856 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>
2015-06-10Use pid_t on UN*X, and HANDLE on Windows, for the process ID.Guy Harris1-2/+2
This avoids type punning; at least with Xcode 7 beta on El Capitan beta, that produces warnings that get turned into errors. Change-Id: I57f47455b9630f359828c07c92a190b5cb33816f Reviewed-on: https://code.wireshark.org/review/8862 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-09GTK: fix a V610 warning reported by PVS-StudioPascal Quantin1-1/+1
Unspecified behavior. Check the shift operator '>>'. The left operand '(- 1)' is negative. Change-Id: I508d451736830a150b8839aa6353ee4c7bcf848f Reviewed-on: https://code.wireshark.org/review/8859 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-09[MSVC 2015] Use intptr_t for "pointer stored as int" to make MSVC happy.Anders1-2/+2
Change-Id: I5dbbea8527a8bb73b17e5a8a5611c3923d82459c Reviewed-on: https://code.wireshark.org/review/8852 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>
2015-06-09Add PortAudio to Windows CMake buildGraham Bloice1-0/+50
Change-Id: I774ff0bf858280f2a5aa551ae1a5e23eedf8dc20 Reviewed-on: https://code.wireshark.org/review/8848 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-07iax2_analysis.c: fix V610 warning reported by PVS-StudioPascal Quantin1-1/+1
Unspecified behavior. Check the shift operator '>>'. The left operand '(- 1)' is negative. Change-Id: Icdb999c2df0e7843086ec811ca4747876fbf2424 Reviewed-on: https://code.wireshark.org/review/8809 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-05Clean up stats_tree_presentation.Gerald Combs1-10/+1
Remove some unused struct members and accompanying callbacks. Change-Id: I64d32ddf886038e8f19bc3f88e86c8d7578db648 Reviewed-on: https://code.wireshark.org/review/8779 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-05Fix a few issues reported by PVS-StudioPascal Quantin1-1/+0
See http://www.viva64.com/en/b/0328/ for details Change-Id: Ic9ddfd690b49401c96cb8a4a277c671f9824be31 Reviewed-on: https://code.wireshark.org/review/8775 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-05GTK: fix a crash when switching a column to custom through 'Edit Column Details'Pascal Quantin1-1/+2
Bug: 11245 Change-Id: I269d4dc8bd1ec23e3e6be4c9432563b8e275c548 Reviewed-on: https://code.wireshark.org/review/8778 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>
2015-06-05Qt: Add the capture and display filter dialog.Gerald Combs1-1/+1
Use a single overloaded dialog, similar to the GTK+ UI. Change-Id: If85db14a7101770f115bef725f5145e0010c518d Reviewed-on: https://code.wireshark.org/review/8776 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-03G_STRUCT_OFFSET gives warnings turned errors with MSVC2015,Anders1-1/+6
use offsetof if defined or define it ourselfs as done in other places in our code base. Change-Id: Ia1c72c9648336e93ba8c14d4bc0371d782835370 Reviewed-on: https://code.wireshark.org/review/8735 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>
2015-06-03Add the Display Filter Expression dialog.Gerald Combs1-2/+1
Changes from the GTK+ UI: - The display filter is built on the fly with immediate syntax feedback. - Slightly different layout. - You can search for fields. Make the plain SyntaxLineEdit a bit more plain. Bug: 11128 Change-Id: I06a48cd7b9ba7b9dc193b0199540aede4eb62fa7 Reviewed-on: https://code.wireshark.org/review/8742 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-01gtk: Don't handle deprecation warnings as errorsBalint Reczey2-2/+2
This fixes compilation with latest gdk-pixbuf. I plan rewriting the code to drop deprecaated function usage in a different commit and reverting this one. Ping-Bug: 10750 Change-Id: I400e34e625b147a4858e73240602d75910c6eece Reviewed-on: https://code.wireshark.org/review/8720 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-20Get rid of XML step for adding menubar items.Guy Harris1-175/+122
And don't create extra action groups; just add them to the main menubar's action group. Rename add_menu_item() to add_menu_item_to_main_menubar() to make that clearer. Change-Id: I6b564620decd8d0c9c4a2cb79b1a03df5ff27a4b Reviewed-on: https://code.wireshark.org/review/8555 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-20Start exposing the filter field of a tap listener to the RTP GUI APIs.Michael Mann3-4/+6
A tap listener has the ability to apply a filter (typically the display filter). Add a parameter to RTP GUI API functions to allow them to pass in a filter. Bug: 996 Change-Id: Ib184dfb023be5d1d24a0d842b4039311426b5293 Reviewed-on: https://code.wireshark.org/review/8468 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>
2015-05-20Have an add_menu_item() to add items to the menu bar, and use it.Guy Harris1-180/+143
Have it contain all the code to add an item to the menu bar; we may be able to get rid of the "construct the XML"/"have GTK+ parse the UI" code in favor of code that directly does the actions to add the item to the menu without the intermediate XML. Use it for both the items registered with register_menu_bar_menu_items() and for the items registered with the new external menu mechanism. Change-Id: Ibcac03173580bb83ae46cde1d1435f71767d8355 Reviewed-on: https://code.wireshark.org/review/8544 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-16Main (menubar): fix C++ style comments are not allowed in ISO C90Alexis La Goutte1-1/+1
Change-Id: Ia8ae6780027a63c4a88ea8d2a10ba1e0f8931f25 Reviewed-on: https://code.wireshark.org/review/8472 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-13Change the formatting strings used to create the Conversation Filter submenuMichael Mann1-7/+12
Bug: 11178 Change-Id: I4a5ae1399da8206efb29c059437d56da06a539a9 Reviewed-on: https://code.wireshark.org/review/8417 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: Evan Huus <eapache@gmail.com>
2015-05-08A NULL is needed at the end of the argument list for g_object_set().Guy Harris1-1/+1
Change-Id: I086403275d596f19ef44374f956654cf94ac9a11 Reviewed-on: https://code.wireshark.org/review/8343 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-08Recent files: Disable mnemonic accelerator key for menu itemJiří Engelthaler1-0/+8
If recent file name contains underscore, menu item parses it as mnemonic accelerator. So disabled using underline for recent file menu item. Change-Id: I1253a0103e750a14a69f0d064587e0eb56581b82 Reviewed-on: https://code.wireshark.org/review/8325 Reviewed-by: Anders Broman <a.broman58@gmail.com>