diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 12:04:16 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:45:56 +0000 |
| commit | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (patch) | |
| tree | 4aca52419f6ee7dc9a58ca8e4cd79fbeaa8d3387 /epan/dissectors/packet-netflow.c | |
| parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) | |
Use address functions instead of ADDRESS macros in asn1 and epan
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the asn1 and epan directories.
Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4
Reviewed-on: https://code.wireshark.org/review/11200
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-netflow.c')
| -rw-r--r-- | epan/dissectors/packet-netflow.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 6bc644cb0f..1c9a5774f1 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -7301,9 +7301,9 @@ dissect_v9_v10_data_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdut /* Note: address at *(pinfo->net_???.data) is *not* copied */ static v9_v10_tmplt_t *v9_v10_tmplt_build_key(v9_v10_tmplt_t *tmplt_p, packet_info *pinfo, guint32 src_id, guint16 tmplt_id) { - SET_ADDRESS(&tmplt_p->src_addr, pinfo->net_src.type, pinfo->net_src.len, pinfo->net_src.data); /* lookup only! */ + set_address(&tmplt_p->src_addr, pinfo->net_src.type, pinfo->net_src.len, pinfo->net_src.data); /* lookup only! */ tmplt_p->src_port = pinfo->srcport; - SET_ADDRESS(&tmplt_p->dst_addr, pinfo->net_dst.type, pinfo->net_dst.len, pinfo->net_dst.data); /* lookup only! */ + set_address(&tmplt_p->dst_addr, pinfo->net_dst.type, pinfo->net_dst.len, pinfo->net_dst.data); /* lookup only! */ tmplt_p->dst_port = pinfo->destport; tmplt_p->src_id = src_id; tmplt_p->tmplt_id = tmplt_id; @@ -7317,9 +7317,9 @@ v9_v10_tmplt_table_equal(gconstpointer k1, gconstpointer k2) const v9_v10_tmplt_t *tb = (const v9_v10_tmplt_t *)k2; return ( - (CMP_ADDRESS(&ta->src_addr, &tb->src_addr) == 0) && + (cmp_address(&ta->src_addr, &tb->src_addr) == 0) && (ta->src_port == tb->src_port) && - (CMP_ADDRESS(&ta->dst_addr, &tb->dst_addr) == 0) && + (cmp_address(&ta->dst_addr, &tb->dst_addr) == 0) && (ta->dst_port == tb->dst_port) && (ta->src_id == tb->src_id) && (ta->tmplt_id == tb->tmplt_id) @@ -7441,7 +7441,7 @@ getprefix(const guint32 *addr, int prefix) gprefix = *addr & g_htonl((0xffffffff << (32 - prefix))); - SET_ADDRESS(&prefix_addr, AT_IPv4, 4, &gprefix); + set_address(&prefix_addr, AT_IPv4, 4, &gprefix); return address_to_str(wmem_packet_scope(), &prefix_addr); } |