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/isdn-sup | |
| parent | 7398779206eb53ec17bf2f4f4f7fad414b0c7391 (diff) | |
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/isdn-sup')
| -rw-r--r-- | asn1/isdn-sup/packet-isdn-sup-template.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asn1/isdn-sup/packet-isdn-sup-template.c b/asn1/isdn-sup/packet-isdn-sup-template.c index f6d5d358a7..0ddc7e53bb 100644 --- a/asn1/isdn-sup/packet-isdn-sup-template.c +++ b/asn1/isdn-sup/packet-isdn-sup-template.c @@ -161,7 +161,7 @@ dissect_isdn_sup_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (!op_ptr) return offset; - ti = proto_tree_add_item(tree, proto_isdn_sup, tvb, offset, tvb_captured_length(tvb), ENC_NA); + ti = proto_tree_add_item(tree, proto_isdn_sup, tvb, offset, tvb_length(tvb), ENC_NA); isdn_sup_tree = proto_item_add_subtree(ti, ett_isdn_sup); proto_tree_add_uint(isdn_sup_tree, hf_isdn_sup_operation, tvb, 0, 0, opcode); @@ -176,9 +176,9 @@ dissect_isdn_sup_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (op_ptr->arg_pdu) offset = op_ptr->arg_pdu(tvb, pinfo, isdn_sup_tree, NULL); else - if (tvb_captured_length_remaining(tvb, offset) > 0) { + if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_text(isdn_sup_tree, tvb, offset, -1, "UNSUPPORTED ARGUMENT TYPE (ETSI Sup)"); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); } return offset; @@ -210,7 +210,7 @@ dissect_isdn_sup_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (!op_ptr) return offset; - ti = proto_tree_add_item(tree, proto_isdn_sup, tvb, offset, tvb_captured_length(tvb), ENC_NA); + ti = proto_tree_add_item(tree, proto_isdn_sup, tvb, offset, tvb_length(tvb), ENC_NA); isdn_sup_tree = proto_item_add_subtree(ti, ett_isdn_sup); proto_tree_add_uint(isdn_sup_tree, hf_isdn_sup_operation, tvb, 0, 0, opcode); @@ -225,9 +225,9 @@ dissect_isdn_sup_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (op_ptr->res_pdu) offset = op_ptr->res_pdu(tvb, pinfo, isdn_sup_tree, NULL); else - if (tvb_captured_length_remaining(tvb, offset) > 0) { + if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_text(isdn_sup_tree, tvb, offset, -1, "UNSUPPORTED RESULT TYPE (ETSI sup)"); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); } return offset; @@ -260,7 +260,7 @@ dissect_isdn_sup_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (!err_ptr) return offset; - ti = proto_tree_add_item(tree, proto_isdn_sup, tvb, offset, tvb_captured_length(tvb), ENC_NA); + ti = proto_tree_add_item(tree, proto_isdn_sup, tvb, offset, tvb_length(tvb), ENC_NA); isdn_sup_tree = proto_item_add_subtree(ti, ett_isdn_sup); proto_tree_add_uint(isdn_sup_tree, hf_isdn_sup_error, tvb, 0, 0, errcode); @@ -275,9 +275,9 @@ dissect_isdn_sup_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * if (err_ptr->err_pdu) offset = err_ptr->err_pdu(tvb, pinfo, isdn_sup_tree, NULL); else - if (tvb_captured_length_remaining(tvb, offset) > 0) { + if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_text(isdn_sup_tree, tvb, offset, -1, "UNSUPPORTED ERROR TYPE (ETSI sup)"); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); } return offset; |