From 32f9f92487f797bcaef6d3cbf92b7fb802a6079e Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 3 Jan 2016 15:05:13 -0800 Subject: Rename ipv4_addr and ipv6_addr to indicate their full contents. They're not just addresses, they also include a mask length for IPv4 and a prefix length for IPv6. Rename them appropriately. Rename the old ipv4_addr_and_mask() and ipv6_addr_and_mask() to reflect that 1) they fetch data from a tvbuff and 2) *don't* fetch the mask length or prefix length, those lengths are passed as arguments to indicate how many bytes worth of address to fetch. Change-Id: I4cad5a186ad7bfcb60022a91dbe8bc8479e6471f Reviewed-on: https://code.wireshark.org/review/13035 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- ui/qt/rtp_analysis_dialog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ui/qt/rtp_analysis_dialog.cpp') diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index b733369ce5..ae819d48ad 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -1369,10 +1369,10 @@ void RtpAnalysisDialog::saveCsv(RtpAnalysisDialog::StreamDirection direction) // Adapted from rtp_analysis.c:process_node guint32 RtpAnalysisDialog::processNode(proto_node *ptree_node, header_field_info *hfinformation, const gchar *proto_field, bool *ok) { - field_info *finfo; - proto_node *proto_sibling_node; - header_field_info *hfssrc; - ipv4_addr *ipv4; + field_info *finfo; + proto_node *proto_sibling_node; + header_field_info *hfssrc; + ipv4_addr_and_mask *ipv4; finfo = PNODE_FINFO(ptree_node); @@ -1391,7 +1391,7 @@ guint32 RtpAnalysisDialog::processNode(proto_node *ptree_node, header_field_info if (hfssrc == finfo->hfinfo) { guint32 result; if (hfinformation->type == FT_IPv4) { - ipv4 = (ipv4_addr *)fvalue_get(&finfo->value); + ipv4 = (ipv4_addr_and_mask *)fvalue_get(&finfo->value); result = ipv4_get_net_order_addr(ipv4); } else { result = fvalue_get_uinteger(&finfo->value); -- cgit v1.2.1