diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-16 12:36:22 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-16 12:36:22 +0000 |
| commit | 79b8b138846a5e862ab0bac706dd7595c7e9fef4 (patch) | |
| tree | 4a92d1e15649b285aa970ae51790d8e6747ca258 /epan/dissectors/packet-juniper.c | |
| parent | 8f77f850247078209413d7a259b52411aa6b0303 (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-juniper.c')
| -rw-r--r-- | epan/dissectors/packet-juniper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 92e2a59f27..bf827dc779 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -609,7 +609,7 @@ dissect_juniper_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, prot if ((*flags & JUNIPER_FLAG_NO_L2) == JUNIPER_FLAG_NO_L2) { /* no link header present ? */ proto = tvb_get_letohl(tvb,hdr_len); /* proto is stored in host-order */ - next_tvb = tvb_new_subset(tvb, hdr_len + 4, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, hdr_len + 4); dissect_juniper_payload_proto(tvb, pinfo, tree, ti, proto, hdr_len + 4); return -1; } @@ -630,7 +630,7 @@ dissect_juniper_payload_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre ti = proto_tree_add_text (juniper_subtree, tvb, offset, 0, "[Payload Type: %s]", val_to_str(proto,juniper_proto_vals,"Unknown")); - next_tvb = tvb_new_subset(tvb, offset, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, offset); switch (proto) { case PROTO_IP: @@ -663,7 +663,7 @@ dissect_juniper_payload_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre nlpid = tvb_get_guint8(tvb, offset); if(dissector_try_port(osinl_subdissector_table, nlpid, next_tvb, pinfo, tree)) return 0; - next_tvb = tvb_new_subset(tvb, offset+1, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, offset+1); if(dissector_try_port(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree)) return 0; break; @@ -1089,7 +1089,7 @@ dissect_juniper_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 return; } - next_tvb = tvb_new_subset(tvb, offset, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, offset); if (next_proto == PROTO_OAM) { dissect_juniper_payload_proto(tvb, pinfo, tree, ti, PROTO_OAM, offset); |