diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-18 18:09:58 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-18 16:15:42 +0000 |
commit | e308e7c4de81c2ff7159e444b865ac59de4faa2b (patch) | |
tree | e24dcf58137a30395cc0ce87f1e84e2b32d6a34b /asn1/rtse/packet-rtse-template.c | |
parent | b5a462b087bdd7670e1a69786ebbe3f073084ac3 (diff) |
Update ASN.1 source files with the API changes done in g021e7af
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1/rtse/packet-rtse-template.c')
-rw-r--r-- | asn1/rtse/packet-rtse-template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 199a23fb28..45132ff225 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -147,7 +147,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info * next_tvb = tvb_new_subset_remaining(tvb, offset); if(!dissector_try_string(rtse_oid_dissector_table, oid, next_tvb, pinfo, tree, data)){ - proto_item *item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); + proto_item *item=proto_tree_add_text(tree, next_tvb, 0, tvb_captured_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); proto_tree *next_tree=proto_item_add_subtree(item, ett_rtse_unknown); expert_add_info_format(pinfo, item, &ei_rtse_dissector_oid_not_implemented, @@ -159,7 +159,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info * * into new_dissector_t we have to do this kludge with * manually step past the content in the ANY type. */ - offset+=tvb_length_remaining(tvb, offset); + offset+=tvb_captured_length_remaining(tvb, offset); return offset; } @@ -245,7 +245,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, offset, hf_rtse_segment_data, &data_tvb); if (data_tvb) { - fragment_length = tvb_length_remaining (data_tvb, 0); + fragment_length = tvb_captured_length_remaining (data_tvb, 0); proto_item_append_text(asn1_ctx.created_item, " (%u byte%s)", fragment_length, plurality(fragment_length, "", "s")); frag_msg = fragment_add_seq_next (&rtse_reassembly_table, @@ -260,7 +260,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d pinfo->fragmented = TRUE; data_handled = TRUE; } else { - fragment_length = tvb_length_remaining (tvb, offset); + fragment_length = tvb_captured_length_remaining (tvb, offset); } col_append_fstr(pinfo->cinfo, COL_INFO, "[RTSE fragment, %u byte%s]", @@ -274,7 +274,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d /* Return other than 0 to indicate that we handled this packet */ return 1; } else { - offset = tvb_length (tvb); + offset = tvb_captured_length (tvb); } pinfo->fragmented = FALSE; data_handled = TRUE; @@ -296,7 +296,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d } top_tree = NULL; - return tvb_length(tvb); + return tvb_captured_length(tvb); } static void rtse_reassemble_init (void) |