diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-26 22:03:12 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-03-01 12:54:33 +0000 |
| commit | 9c55903029ee0e6720597ef07e8a5b359cae068e (patch) | |
| tree | 251dddfa5de23777e225e128529b00a7a0143b76 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | 5f2c8e9575eb6afb6c645d43a015cff035fcbeb0 (diff) | |
Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and SET_ADDRESS calls for the same address.
Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116
Reviewed-on: https://code.wireshark.org/review/7437
Petri-Dish: Michael Mann <mmann78@netscape.net>
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, 3 insertions, 9 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 2c9c8e8113..bafe50587d 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2602,9 +2602,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TVB_SET_ADDRESS(&pinfo->net_src, (source_addr_length == 4) ? AT_IPv4 : AT_IPv6, tvb, source_addr_offset, source_addr_length); - TVB_SET_ADDRESS(&pinfo->src, - (source_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, source_addr_offset, source_addr_length); + COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); proto_tree_add_item(ipprim_tree, (source_addr_length == 4) ? @@ -2645,9 +2643,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TVB_SET_ADDRESS(&pinfo->net_dst, (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, tvb, dest_addr_offset, dest_addr_length); - TVB_SET_ADDRESS(&pinfo->dst, - (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, dest_addr_offset, dest_addr_length); + COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(ipprim_tree, (dest_addr_length == 4) ? hf_catapult_dct2000_ipprim_dst_addr_v4 : @@ -2756,9 +2752,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TVB_SET_ADDRESS(&pinfo->net_dst, (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, tvb, dest_addr_offset, dest_addr_length); - TVB_SET_ADDRESS(&pinfo->dst, - (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, dest_addr_offset, dest_addr_length); + COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(sctpprim_tree, (dest_addr_length == 4) ? hf_catapult_dct2000_sctpprim_dst_addr_v4 : |