aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/lbm_stream_dlg.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-05 11:12:08 -0500
committerAnders Broman <a.broman58@gmail.com>2015-01-06 07:38:18 +0000
commit55de46f317b5e3aba957f4aa44e242aea0d29dfc (patch)
tree3e5c8a3d17ef272b098fc7db62b6f56ab0b96f78 /ui/gtk/lbm_stream_dlg.c
parent124272ec097852c0c0efa587cb1cb1bf8047ff73 (diff)
Replace ep_address_to_str with address_to_str.
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b Reviewed-on: https://code.wireshark.org/review/6323 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>
Diffstat (limited to 'ui/gtk/lbm_stream_dlg.c')
-rw-r--r--ui/gtk/lbm_stream_dlg.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c
index a8cb00763e..a443f7162f 100644
--- a/ui/gtk/lbm_stream_dlg.c
+++ b/ui/gtk/lbm_stream_dlg.c
@@ -85,6 +85,7 @@ static lbmc_stream_dlg_info_t * global_stream_dialog_info = NULL;
static gchar * lbmc_stream_dlg_format_endpoint_ep(const lbm_uim_stream_endpoint_t * endpoint)
{
gchar * buf = NULL;
+ char* addr_str;
if (endpoint->type == lbm_uim_instance_stream)
{
@@ -92,11 +93,13 @@ static gchar * lbmc_stream_dlg_format_endpoint_ep(const lbm_uim_stream_endpoint_
}
else
{
+ addr_str = (char*)address_to_str(NULL, &(endpoint->stream_info.dest.addr));
buf = ep_strdup_printf(
"%" G_GUINT32_FORMAT ":%s:%" G_GUINT16_FORMAT,
endpoint->stream_info.dest.domain,
- ep_address_to_str(&(endpoint->stream_info.dest.addr)),
+ addr_str,
endpoint->stream_info.dest.port);
+ wmem_free(NULL, addr_str);
}
return (buf);
}
@@ -667,8 +670,8 @@ static gboolean lbmc_stream_dlg_tap_packet(void * tap_data, packet_info * pinfo,
substream = (lbmc_stream_dlg_substream_entry_t *)g_malloc(sizeof(lbmc_stream_dlg_substream_entry_t));
substream->substream_id = tapinfo->substream_id;
- substream->endpoint_a = wmem_strdup_printf(wmem_file_scope(), "%s:%" G_GUINT16_FORMAT, ep_address_to_str(&(pinfo->src)), (guint16)pinfo->srcport);
- substream->endpoint_b = wmem_strdup_printf(wmem_file_scope(), "%s:%" G_GUINT16_FORMAT, ep_address_to_str(&(pinfo->dst)), (guint16)pinfo->destport);
+ substream->endpoint_a = wmem_strdup_printf(wmem_file_scope(), "%s:%" G_GUINT16_FORMAT, address_to_str(pinfo->pool, &(pinfo->src)), (guint16)pinfo->srcport);
+ substream->endpoint_b = wmem_strdup_printf(wmem_file_scope(), "%s:%" G_GUINT16_FORMAT, address_to_str(pinfo->pool, &(pinfo->dst)), (guint16)pinfo->destport);
substream->first_frame = (guint32)(~0);
substream->last_frame = 0;
substream->messages = 0;