From d9e530bc177553c07bae7594e9b4f8e6235fc0e0 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 21 Oct 2015 11:46:49 -0700 Subject: Use address functions instead of ADDRESS macros in ui. Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the ui directory. Change-Id: I10e95e66c8da5b880133452ebc484c53046e87ba Reviewed-on: https://code.wireshark.org/review/11199 Reviewed-by: Michael Mann --- ui/qt/follow_stream_dialog.cpp | 2 +- ui/qt/iax2_analysis_dialog.cpp | 24 ++++++++++++------------ ui/qt/lbm_uimflow_dialog.cpp | 6 +++--- ui/qt/manage_interfaces_dialog.cpp | 4 ++-- ui/qt/rtp_analysis_dialog.cpp | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'ui/qt') diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index 757595d841..72396259ed 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -423,7 +423,7 @@ ssl_queue_packet_data(void *tapdata, packet_info *pinfo, epan_dissect_t *, const follow_info->client_port = pinfo->srcport; copy_address(&follow_info->client_ip, &pinfo->src); } - if (ADDRESSES_EQUAL(&follow_info->client_ip, &pinfo->src) && + if (addresses_equal(&follow_info->client_ip, &pinfo->src) && follow_info->client_port == pinfo->srcport) { from = FROM_CLIENT; } else { diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index cbcdd8bbc3..f7dc5279a7 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -332,14 +332,14 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) : dfilter_free(sfcode); /* ok, it is a IAX2 frame, so let's get the ip and port values */ - COPY_ADDRESS(&(src_fwd_), &(edt.pi.src)); - COPY_ADDRESS(&(dst_fwd_), &(edt.pi.dst)); + copy_address(&(src_fwd_), &(edt.pi.src)); + copy_address(&(dst_fwd_), &(edt.pi.dst)); port_src_fwd_ = edt.pi.srcport; port_dst_fwd_ = edt.pi.destport; /* assume the inverse ip/port combination for the reverse direction */ - COPY_ADDRESS(&(src_rev_), &(edt.pi.dst)); - COPY_ADDRESS(&(dst_rev_), &(edt.pi.src)); + copy_address(&(src_rev_), &(edt.pi.dst)); + copy_address(&(dst_rev_), &(edt.pi.src)); port_src_rev_ = edt.pi.destport; port_dst_rev_ = edt.pi.srcport; @@ -371,18 +371,18 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) : for (GList *strinfo_list = g_list_first(tapinfo.strinfo_list); strinfo_list; strinfo_list = g_list_next(strinfo_list)) { rtp_stream_info_t * strinfo = (rtp_stream_info_t*)(strinfo_list->data); << address_to_qstring(&strinfo->dest_addr) << address_to_qstring(&src_rev_) << address_to_qstring(&dst_rev_); - if (ADDRESSES_EQUAL(&(strinfo->src_addr), &(src_fwd_)) + if (addresses_equal(&(strinfo->src_addr), &(src_fwd_)) && (strinfo->src_port == port_src_fwd_) - && (ADDRESSES_EQUAL(&(strinfo->dest_addr), &(dst_fwd_))) + && (addresses_equal(&(strinfo->dest_addr), &(dst_fwd_))) && (strinfo->dest_port == port_dst_fwd_)) { ++num_streams; filtered_list = g_list_prepend(filtered_list, strinfo); } - if (ADDRESSES_EQUAL(&(strinfo->src_addr), &(src_rev_)) + if (addresses_equal(&(strinfo->src_addr), &(src_rev_)) && (strinfo->src_port == port_src_rev_) - && (ADDRESSES_EQUAL(&(strinfo->dest_addr), &(dst_rev_))) + && (addresses_equal(&(strinfo->dest_addr), &(dst_rev_))) && (strinfo->dest_port == port_dst_rev_)) { ++num_streams; @@ -630,17 +630,17 @@ gboolean Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, str return FALSE; /* is it the forward direction? */ - else if ((CMP_ADDRESS(&(iax2_analysis_dialog->src_fwd_), &(pinfo->src)) == 0) + else if ((cmp_address(&(iax2_analysis_dialog->src_fwd_), &(pinfo->src)) == 0) && (iax2_analysis_dialog->port_src_fwd_ == pinfo->srcport) - && (CMP_ADDRESS(&(iax2_analysis_dialog->dst_fwd_), &(pinfo->dst)) == 0) + && (cmp_address(&(iax2_analysis_dialog->dst_fwd_), &(pinfo->dst)) == 0) && (iax2_analysis_dialog->port_dst_fwd_ == pinfo->destport)) { iax2_analysis_dialog->addPacket(true, pinfo, iax2info); } /* is it the reversed direction? */ - else if ((CMP_ADDRESS(&(iax2_analysis_dialog->src_rev_), &(pinfo->src)) == 0) + else if ((cmp_address(&(iax2_analysis_dialog->src_rev_), &(pinfo->src)) == 0) && (iax2_analysis_dialog->port_src_rev_ == pinfo->srcport) - && (CMP_ADDRESS(&(iax2_analysis_dialog->dst_rev_), &(pinfo->dst)) == 0) + && (cmp_address(&(iax2_analysis_dialog->dst_rev_), &(pinfo->dst)) == 0) && (iax2_analysis_dialog->port_dst_rev_ == pinfo->destport)) { iax2_analysis_dialog->addPacket(false, pinfo, iax2info); diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp index 5d8c35d93c..01ee8477b3 100644 --- a/ui/qt/lbm_uimflow_dialog.cpp +++ b/ui/qt/lbm_uimflow_dialog.cpp @@ -90,7 +90,7 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_ { int compare; - compare = CMP_ADDRESS(&(stream_info->endpoint_a.stream_info.dest.addr), &(stream_info->endpoint_b.stream_info.dest.addr)); + compare = cmp_address(&(stream_info->endpoint_a.stream_info.dest.addr), &(stream_info->endpoint_b.stream_info.dest.addr)); if (compare < 0) { swap_endpoints = FALSE; @@ -123,8 +123,8 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_ epa = stream_info->endpoint_b; } item = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t)); - COPY_ADDRESS(&(item->src_addr), &(pinfo->src)); - COPY_ADDRESS(&(item->dst_addr), &(pinfo->dst)); + copy_address(&(item->src_addr), &(pinfo->src)); + copy_address(&(item->dst_addr), &(pinfo->dst)); item->fd = pinfo->fd; item->port_src = pinfo->srcport; item->port_dst = pinfo->destport; diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index 16e1293c5b..5f1e11ae89 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -569,12 +569,12 @@ void ManageInterfacesDialog::addRemoteInterfaces(GList* rlist, remote_options *r addr = (if_addr_t *)curr_addr->data; switch (addr->ifat_type) { case IF_AT_IPv4: - SET_ADDRESS(&addr_str, AT_IPv4, 4, &addr->addr.ip4_addr); + set_address(&addr_str, AT_IPv4, 4, &addr->addr.ip4_addr); temp_addr_str = (char*)address_to_str(NULL, &addr_str); g_string_append(ip_str, temp_addr_str); break; case IF_AT_IPv6: - SET_ADDRESS(&addr_str, AT_IPv6, 16, addr->addr.ip6_addr); + set_address(&addr_str, AT_IPv6, 16, addr->addr.ip6_addr); temp_addr_str = (char*)address_to_str(NULL, &addr_str); g_string_append(ip_str, temp_addr_str); break; diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index 7cb0c9bce9..451e09f659 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -1537,9 +1537,9 @@ void RtpAnalysisDialog::findStreams() for (GList *strinfo_list = g_list_first(tapinfo_.strinfo_list); strinfo_list; strinfo_list = g_list_next(strinfo_list)) { rtp_stream_info_t * strinfo = (rtp_stream_info_t*)(strinfo_list->data); - if (ADDRESSES_EQUAL(&(strinfo->src_addr), &(src_fwd_)) + if (addresses_equal(&(strinfo->src_addr), &(src_fwd_)) && (strinfo->src_port == port_src_fwd_) - && (ADDRESSES_EQUAL(&(strinfo->dest_addr), &(dst_fwd_))) + && (addresses_equal(&(strinfo->dest_addr), &(dst_fwd_))) && (strinfo->dest_port == port_dst_fwd_)) { packet_count_fwd_ = strinfo->packet_count; @@ -1548,9 +1548,9 @@ void RtpAnalysisDialog::findStreams() num_streams_++; } - if (ADDRESSES_EQUAL(&(strinfo->src_addr), &(src_rev_)) + if (addresses_equal(&(strinfo->src_addr), &(src_rev_)) && (strinfo->src_port == port_src_rev_) - && (ADDRESSES_EQUAL(&(strinfo->dest_addr), &(dst_rev_))) + && (addresses_equal(&(strinfo->dest_addr), &(dst_rev_))) && (strinfo->dest_port == port_dst_rev_)) { packet_count_rev_ = strinfo->packet_count; -- cgit v1.2.3