From 9407160e05ab8031014b1a7db9488b3f0f7e041b Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sun, 21 Dec 2014 20:56:33 +0100 Subject: Do not use packet scoped memory in GUI It will trigger an assertion Change-Id: I2436c11b45e1505a94256a06ed3ad0c5480e034b Reviewed-on: https://code.wireshark.org/review/5953 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin --- ui/gtk/lbm_stream_dlg.c | 8 ++++---- ui/gtk/lbm_uimflow_dlg.c | 4 ++-- ui/gtk/rtp_stream_dlg.c | 8 ++++---- ui/qt/lbm_lbtrm_transport_dialog.cpp | 4 ++-- ui/qt/lbm_lbtru_transport_dialog.cpp | 4 ++-- ui/qt/lbm_stream_dialog.cpp | 6 +++--- ui/qt/lbm_uimflow_dialog.cpp | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'ui') diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c index 475183ebd7..b3266ec6d5 100644 --- a/ui/gtk/lbm_stream_dlg.c +++ b/ui/gtk/lbm_stream_dlg.c @@ -97,10 +97,10 @@ static gchar * lbmc_stream_dlg_format_endpoint_ep(const lbm_uim_stream_endpoint_ } else { - buf = wmem_strdup_printf(wmem_packet_scope(), + buf = ep_strdup_printf( "%" G_GUINT32_FORMAT ":%s:%" G_GUINT16_FORMAT, endpoint->stream_info.dest.domain, - address_to_str(wmem_packet_scope(), &(endpoint->stream_info.dest.addr)), + ep_address_to_str(&(endpoint->stream_info.dest.addr)), endpoint->stream_info.dest.port); } return (buf); @@ -672,8 +672,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, address_to_str(wmem_packet_scope(), &(pinfo->src)), (guint16)pinfo->srcport); - substream->endpoint_b = wmem_strdup_printf(wmem_file_scope(), "%s:%" G_GUINT16_FORMAT, address_to_str(wmem_packet_scope(), &(pinfo->dst)), (guint16)pinfo->destport); + 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->first_frame = (guint32)(~0); substream->last_frame = 0; substream->messages = 0; diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c index a2f17ec722..bdb141e4d0 100644 --- a/ui/gtk/lbm_uimflow_dlg.c +++ b/ui/gtk/lbm_uimflow_dlg.c @@ -194,10 +194,10 @@ static int lbmc_uim_flow_graph_add_to_graph(packet_info * pinfo, const lbm_uim_s { item->comment = g_strdup_printf("%" G_GUINT32_FORMAT ":%s:%" G_GUINT16_FORMAT " <-> %" G_GUINT32_FORMAT ":%s:%" G_GUINT16_FORMAT " [%" G_GUINT64_FORMAT "]", epa.stream_info.dest.domain, - address_to_str(wmem_packet_scope(), &(epa.stream_info.dest.addr)), + ep_address_to_str(&(epa.stream_info.dest.addr)), epa.stream_info.dest.port, epb.stream_info.dest.domain, - address_to_str(wmem_packet_scope(), &(epb.stream_info.dest.addr)), + ep_address_to_str(&(epb.stream_info.dest.addr)), epb.stream_info.dest.port, stream_info->channel); } diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index 002eff471b..3b47b87eae 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -400,10 +400,10 @@ rtpstream_on_filter(GtkButton *button _U_, gpointer user_data _U_) filter_string_fwd = g_strdup_printf( "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)", ip_version, - address_to_str(wmem_packet_scope(), &(selected_stream_fwd->src_addr)), + ep_address_to_str(&(selected_stream_fwd->src_addr)), selected_stream_fwd->src_port, ip_version, - address_to_str(wmem_packet_scope(), &(selected_stream_fwd->dest_addr)), + ep_address_to_str(&(selected_stream_fwd->dest_addr)), selected_stream_fwd->dest_port, selected_stream_fwd->ssrc); @@ -420,10 +420,10 @@ rtpstream_on_filter(GtkButton *button _U_, gpointer user_data _U_) filter_string_rev = g_strdup_printf( "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)", ip_version, - address_to_str(wmem_packet_scope(), &(selected_stream_rev->src_addr)), + ep_address_to_str(&(selected_stream_rev->src_addr)), selected_stream_rev->src_port, ip_version, - address_to_str(wmem_packet_scope(), &(selected_stream_rev->dest_addr)), + ep_address_to_str(&(selected_stream_rev->dest_addr)), selected_stream_rev->dest_port, selected_stream_rev->ssrc); diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index 7dcc47a309..b98cc2dc48 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -1059,7 +1059,7 @@ void LBMLBTRMTransportDialogInfo::processPacket(const packet_info * pinfo, const { LBMLBTRMSourceEntry * source = NULL; LBMLBTRMSourceMapIterator it; - QString src_address = QString(address_to_str(wmem_packet_scope(), &(pinfo->src))); + QString src_address = QString(ep_address_to_str(&(pinfo->src))); it = m_sources.find(src_address); if (m_sources.end() == it) @@ -1086,7 +1086,7 @@ void LBMLBTRMTransportDialogInfo::processPacket(const packet_info * pinfo, const { LBMLBTRMReceiverEntry * receiver = NULL; LBMLBTRMReceiverMapIterator it; - QString src_address = QString(address_to_str(wmem_packet_scope(), &(pinfo->src))); + QString src_address = QString(ep_address_to_str(&(pinfo->src))); it = m_receivers.find(src_address); if (m_receivers.end() == it) diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index ba184df18f..742025ef1f 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -1396,7 +1396,7 @@ void LBMLBTRUTransportDialogInfo::processPacket(const packet_info * pinfo, const { LBMLBTRUSourceEntry * source = NULL; LBMLBTRUSourceMapIterator it; - QString src_address = QString(address_to_str(wmem_packet_scope(), &(pinfo->src))); + QString src_address = QString(ep_address_to_str(&(pinfo->src))); it = m_sources.find(src_address); if (m_sources.end() == it) @@ -1425,7 +1425,7 @@ void LBMLBTRUTransportDialogInfo::processPacket(const packet_info * pinfo, const { LBMLBTRUReceiverEntry * receiver = NULL; LBMLBTRUReceiverMapIterator it; - QString src_address = QString(address_to_str(wmem_packet_scope(), &(pinfo->src))); + QString src_address = QString(ep_address_to_str(&(pinfo->src))); it = m_receivers.find(src_address); if (m_receivers.end() == it) diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index ceba6fe39a..514cd45135 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -89,10 +89,10 @@ LBMSubstreamEntry::LBMSubstreamEntry(guint64 channel, guint32 substream_id, cons m_item(NULL) { m_endpoint_a = QString("%1:%2") - .arg(address_to_str(wmem_packet_scope(), source_address)) + .arg(ep_address_to_str(source_address)) .arg(source_port); m_endpoint_b = QString("%1:%2") - .arg(address_to_str(wmem_packet_scope(), destination_address)) + .arg(ep_address_to_str(destination_address)) .arg(destination_port); } @@ -199,7 +199,7 @@ QString LBMStreamEntry::formatEndpoint(const lbm_uim_stream_endpoint_t * endpoin { return QString("%1:%2:%3") .arg(endpoint->stream_info.dest.domain) - .arg(address_to_str(wmem_packet_scope(), &(endpoint->stream_info.dest.addr))) + .arg(ep_address_to_str(&(endpoint->stream_info.dest.addr))) .arg(endpoint->stream_info.dest.port); } } diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp index 8b04651766..1f67677e11 100644 --- a/ui/qt/lbm_uimflow_dialog.cpp +++ b/ui/qt/lbm_uimflow_dialog.cpp @@ -142,10 +142,10 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_ { item->comment = g_strdup_printf("%" G_GUINT32_FORMAT ":%s:%" G_GUINT16_FORMAT " <-> %" G_GUINT32_FORMAT ":%s:%" G_GUINT16_FORMAT " [%" G_GUINT64_FORMAT "]", epa.stream_info.dest.domain, - address_to_str(wmem_packet_scope(), &(epa.stream_info.dest.addr)), + ep_address_to_str(&(epa.stream_info.dest.addr)), epa.stream_info.dest.port, epb.stream_info.dest.domain, - address_to_str(wmem_packet_scope(), &(epb.stream_info.dest.addr)), + ep_address_to_str(&(epb.stream_info.dest.addr)), epb.stream_info.dest.port, stream_info->channel); } -- cgit v1.2.3