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-tipc.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-tipc.c')
| -rw-r--r-- | epan/dissectors/packet-tipc.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 4ecb4474f0..9dd92234b2 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -2034,7 +2034,6 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ guint8 hdr_size; guint8 user; gchar *addr_str_ptr; - const guchar *src_addr, *dst_addr; tvbuff_t *data_tvb, *tipc_tvb; gboolean datatype_hdr = FALSE; guint8 msg_type = 0; @@ -2070,22 +2069,18 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* Data type header */ if (hdr_size > 5 && user <4) { /* W6 Originating Processor */ - src_addr = tvb_get_ptr(tipc_tvb, offset + 24, 4); - SET_ADDRESS(&pinfo->src, AT_TIPC, 4, src_addr); + TVB_SET_ADDRESS(&pinfo->src, AT_TIPC, tipc_tvb, offset + 24, 4); /* W7 Destination Processor */ - dst_addr = tvb_get_ptr(tipc_tvb, offset + 28, 4); - SET_ADDRESS(&pinfo->dst, AT_TIPC, 4, dst_addr); + TVB_SET_ADDRESS(&pinfo->dst, AT_TIPC, tipc_tvb, offset + 28, 4); } else { /* Short data hdr */ /* W2 Previous Processor */ - src_addr = tvb_get_ptr(tipc_tvb, offset + 8, 4); - SET_ADDRESS(&pinfo->src, AT_TIPC, 4, src_addr); + TVB_SET_ADDRESS(&pinfo->src, AT_TIPC, tipc_tvb, offset + 8, 4); } } else { /* W2 Previous Processor */ - src_addr = tvb_get_ptr(tipc_tvb, offset + 8, 4); - SET_ADDRESS(&pinfo->src, AT_TIPC, 4, src_addr); + TVB_SET_ADDRESS(&pinfo->src, AT_TIPC, tipc_tvb, offset + 8, 4); } break; case TIPCv2: @@ -2110,35 +2105,28 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (datatype_hdr) { if (hdr_size > 6) { /* W6 Originating Processor */ - src_addr = tvb_get_ptr(tipc_tvb, offset + 24, 4); - SET_ADDRESS(&pinfo->src, AT_TIPC, 4, src_addr); + TVB_SET_ADDRESS(&pinfo->src, AT_TIPC, tipc_tvb, offset + 24, 4); /* W7 Destination Processor */ - dst_addr = tvb_get_ptr(tipc_tvb, offset + 28, 4); - SET_ADDRESS(&pinfo->dst, AT_TIPC, 4, dst_addr); + TVB_SET_ADDRESS(&pinfo->dst, AT_TIPC, tipc_tvb, offset + 28, 4); } else { /* W3 Previous Processor */ - src_addr = tvb_get_ptr(tipc_tvb, offset + 12, 4); - SET_ADDRESS(&pinfo->src, AT_TIPC, 4, src_addr); + TVB_SET_ADDRESS(&pinfo->src, AT_TIPC, tipc_tvb, offset + 12, 4); } } else { if (user != TIPCv2_NEIGHBOUR_DISCOVERY) { /* W6 Originating Processor */ - src_addr = tvb_get_ptr(tipc_tvb, offset + 24, 4); - SET_ADDRESS(&pinfo->src, AT_TIPC, 4, src_addr); + TVB_SET_ADDRESS(&pinfo->src, AT_TIPC, tipc_tvb, offset + 24, 4); /* W7 Destination Processor */ - dst_addr = tvb_get_ptr(tipc_tvb, offset + 28, 4); - SET_ADDRESS(&pinfo->dst, AT_TIPC, 4, dst_addr); + TVB_SET_ADDRESS(&pinfo->dst, AT_TIPC, tipc_tvb, offset + 28, 4); } else { /* W2 Destination Domain */ - dst_addr = tvb_get_ptr(tipc_tvb, offset + 8, 4); - SET_ADDRESS(&pinfo->dst, AT_TIPC, 4, dst_addr); + TVB_SET_ADDRESS(&pinfo->dst, AT_TIPC, tipc_tvb, offset + 8, 4); /* W3 Previous Node */ - src_addr = tvb_get_ptr(tipc_tvb, offset + 12, 4); - SET_ADDRESS(&pinfo->src, AT_TIPC, 4, src_addr); + TVB_SET_ADDRESS(&pinfo->src, AT_TIPC, tipc_tvb, offset + 12, 4); } } break; |