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-ax25.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-ax25.c')
| -rw-r--r-- | epan/dissectors/packet-ax25.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index cd02623769..d123bdd16d 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -160,17 +160,17 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree ) dst_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN ); proto_tree_add_ax25( ax25_tree, hf_ax25_dst, tvb, offset, AX25_ADDR_LEN, dst_addr ); - SET_ADDRESS( &pinfo->dl_dst, AT_AX25, AX25_ADDR_LEN, dst_addr ); - SET_ADDRESS( &pinfo->dst, AT_AX25, AX25_ADDR_LEN, dst_addr ); + TVB_SET_ADDRESS( &pinfo->dl_dst, AT_AX25, tvb, offset, AX25_ADDR_LEN ); + TVB_SET_ADDRESS( &pinfo->dst, AT_AX25, tvb, offset, AX25_ADDR_LEN ); dst_ssid = *(dst_addr + 6); /* step over dst addr point at src addr */ offset += AX25_ADDR_LEN; - src_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN ); + src_addr = tvb_get_ptr( tvb, offset, AX25_ADDR_LEN ); proto_tree_add_ax25( ax25_tree, hf_ax25_src, tvb, offset, AX25_ADDR_LEN, src_addr ); - SET_ADDRESS( &pinfo->dl_src, AT_AX25, AX25_ADDR_LEN, src_addr ); - SET_ADDRESS( &pinfo->src, AT_AX25, AX25_ADDR_LEN, src_addr ); + TVB_SET_ADDRESS( &pinfo->dl_src, AT_AX25, tvb, offset, AX25_ADDR_LEN ); + TVB_SET_ADDRESS( &pinfo->src, AT_AX25, tvb, offset, AX25_ADDR_LEN ); src_ssid = *(src_addr + 6); /* step over src addr point at either 1st via addr or control byte */ |