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-sll.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-sll.c')
| -rw-r--r-- | epan/dissectors/packet-sll.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index a8d2418024..70af9aac8b 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -195,7 +195,6 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 pkttype; guint16 protocol; guint16 hatype, halen; - const guint8 *src; proto_item *ti; tvbuff_t *next_tvb; proto_tree *fh_tree = NULL; @@ -245,30 +244,20 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } switch (halen) { case 4: - src = tvb_get_ptr(tvb, 6, 4); - SET_ADDRESS(&pinfo->dl_src, AT_IPv4, 4, src); - SET_ADDRESS(&pinfo->src, AT_IPv4, 4, src); - if (tree) { - proto_tree_add_item(fh_tree, &hfi_sll_src_ipv4, tvb, - 6, 4, ENC_BIG_ENDIAN); - } + TVB_SET_ADDRESS(&pinfo->dl_src, AT_IPv4, tvb, 6, 4); + TVB_SET_ADDRESS(&pinfo->src, AT_IPv4, tvb, 6, 4); + proto_tree_add_item(fh_tree, &hfi_sll_src_ipv4, tvb, 6, 4, ENC_BIG_ENDIAN); break; case 6: - src = tvb_get_ptr(tvb, 6, 6); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src); - SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src); - if (tree) { - proto_tree_add_ether(fh_tree, hfi_sll_src_eth.id, tvb, - 6, 6, src); - } + TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, 6, 6); + TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, 6, 6); + proto_tree_add_item(fh_tree, &hfi_sll_src_eth, tvb, 6, 6, ENC_NA); break; case 0: break; default: - if (tree) { - proto_tree_add_item(fh_tree, &hfi_sll_src_other, tvb, + proto_tree_add_item(fh_tree, &hfi_sll_src_other, tvb, 6, halen > 8 ? 8 : halen, ENC_NA); - } break; } |