aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mpls.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-16 12:36:22 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-16 12:36:22 +0000
commit79b8b138846a5e862ab0bac706dd7595c7e9fef4 (patch)
tree4a92d1e15649b285aa970ae51790d8e6747ca258 /epan/dissectors/packet-mpls.c
parent8f77f850247078209413d7a259b52411aa6b0303 (diff)
Switch a bunch of dissectors over to using tvb_new_subset_remaining()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29446 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-mpls.c')
-rw-r--r--epan/dissectors/packet-mpls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 308472b656..eb8bf0ad48 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -387,7 +387,7 @@ dissect_pw_ach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
val_to_str(channel_type, mpls_pwac_types, "Unknown"),
channel_type);
}
- next_tvb = tvb_new_subset(tvb, 4, -1, -1);
+ next_tvb = tvb_new_subset_remaining(tvb, 4);
if (0x21 == channel_type /*IPv4, RFC4385 clause 6.*/)
{
@@ -485,7 +485,7 @@ dissect_pw_mcw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, 2, 2, sequence_number,
"Sequence Number: %d", sequence_number);
}
- next_tvb = tvb_new_subset(tvb, 4, -1, -1);
+ next_tvb = tvb_new_subset_remaining(tvb, 4);
call_dissector( dissector_data, next_tvb, pinfo, tree );
}
@@ -762,7 +762,7 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (bos) break;
}
- next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+ next_tvb = tvb_new_subset_remaining(tvb, offset);
if ( !dissector_try_port(mpls_subdissector_table, label, next_tvb, pinfo, tree))
{