diff options
Diffstat (limited to 'asn1/qsig')
-rw-r--r-- | asn1/qsig/packet-qsig-template.c | 20 | ||||
-rw-r--r-- | asn1/qsig/qsig.cnf | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c index a0f79e1081..53719784a3 100644 --- a/asn1/qsig/packet-qsig-template.c +++ b/asn1/qsig/packet-qsig-template.c @@ -400,7 +400,7 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; service = get_service(opcode); - ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_captured_length(tvb), ENC_NA); qsig_tree = proto_item_add_subtree(ti, ett_qsig); proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode); @@ -419,9 +419,9 @@ dissect_qsig_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (op_ptr->arg_pdu) offset = op_ptr->arg_pdu(tvb, pinfo, qsig_tree, NULL); else - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_captured_length_remaining(tvb, offset) > 0) { proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED ARGUMENT TYPE (QSIG)"); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } return offset; @@ -454,7 +454,7 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return offset; service = get_service(opcode); - ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_captured_length(tvb), ENC_NA); qsig_tree = proto_item_add_subtree(ti, ett_qsig); proto_tree_add_uint(qsig_tree, hf_qsig_operation, tvb, 0, 0, opcode); @@ -473,9 +473,9 @@ dissect_qsig_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (op_ptr->res_pdu) offset = op_ptr->res_pdu(tvb, pinfo, qsig_tree, NULL); else - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_captured_length_remaining(tvb, offset) > 0) { proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED RESULT TYPE (QSIG)"); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } return offset; @@ -507,7 +507,7 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (!err_ptr) return offset; - ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_length(tvb), ENC_NA); + ti = proto_tree_add_item(tree, proto_qsig, tvb, offset, tvb_captured_length(tvb), ENC_NA); qsig_tree = proto_item_add_subtree(ti, ett_qsig); proto_tree_add_uint(qsig_tree, hf_qsig_error, tvb, 0, 0, errcode); @@ -522,9 +522,9 @@ dissect_qsig_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (err_ptr->err_pdu) offset = err_ptr->err_pdu(tvb, pinfo, qsig_tree, NULL); else - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_captured_length_remaining(tvb, offset) > 0) { proto_tree_add_text(qsig_tree, tvb, offset, -1, "UNSUPPORTED ERROR TYPE (QSIG)"); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } return offset; @@ -569,7 +569,7 @@ dissect_qsig_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int codeset PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_item(ie_tree, hf_qsig_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); offset += 2; - if (tvb_length_remaining(tvb, offset) <= 0) + if (tvb_captured_length_remaining(tvb, offset) <= 0) return; switch ((codeset << 8) | ie_type) { case CS4 | QSIG_IE_TRANSIT_COUNTER : diff --git a/asn1/qsig/qsig.cnf b/asn1/qsig/qsig.cnf index 1d77bad080..ec2aefe9cf 100644 --- a/asn1/qsig/qsig.cnf +++ b/asn1/qsig/qsig.cnf @@ -148,14 +148,14 @@ NameData TYPE = FT_STRING DISPLAY = BASE_NONE proto_item *item=NULL; proto_tree *next_tree=NULL; - item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "QSIG: Dissector for extension with OID:%%s not implemented.", extension_oid); + item=proto_tree_add_text(tree, next_tvb, 0, tvb_captured_length_remaining(tvb, offset), "QSIG: Dissector for extension with OID:%%s not implemented.", extension_oid); if(item){ next_tree=proto_item_add_subtree(item, ett_qsig_unknown_extension); } dissect_unknown_ber(actx->pinfo, next_tvb, offset, next_tree); } - offset+=tvb_length_remaining(tvb, offset); + offset+=tvb_captured_length_remaining(tvb, offset); #.END #.FN_BODY AuthAlgorithm/param @@ -168,7 +168,7 @@ NameData TYPE = FT_STRING DISPLAY = BASE_NONE %(DEFAULT_BODY)s data_tree = proto_item_add_subtree(%(ACTX)s->created_item, ett_cnq_PSS1InformationElement); - if (out_tvb && (tvb_length(out_tvb) > 0) && q931_ie_handle) + if (out_tvb && (tvb_captured_length(out_tvb) > 0) && q931_ie_handle) call_dissector(q931_ie_handle, out_tvb, %(ACTX)s->pinfo, data_tree); #.END |