aboutsummaryrefslogtreecommitdiffstats
path: root/epan/conversation_table.h
AgeCommit message (Collapse)AuthorFilesLines
2016-01-21Avoid returning malloced memory as const [-Wcast-qual]João Valverde1-4/+4
Change-Id: I0b2c03cbde963d13d07ef13284d85b922eec3be9 Reviewed-on: https://code.wireshark.org/review/13439 Reviewed-by: João Valverde <j@v6e.pt>
2015-01-18Update some comments to reflect reality.Guy Harris1-3/+6
Get rid of references to ep_ and se_ allocation in code that now uses wmem allocation instead. Fix API documentation of conversation_table.h routines to reflect that as well - some APIs changed to pass wmem scopes. Also, zbee_sec_key_hash() now takes the output buffer as an argument and just returns it, and nobody actually uses the return value, so change it to return void. Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a Reviewed-on: https://code.wireshark.org/review/6636 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-10Remove ep_ allocated memory from get_conversation_filter and just return a ↵Michael Mann1-1/+1
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-1/+1
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-1/+1
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-02tshark: Add endpoints statisticsMichael Mann1-10/+3
"stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector. Change-Id: If34bcb5165b493948e784ba038ab202803a59843 Reviewed-on: https://code.wireshark.org/review/6154 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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: Anders Broman <a.broman58@gmail.com>
2014-11-26conversation_table: fix indent (use 4spaces) and add modelines infoAlexis La Goutte1-9/+22
Change-Id: I76784f0252dcd095a3016ed014632e2a5c09265b Reviewed-on: https://code.wireshark.org/review/5483 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-26conversation_table: fix warning when generate documentation (doxygen)Alexis La Goutte1-0/+2
epan/conversation_table.h:335: warning: The following parameters of add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboolean sender, int num_frames, int num_bytes, hostlist_dissector_info_t *host_info, port_type port_type_val) are not documented: parameter 'host_info' parameter 'port_type_val' Change-Id: I6c3b29750c856eb2665981553fcb8eecd8fe34ee Reviewed-on: https://code.wireshark.org/review/5482 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-05Qt: Refactor ConversationDialog for endpoints.Gerald Combs1-1/+1
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-31Fix error: parameter 'XX' not found in the function declaration ↵Alexis La Goutte1-5/+2
(-Wdocumentation) Change-Id: I0a56fb79d2ac3d874a48695ad0499bda96b4b655 Reviewed-on: https://code.wireshark.org/review/3892 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-18Refactor "common" hostlist/endpoint table functionality.Michael Mann1-21/+97
This is very similar in architecture to the changes made to the Conversation table functionality. Since all conversations have endpoints/hostlists, the "registered" list is shared for both. Change-Id: Ie8c6910a68a1b3f27c5b18c4494f49b9404a7b31 Reviewed-on: https://code.wireshark.org/review/3214 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>
2014-07-30Apply refactored "conversation" (tap) data to TShark.Michael Mann1-3/+7
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-26Refactor "common" Conversation table functionality.Michael Mann1-0/+272
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>