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/h225 | |
| 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/h225')
| -rw-r--r-- | asn1/h225/h225.cnf | 8 | ||||
| -rw-r--r-- | asn1/h225/packet-h225-template.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index e18e98cdec..2bece14afe 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -270,7 +270,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber codec_str[0] = '\0'; %(DEFAULT_BODY)s - if (value_tvb && tvb_captured_length(value_tvb)) { + if (value_tvb && tvb_length(value_tvb)) { dissect_h245_FastStart_OLC(value_tvb, %(ACTX)s->pinfo, tree, codec_str); } @@ -307,7 +307,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber %(DEFAULT_BODY)s if (h225_pi && h225_pi->is_destinationInfo == TRUE) { if (value_tvb) { - len = tvb_captured_length(value_tvb); + len = tvb_length(value_tvb); /* XXX - should this be allocated as an ephemeral string? */ if (len > sizeof h225_pi->dialedDigits - 1) len = sizeof h225_pi->dialedDigits - 1; @@ -556,7 +556,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber tvbuff_t *h4501_tvb = NULL; %(DEFAULT_BODY)s - if (h4501_tvb && tvb_captured_length(h4501_tvb)) { + if (h4501_tvb && tvb_length(h4501_tvb)) { call_dissector(h4501_handle, h4501_tvb, %(ACTX)s->pinfo, tree); } #.END @@ -625,7 +625,7 @@ H221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode tvbuff_t *next_tvb = NULL; %(DEFAULT_BODY)s - if (next_tvb && tvb_captured_length(next_tvb)) { + if (next_tvb && tvb_length(next_tvb)) { call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, %(ACTX)s->pinfo, tree); } #.END diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 26ef8a16ff..78ef8185be 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -159,7 +159,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); col_clear(pinfo->cinfo, COL_INFO); - it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_captured_length(tvb), PSNAME" CS"); + it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS"); tr=proto_item_add_subtree(it, ett_h225); offset = dissect_H323_UserInformation_PDU(tvb, pinfo, tr, NULL); @@ -194,7 +194,7 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); - it=proto_tree_add_protocol_format(tree, proto_h225, tvb, offset, tvb_captured_length(tvb), PSNAME" RAS"); + it=proto_tree_add_protocol_format(tree, proto_h225, tvb, offset, tvb_length(tvb), PSNAME" RAS"); tr=proto_item_add_subtree(it, ett_h225); offset = dissect_RasMessage_PDU(tvb, pinfo, tr, NULL); |