diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-16 12:36:22 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-16 12:36:22 +0000 |
| commit | 8b515e9340f9eb93c79b74d129b1fddfb8e5299a (patch) | |
| tree | 4a92d1e15649b285aa970ae51790d8e6747ca258 /epan/dissectors/packet-l2tp.c | |
| parent | fe6f8b92c7f1f72a0eb677f01899f1dfa07b5342 (diff) | |
Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
Diffstat (limited to 'epan/dissectors/packet-l2tp.c')
| -rw-r--r-- | epan/dissectors/packet-l2tp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index f3de64de61..48014513f1 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1395,7 +1395,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb, index + l2tpv3_cookie + 1, 3, FALSE); } - next_tvb = tvb_new_subset(tvb, index + l2tpv3_cookie + 4, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, index + l2tpv3_cookie + 4); break; case L2TPv3_L2_SPECIFIC_ATM: if (tree) { @@ -1421,16 +1421,16 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(l2_specific, hf_l2tp_l2_spec_sequence, tvb, index + l2tpv3_cookie + 1, 3, FALSE); } - next_tvb = tvb_new_subset(tvb, index + l2tpv3_cookie + 4, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, index + l2tpv3_cookie + 4); break; case L2TPv3_L2_SPECIFIC_LAPD: if (tree) proto_tree_add_text(tree, tvb, index + l2tpv3_cookie + 4, 3,"LAPD info"); - next_tvb = tvb_new_subset(tvb, index + l2tpv3_cookie+4+3, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, index + l2tpv3_cookie+4+3); break; case L2TPv3_L2_SPECIFIC_NONE: default: - next_tvb = tvb_new_subset(tvb, index + l2tpv3_cookie, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, index + l2tpv3_cookie); break; } @@ -1881,7 +1881,7 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_set_len(l2tp_item, index); /* If we have data, signified by having a length bit, dissect it */ if (tvb_offset_exists(tvb, index)) { - next_tvb = tvb_new_subset(tvb, index, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, index); call_dissector(ppp_hdlc_handle, next_tvb, pinfo, tree); } return tvb_length(tvb); |