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-catapult-dct2000.c | |
| parent | 8571dbb908e13d63a80e6465ea19566162dad9c1 (diff) | |
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-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 21475e2a72..27137cc4be 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2599,9 +2599,9 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (source_addr_offset != 0) { proto_item *addr_ti; - TVB_SET_ADDRESS(&pinfo->net_src, + set_address_tvb(&pinfo->net_src, (source_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, source_addr_offset, source_addr_length); + source_addr_length, tvb, source_addr_offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_tree_add_item(ipprim_tree, @@ -2640,9 +2640,9 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (dest_addr_offset != 0) { proto_item *addr_ti; - TVB_SET_ADDRESS(&pinfo->net_dst, + set_address_tvb(&pinfo->net_dst, (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, dest_addr_offset, dest_addr_length); + dest_addr_length, tvb, dest_addr_offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(ipprim_tree, (dest_addr_length == 4) ? @@ -2749,9 +2749,9 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (dest_addr_offset != 0) { proto_item *addr_ti; - TVB_SET_ADDRESS(&pinfo->net_dst, + set_address_tvb(&pinfo->net_dst, (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, dest_addr_offset, dest_addr_length); + dest_addr_length, tvb, dest_addr_offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(sctpprim_tree, (dest_addr_length == 4) ? |