diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-24 14:16:48 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-27 07:37:40 +0000 |
| commit | 14697b8aee2dd3842806e82ab7220b68260d9363 (patch) | |
| tree | a829a5a4b4d7ecd8e2b6b359c10b490ba26f7f94 /epan/dissectors/packet-rsvp.c | |
| parent | 64c06785ea90fb37c97fc323f62bee0892107d50 (diff) | |
Pass tvb and offset into print_nsap_net() and print_area() to "hide" the tvb_get_ptr call that dissectors are using.
Change-Id: Ibc5a51be462d431b85b34cac7a358d736ec7b9db
Reviewed-on: https://code.wireshark.org/review/7422
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-rsvp.c')
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index e81a5015fc..cc389ee08c 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -2770,7 +2770,7 @@ dissect_rsvp_ifid_tlv(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_objec "%sISIS-Area TLV - Invalid Length field", tlv_name); break; } - ip_str = print_nsap_net(tvb_get_ptr(tvb, offset+tlv_off+5, isis_len), isis_len); + ip_str = print_nsap_net(tvb, offset+tlv_off+5, isis_len); rsvp_ifid_subtree = proto_tree_add_subtree_format(rsvp_object_tree, tvb, offset+tlv_off, tlv_len, subtree_type, NULL, "%sISIS-Area TLV - %s", tlv_name, @@ -5844,10 +5844,10 @@ dissect_rsvp_gen_uni(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp_object proto_tree_add_text(rsvp_gen_uni_subtree, tvb, offset2+l+5, sobj_len-4, "NSAP address: %s", - print_nsap_net(tvb_get_ptr(tvb, offset2+l+5, nsap_len), nsap_len)); + print_nsap_net(tvb, offset2+l+5, nsap_len)); if (i < 4) { proto_item_append_text(ti, "%s NSAP TNA: %s", c, - print_nsap_net(tvb_get_ptr(tvb, offset2+l+5, nsap_len), nsap_len)); + print_nsap_net(tvb, offset2+l+5, nsap_len)); } break; @@ -6099,7 +6099,7 @@ dissect_rsvp_call_id(proto_tree *ti, proto_tree *rsvp_object_tree, case 3: offset4 = offset3 + 20; - str = print_nsap_net(tvb_get_ptr(tvb, offset3, 20), 20); + str = print_nsap_net(tvb, offset3, 20); proto_tree_add_text(rsvp_object_tree, tvb, offset3, 20, "Source Transport Network addr: %s", str); break; |