diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-06 14:54:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 12:37:52 +0000 |
| commit | 4088a8286d9e2dfd8f2b1c316472d768cbefec8e (patch) | |
| tree | e089464bdc1b9603db474bad8f974d9df362c8bc /epan/dissectors/packet-exported_pdu.c | |
| parent | 6252074a249278fffc7e4897087564d951dc67b5 (diff) | |
SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use.
Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it.
Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22
Reviewed-on: https://code.wireshark.org/review/6358
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-exported_pdu.c')
| -rw-r--r-- | epan/dissectors/packet-exported_pdu.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index fb45104d35..1d358acb32 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -96,7 +96,6 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int tag_len; int next_proto_type = -1; char *proto_name = NULL; - const guchar *src_addr, *dst_addr; dissector_handle_t proto_handle; mtp3_addr_pc_t *mtp3_addr; guint8 dvb_ci_dir; @@ -124,27 +123,23 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case EXP_PDU_TAG_IPV4_SRC: proto_tree_add_item(tag_tree, hf_exported_pdu_ipv4_src, tvb, offset, 4, ENC_BIG_ENDIAN); - src_addr = tvb_get_ptr(tvb, offset, 4); - SET_ADDRESS(&pinfo->net_src, AT_IPv4, 4, src_addr); - SET_ADDRESS(&pinfo->src, AT_IPv4, 4, src_addr); + TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv4, tvb, offset, 4); + TVB_SET_ADDRESS(&pinfo->src, AT_IPv4, tvb, offset, 4); break; case EXP_PDU_TAG_IPV4_DST: proto_tree_add_item(tag_tree, hf_exported_pdu_ipv4_dst, tvb, offset, 4, ENC_BIG_ENDIAN); - dst_addr = tvb_get_ptr(tvb, offset, 4); - SET_ADDRESS(&pinfo->net_dst, AT_IPv4, 4, dst_addr); - SET_ADDRESS(&pinfo->dst, AT_IPv4, 4, dst_addr); + TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv4, tvb, offset, 4); + TVB_SET_ADDRESS(&pinfo->dst, AT_IPv4, tvb, offset, 4); break; case EXP_PDU_TAG_IPV6_SRC: proto_tree_add_item(tag_tree, hf_exported_pdu_ipv6_src, tvb, offset, 16, ENC_NA); - src_addr = tvb_get_ptr(tvb, offset, 16); - SET_ADDRESS(&pinfo->net_src, AT_IPv6, 16, src_addr); - SET_ADDRESS(&pinfo->src, AT_IPv6, 16, src_addr); + TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv6, tvb, offset, 16); + TVB_SET_ADDRESS(&pinfo->src, AT_IPv6, tvb, offset, 16); break; case EXP_PDU_TAG_IPV6_DST: proto_tree_add_item(tag_tree, hf_exported_pdu_ipv6_dst, tvb, offset, 16, ENC_NA); - dst_addr = tvb_get_ptr(tvb, offset, 16); - SET_ADDRESS(&pinfo->net_dst, AT_IPv6, 16, dst_addr); - SET_ADDRESS(&pinfo->dst, AT_IPv6, 16, dst_addr); + TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv6, tvb, offset, 16); + TVB_SET_ADDRESS(&pinfo->dst, AT_IPv6, tvb, offset, 16); break; case EXP_PDU_TAG_PORT_TYPE: pinfo->ptype = (port_type)tvb_get_ntohl(tvb, offset); |