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/h245 | |
| 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/h245')
| -rw-r--r-- | asn1/h245/h245.cnf | 4 | ||||
| -rw-r--r-- | asn1/h245/packet-h245-template.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index bb8dc7ff8d..46f3fa7bcf 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -981,7 +981,7 @@ NonStandardIdentifier/h221NonStandard/manufacturerCode VAL_PTR = &manufacturerC tvbuff_t *next_tvb = NULL; %(DEFAULT_BODY)s - if (next_tvb && tvb_length(next_tvb)) { + if (next_tvb && tvb_captured_length(next_tvb)) { call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, %(ACTX)s->pinfo, tree); } #.END @@ -994,7 +994,7 @@ NonStandardIdentifier/h221NonStandard/manufacturerCode VAL_PTR = &manufacturerC %(DEFAULT_BODY)s - if (next_tvb && tvb_length(next_tvb)) { + if (next_tvb && tvb_captured_length(next_tvb)) { saved_h245_pi = h245_pi; h245_pi = NULL; item = proto_tree_add_text(tree, next_tvb, 0, -1,"The returned function"); diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index 60fe8f1860..74e68df4e9 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -425,11 +425,11 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - it=proto_tree_add_protocol_format(parent_tree, proto_h245, tvb, 0, tvb_length(tvb), PSNAME); + it=proto_tree_add_protocol_format(parent_tree, proto_h245, tvb, 0, tvb_captured_length(tvb), PSNAME); tr=proto_item_add_subtree(it, ett_h245); /* assume that whilst there is more tvb data, there are more h245 commands */ - while ( tvb_length_remaining( tvb, offset>>3 )>0 ){ + while ( tvb_captured_length_remaining( tvb, offset>>3 )>0 ){ CLEANUP_PUSH(reset_h245_pi, NULL); h245_pi=wmem_new(wmem_packet_scope(), h245_packet_info); init_h245_packet_info(h245_pi); |