diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-29 03:12:53 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-03 12:20:34 +0000 |
commit | 3df2333155abf8fdfdedc51aca0fe962499f10b5 (patch) | |
tree | f241cb1777aaf99492eeb12c8365c96e705cfe4e /epan/dissectors/packet-ip.c | |
parent | 8571dbb908e13d63a80e6465ea19566162dad9c1 (diff) | |
download | wireshark-3df2333155abf8fdfdedc51aca0fe962499f10b5.tar.gz |
Remaining ADDRESS macro to address function conversions
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788
Reviewed-on: https://code.wireshark.org/review/11463
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-ip.c')
-rw-r--r-- | epan/dissectors/packet-ip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 899fe1760d..ed4f73cb48 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2282,7 +2282,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } } src32 = tvb_get_ntohl(tvb, offset + IPH_SRC); - TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv4, tvb, offset + IPH_SRC, 4); + set_address_tvb(&pinfo->net_src, AT_IPv4, 4, tvb, offset + IPH_SRC); copy_address_shallow(&pinfo->src, &pinfo->net_src); copy_address_shallow(&iph->ip_src, &pinfo->src); if (tree) { @@ -2324,7 +2324,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dst_off = 0; dst32 = tvb_get_ntohl(tvb, offset + IPH_DST + dst_off); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv4, tvb, offset + IPH_DST + dst_off, 4); + set_address_tvb(&pinfo->net_dst, AT_IPv4, 4, tvb, offset + IPH_DST + dst_off); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); copy_address_shallow(&iph->ip_dst, &pinfo->net_dst); |