diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 20:31:08 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 18:42:28 +0000 |
| commit | d0ac93756794ed29650dc91f7f8304b11504c61b (patch) | |
| tree | ca84581f86ad0d451a9600533a57b4f56e261fa0 /asn1/h450 | |
| parent | 7398779206eb53ec17bf2f4f4f7fad414b0c7391 (diff) | |
| download | wireshark-d0ac93756794ed29650dc91f7f8304b11504c61b.tar.gz | |
Revert "Update ASN.1 source files with the API changes done in g021e7af"
This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b.
Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1/h450')
| -rw-r--r-- | asn1/h450/packet-h450-template.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index dde56645c7..89a9313c1c 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -145,12 +145,12 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rctx->apdu_depth), " %s", p); } - if (op_ptr->arg_pdu && (tvb_captured_length_remaining(tvb, offset) > 0)) + if (op_ptr->arg_pdu && (tvb_length_remaining(tvb, offset) > 0)) offset = op_ptr->arg_pdu(tvb, pinfo, tree, NULL); else - if (tvb_captured_length_remaining(tvb, offset) > 0) { + if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED ARGUMENT TYPE (H.450)"); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); } return offset; @@ -190,12 +190,12 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rctx->apdu_depth), " %s", p); } - if (op_ptr->res_pdu && (tvb_captured_length_remaining(tvb, offset) > 0)) + if (op_ptr->res_pdu && (tvb_length_remaining(tvb, offset) > 0)) offset = op_ptr->res_pdu(tvb, pinfo, tree, NULL); else - if (tvb_captured_length_remaining(tvb, offset) > 0) { + if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED RESULT TYPE (H.450)"); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); } return offset; @@ -235,12 +235,12 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), rctx->apdu_depth), " %s", p); } - if (err_ptr->err_pdu && (tvb_captured_length_remaining(tvb, offset) > 0)) + if (err_ptr->err_pdu && (tvb_length_remaining(tvb, offset) > 0)) offset = err_ptr->err_pdu(tvb, pinfo, tree, NULL); else - if (tvb_captured_length_remaining(tvb, offset) > 0) { + if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_text(tree, tvb, offset, -1, "UNSUPPORTED ERROR TYPE (H.450)"); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); } return offset; |