diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-04 21:40:05 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-05 13:55:04 +0000 |
| commit | 22b4ec91c006fec65e655ccbb0dbbc32438f820b (patch) | |
| tree | 033dc9de28b8a79550a4dd769fcfb249df4be38c /ui/gtk/conversations_table.c | |
| parent | 9a7318a184e25e08d1c8449e3f826e0a5c66ca3b (diff) | |
| download | wireshark-22b4ec91c006fec65e655ccbb0dbbc32438f820b.tar.gz | |
Replace ep_display_to_address with wmem equivalent display_to_address.
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>
Diffstat (limited to 'ui/gtk/conversations_table.c')
| -rw-r--r-- | ui/gtk/conversations_table.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 5f9998667f..db59acbc11 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -1593,16 +1593,21 @@ draw_ct_table_addresses(conversations_table *ct) while (iter_valid) { conv_item_t *conv_item; + char *src_addr, *dst_addr; gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, CONV_INDEX_COLUMN, &idx, -1); conv_item = &g_array_index(ct->hash.conv_array, conv_item_t, idx); + src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); + dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); gtk_list_store_set (store, &iter, - CONV_COLUMN_SRC_ADDR, get_conversation_address(&conv_item->src_address, ct->resolve_names), + CONV_COLUMN_SRC_ADDR, src_addr, CONV_COLUMN_SRC_PORT, get_conversation_port(conv_item->src_port, conv_item->ptype, ct->resolve_names), - CONV_COLUMN_DST_ADDR, get_conversation_address(&conv_item->dst_address, ct->resolve_names), + CONV_COLUMN_DST_ADDR, dst_addr, CONV_COLUMN_DST_PORT, get_conversation_port(conv_item->dst_port, conv_item->ptype, ct->resolve_names), -1); iter_valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); + wmem_free(NULL, src_addr); + wmem_free(NULL, dst_addr); } gtk_tree_view_set_model(GTK_TREE_VIEW(ct->table), GTK_TREE_MODEL(store)); @@ -1707,11 +1712,15 @@ draw_ct_table_data(conversations_table *ct) CONV_COLUMN_BPS_BA, rx_ptr, -1); } else { + char *src_addr, *dst_addr; + + src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); + dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); /* New row. All entries, including fixed ones */ gtk_list_store_insert_with_values(store, &iter, G_MAXINT, - CONV_COLUMN_SRC_ADDR, get_conversation_address(&conv_item->src_address, ct->resolve_names), + CONV_COLUMN_SRC_ADDR, src_addr, CONV_COLUMN_SRC_PORT, get_conversation_port(conv_item->src_port, conv_item->ptype, ct->resolve_names), - CONV_COLUMN_DST_ADDR, get_conversation_address(&conv_item->dst_address, ct->resolve_names), + CONV_COLUMN_DST_ADDR, dst_addr, CONV_COLUMN_DST_PORT, get_conversation_port(conv_item->dst_port, conv_item->ptype, ct->resolve_names), CONV_COLUMN_PACKETS, conv_item->tx_frames+conv_item->rx_frames, CONV_COLUMN_BYTES, conv_item->tx_bytes+conv_item->rx_bytes, @@ -1725,6 +1734,8 @@ draw_ct_table_data(conversations_table *ct) CONV_COLUMN_BPS_BA, rx_ptr, CONV_INDEX_COLUMN, idx, -1); + wmem_free(NULL, src_addr); + wmem_free(NULL, dst_addr); } iter_valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); |