diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 16:24:17 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-08 05:32:32 +0000 |
| commit | 22096781499c7159ff504f7baa743d295aad06bc (patch) | |
| tree | db03b06970119f83d9b33c2920236d398e3a9ca1 /ui/gtk/hostlist_table.c | |
| parent | 907d145f86dd4fb219dcb5b2efcac106bc708de7 (diff) | |
ep_<protocol>_port_to_display -> <protocol>_port_to_display
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>
Diffstat (limited to 'ui/gtk/hostlist_table.c')
| -rw-r--r-- | ui/gtk/hostlist_table.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 5bdb12fbfc..8db01f30ce 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -476,19 +476,21 @@ draw_hostlist_table_addresses(hostlist_table *hl) while (iter_valid) { hostlist_talker_t *host; - char* addr_str; + char *addr_str, *port_str; gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, ENDP_INDEX_COLUMN, &idx, -1); host = &g_array_index(hl->hash.conv_array, hostlist_talker_t, idx); addr_str = (char*)get_conversation_address(NULL, &host->myaddress, hl->resolve_names); + port_str = (char*)get_conversation_port(NULL, host->port, host->ptype, hl->resolve_names); gtk_list_store_set (store, &iter, ENDP_COLUMN_ADDR, addr_str, - ENDP_COLUMN_PORT, get_conversation_port(host->port, host->ptype, hl->resolve_names), + ENDP_COLUMN_PORT, port_str, -1); iter_valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); wmem_free(NULL, addr_str); + wmem_free(NULL, port_str); } gtk_tree_view_set_model(GTK_TREE_VIEW(hl->table), GTK_TREE_MODEL(store)); g_object_unref(store); @@ -554,7 +556,7 @@ draw_hostlist_table_data(hostlist_table *hl) } host->modified = FALSE; if (!iter_valid) { - char* addr_str; + char *addr_str, *port_str; #ifdef HAVE_GEOIP char *geoip[ENDP_NUM_GEOIP_COLUMNS]; guint j; @@ -598,9 +600,10 @@ draw_hostlist_table_data(hostlist_table *hl) #endif /* HAVE_GEOIP */ addr_str = (char*)get_conversation_address(NULL, &host->myaddress, hl->resolve_names); + port_str = (char*)get_conversation_port(NULL, host->port, host->ptype, hl->resolve_names); gtk_list_store_insert_with_values( store, &iter, G_MAXINT, ENDP_COLUMN_ADDR, addr_str, - ENDP_COLUMN_PORT, get_conversation_port(host->port, host->ptype, hl->resolve_names), + ENDP_COLUMN_PORT, port_str, ENDP_COLUMN_PACKETS, host->tx_frames+host->rx_frames, ENDP_COLUMN_BYTES, host->tx_bytes+host->rx_bytes, ENDP_COLUMN_PKT_AB, host->tx_frames, @@ -625,6 +628,7 @@ draw_hostlist_table_data(hostlist_table *hl) ENDP_INDEX_COLUMN, idx, -1); wmem_free(NULL, addr_str); + wmem_free(NULL, port_str); #ifdef HAVE_GEOIP for (j = 0; j < ENDP_NUM_GEOIP_COLUMNS; j++) g_free(geoip[j]); |