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/t124 | |
| parent | b5a462b087bdd7670e1a69786ebbe3f073084ac3 (diff) | |
| download | wireshark-e308e7c4de81c2ff7159e444b865ac59de4faa2b.tar.gz | |
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/t124')
| -rw-r--r-- | asn1/t124/packet-t124-template.c | 4 | ||||
| -rw-r--r-- | asn1/t124/t124.cnf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index 382c92bf12..e1465e2463 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -131,13 +131,13 @@ dissect_t124_new(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.124"); col_clear(pinfo->cinfo, COL_INFO); - item = proto_tree_add_item(parent_tree, proto_t124, tvb, 0, tvb_length(tvb), ENC_NA); + item = proto_tree_add_item(parent_tree, proto_t124, tvb, 0, tvb_captured_length(tvb), ENC_NA); tree = proto_item_add_subtree(item, ett_t124); asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); dissect_t124_ConnectData(tvb, 0, &asn1_ctx, tree, hf_t124_ConnectData); - return tvb_length(tvb); + return tvb_captured_length(tvb); } static void diff --git a/asn1/t124/t124.cnf b/asn1/t124/t124.cnf index 69238eeb74..5ef0e17274 100644 --- a/asn1/t124/t124.cnf +++ b/asn1/t124/t124.cnf @@ -133,7 +133,7 @@ RegistryAllocateHandleResponse/result AllocateHandleResponseResult /* Not sure why - but lets ignore the length. */ /* We assume the OCTET STRING is all of the remaining bytes */ - if(tvb_length(next_tvb) == 42) { + if(tvb_captured_length(next_tvb) == 42) { /* this is perhaps a naive ... */ next_tvb = tvb_new_subset_remaining(tvb, (old_offset>>3)+1); } @@ -153,7 +153,7 @@ RegistryAllocateHandleResponse/result AllocateHandleResponseResult if(next_tvb) { - ns = tvb_get_string_enc(NULL, t124NSIdentifier, 0, tvb_length(t124NSIdentifier), ENC_ASCII|ENC_NA); + ns = tvb_get_string_enc(NULL, t124NSIdentifier, 0, tvb_captured_length(t124NSIdentifier), ENC_ASCII|ENC_NA); if(ns != NULL) { dissector_try_string(t124_ns_dissector_table, ns, next_tvb, actx->pinfo, top_tree, NULL); g_free(ns); |