aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/conversations_table.c
AgeCommit message (Collapse)AuthorFilesLines
2016-01-21Avoid returning malloced memory as const [-Wcast-qual]João Valverde1-8/+8
Change-Id: I0b2c03cbde963d13d07ef13284d85b922eec3be9 Reviewed-on: https://code.wireshark.org/review/13439 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-12Refactor "Follow Stream" functionality on all GUI interfaces.Michael Mann1-2/+1
Create a "registration" system for Follow functionality so most of the work can be abstracted into a dissector and GUI can just be responsible for "display". This also removes the global variables in follow.c to open up multithreading possibilities. TCP, UDP and HTTP all have the same "tap interface" for Follow functionality (passing a tvb with byte data to "follow"). SSL still has it's own behavior, so Follow structures have to take that into account. TShark through the Follow registration now has support for HTTP. The only thing possibly missing is dynamic menu generation to further reduce explicit knowledge of Follow "type" (and rely on registration) Bug: 11988 Change-Id: I559d9ee1312406ad0986d4dce9fa67ea2103b339 Reviewed-on: https://code.wireshark.org/review/13161 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-22Use address functions instead of ADDRESS macros in ui.Gerald Combs1-2/+2
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the ui directory. Change-Id: I10e95e66c8da5b880133452ebc484c53046e87ba Reviewed-on: https://code.wireshark.org/review/11199 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05Move utf8_entities.h to wsutilJoão Valverde1-1/+1
Change-Id: I6298b3de5f0a1cb988014ff16082eaf8c2a3c3c0 Reviewed-on: https://code.wireshark.org/review/10786 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-13Replace tabs by spaces when editor modelines has "expandtab"Bill Meier1-1/+1
Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7 Also: tabs-stops should be 8 Reviewed-on: https://code.wireshark.org/review/7100 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-10Remove ep_ allocated memory from get_conversation_filter and just return a ↵Michael Mann1-1/+2
g_alloced string. Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af Reviewed-on: https://code.wireshark.org/review/6480 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08ep_<protocol>_port_to_display -> <protocol>_port_to_displayMichael Mann1-6/+14
Adjust any other ep_ related APIs related to the transition. Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c Reviewed-on: https://code.wireshark.org/review/6388 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05Replace ep_display_to_address with wmem equivalent display_to_address.Michael Mann1-4/+15
Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI. Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9 Reviewed-on: https://code.wireshark.org/review/6318 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-01Remove unneeded includes from ui folderMartin Mathieson1-6/+0
Change-Id: Ifd1eebff9080cd3867e44e4dcb2d2681370ed60a Reviewed-on: https://code.wireshark.org/review/6128 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-31GTK: fix 'Limit to display filter' functionality in Conversations/Endpoints ↵Pascal Quantin1-1/+1
windows Change-Id: I1efb7717c9eb4638fbff292e2953accc3e945ee6 Reviewed-on: https://code.wireshark.org/review/6178 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26UDP: fix 'Follow Stream' button from conversations tabPascal Quantin1-5/+1
Add stream index to conversation table Change-Id: Id63b2cc0000d89297c8638b9a89315096fc5458b Reviewed-on: https://code.wireshark.org/review/6062 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-07GTK (conversations table): Fix Dereference of null pointer found by Clang ↵Alexis La Goutte1-0/+3
analyzer Change-Id: Iebe0c581259b80d905f0ef3e26c1caae07f715d1 Reviewed-on: https://code.wireshark.org/review/4012 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-05Qt: Refactor ConversationDialog for endpoints.Gerald Combs1-3/+3
Create a TrafficTableDialog (for lack of a better name) parent class from the general parts of ConversationDialog. Use it to create EndpointsDialog. Move the contents of conversation_tree_widget.{cpp,h} to conversation_dialog.{cpp,h} to match endpoint_dialog and traffic_table_dialog. Fill in GeoIP columns dynamically instead of using a hard-coded limit. Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and defines. Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust. Clean up some includes. Fix a shadowed variable. Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d Reviewed-on: https://code.wireshark.org/review/3462 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-05Fix whitespace/indentation to match editor modelines.Bill Meier1-2/+2
Change-Id: I3445ae22f10584582d465bf632942e016f5f70ca Reviewed-on: https://code.wireshark.org/review/3452 Reviewed-by: Bill Meier <wmeier@newsguy.com>
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-07-26Refactor "common" Conversation table functionality.Michael Mann1-71/+69
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-21[WIP] Add a conversation dialog.Gerald Combs1-970/+344
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-03Rename and move ui/stat_menu.h to epan/stat_groups.h.Guy Harris1-1/+1
The groups are, technically, independent of the notion of a menu, and, if we have mechanisms by which taps that are not only GUI toolkit-independent but independent of the *existence* of a GUI can be registered, they might want to register themselves in a group just in case they're running in a program that has a GUI. Also, this might fix the Debian package build. Change-Id: I29435681e79748fd4f2e0c5ac872cd11f831d172 Reviewed-on: https://code.wireshark.org/review/2830 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move stat_menu.h to libui.Guy Harris1-1/+1
Change-Id: I7bed7f7931845bc41035535cc62e1fe17c71047d Reviewed-on: https://code.wireshark.org/review/2726 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19More name changes.Guy Harris1-6/+6
Add ep_ to routines that may return ephemeral strings. Change "get_XXX" to "XXX_to_display" if the routine returns a formatted string if it can't get a name. Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88 Reviewed-on: https://code.wireshark.org/review/1217 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19Some routine name changes.Guy Harris1-2/+2
"get_addr_name()" -> "ep_address_to_display()", to 1) indicate that it returns a string with ephemeral scope and 2) indicate that it maps an address to a "displayable" form - a name if possible, an address string if not. "se_get_addr_name()" -> "get_addr_name()", to indicate that its strings have the same scope as "get_ether_name()", "get_hostname()", and "get_hostname6()". Change-Id: If2ab776395c7a4a163fef031d92b7757b5d23838 Reviewed-on: https://code.wireshark.org/review/1216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-05Make launching TCP graphs from conversations window work again, by supplying ↵Martin Mathieson1-2/+4
stream and direction when graph is first created svn path=/trunk/; revision=53797
2013-06-25Move a couple of time-related modules into wsutil.Jeff Morriss1-1/+0
A bunch of files didn't really need to include these header files so remove the include line rather than changing it. svn path=/trunk/; revision=50154
2013-06-16Make the B->A graph label show as A<-B to be consistent with the columnMartin Mathieson1-1/+1
heading. svn path=/trunk/; revision=49954
2013-05-24Have register_param_stat() add menu items, rather than having the menuGuy Harris1-0/+2
items hardcoded into ui/gtk/main_menubar.c Get rid of more stuff implying that the code for adding menu items is used only by Lua, as it's also used by register_param_stat(). Add the items to the menu list sorted by the menu item name shown to the user. Get rid of some const declarations that are lies. Use the label given for a menu item as the label in the menu, rather than parsing it from a token. svn path=/trunk/; revision=49552
2013-03-21Bill pointed out that gtk_window_get_size() + gtk_window_resize()Gerald Combs1-29/+18
doesn't work well in some cases. Switch to window_get_geometry() + gtk_window_set_default_size(). (We use gtk_widget_get_preferred_size() elsewhere but fetches what appeares the minimum width of the top-level window on my machine instead of the actual width.) Use a macro to define the initial conversation and endpoint dialog heigth and increase its value. Use best-guess dialog metrics and UTF8 entities in a few more spots. Add a comment about alignment not working quite right in Gtk3. svn path=/trunk/; revision=48459
2013-03-21From beroset:Bill Meier1-1/+1
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404 Note: The following parts of the patch had been previously done: asn1/snmp/packet-snmp-template.c epan/dissectors/packet-snmp.c epan/dissectors/packet-x11.c Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP' didn't compile and needed a few additional patches. svn path=/trunk/; revision=48447
2013-03-20Add frame_new, which creates a frame that best conforms to the GNOME,Gerald Combs1-2/+18
Windows, and OS X HIGs. Use it in the capture options dialog. The capture options dialog is a bit taller now and could probably use a bit more tweaking. In the capture options, conversation, and endpoint dialogs use our best-guess dialog spacing and pad out some areas. svn path=/trunk/; revision=48445
2013-03-08Use explicit casts.Anders Broman1-35/+35
svn path=/trunk/; revision=48186
2013-02-26Fix spelling/typos found using a list of commonly misspelled words.Bill Meier1-1/+1
The misspellings were mostly in comments but some were in text strings visible to the user. svn path=/trunk/; revision=47899
2013-01-04replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned ↵Michael Mann1-1/+1
int" instead. bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825) svn path=/trunk/; revision=46928
2012-12-26Fix a bunch of warnings.Guy Harris1-4/+4
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-11-14After launching 'Follow stream' or one of the graphs, restore theMartin Mathieson1-0/+22
conversation selection. svn path=/trunk/; revision=46027
2012-11-11Fix compilation error (set but unused variable) and allow TCP graphs to beEvan Huus1-9/+44
launched from the Conversation List -> TCP (IPv4 & IPv6) window as well, since that looked like the intention of the unused variable. svn path=/trunk/; revision=46002
2012-11-11Allow TCP graphs to be launched from the conversation table window.Martin Mathieson1-3/+94
svn path=/trunk/; revision=46001
2012-09-28protect_thread_critical_region, unprotect_thread_critical_region are no-ops, ↵Jakub Zawadzki1-2/+0
cleanup code by removing them. svn path=/trunk/; revision=45201
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45016
2012-08-01Move utf8_entities.h to the "ui" directory. Separate packet informationGerald Combs1-1/+1
items with MIDDLE DOTs. svn path=/trunk/; revision=44194
2012-07-19Shoul be gtk_box_pack_start(GTK_BOX (vbox), message_type_fr, TRUE, TRUE, 0);Anders Broman1-3/+3
svn path=/trunk/; revision=43828
2012-07-19gtk_container_add() -> gtk_box_pack_start().Anders Broman1-3/+3
svn path=/trunk/; revision=43825
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-03g_filename_display_basename() returns a g_mallocated string, so itsGuy Harris1-4/+15
callers either need to free it or their callers need to free it or.... This means that cf_get_display_name() must always return a g_mallocated string and its callers or... must free it. For some of those callers, create a new set_window_title() routine to do the work - they're all using the same pattern. svn path=/trunk/; revision=43047
2012-05-23From Robert Bullen:Anders Broman1-69/+110
The Wireshark and tshark TCP conversations stats tables aggregate reused connections into a single line item https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7248 svn path=/trunk/; revision=42806
2012-05-19Add an 'if' test to prevent a potential null pointer dereferenceBill Meier1-7/+8
identified by clang scan-build. svn path=/trunk/; revision=42719
2012-05-19Rework 'ct_nb_switch_page_cb()' slightly to prevent a scan-build "null ↵Bill Meier1-15/+16
pointer de-reference" message; (In practice, the "null pointer de-reference" would not actually occur ?). svn path=/trunk/; revision=42718
2012-04-20Replace gtk_vbox_new() and gtk_hbox_new() with ws_gtk_box_new().Anders Broman1-4/+4
svn path=/trunk/; revision=42161
2012-01-16Move some headers for UI stuff, and the alert_box.c UI-specific file, toGuy Harris1-1/+2
the ui directory. (Perhaps some other files that would be used by all flavors of Wireshark, for any GUI toolkit or for someting such as ncurses, and not for any command-line tool such as TShark, should be moved there as well.) Shuffle some #includes to put the "ui/XXX.h" includes together. svn path=/trunk/; revision=40529
2012-01-15Move gtk to ui/gtk.Jörg Mayer1-0/+3016
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518