diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-04-10 14:57:55 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-10 13:19:33 +0000 |
| commit | 1785d4206111dcbd0ef7ced3a1aad55da76c7b91 (patch) | |
| tree | b2f250c1f8e3656a304a4907b1a4c1e6acad9f47 /asn1/t38 | |
| parent | 38d3e063d3fb3d007e61b5e8681372c247171218 (diff) | |
Remove depricated API tvb_length -> tvb_reported_length
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a
Reviewed-on: https://code.wireshark.org/review/8011
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1/t38')
| -rw-r--r-- | asn1/t38/packet-t38-template.c | 6 | ||||
| -rw-r--r-- | asn1/t38/t38.cnf | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 09d1154a6b..edf59060da 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -538,7 +538,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_UDPTLPacket_PDU(tvb, pinfo, tr, NULL); - if (tvb_length_remaining(tvb,offset)>0){ + if (tvb_reported_length_remaining(tvb,offset)>0){ proto_tree_add_expert_format(tr, pinfo, &ei_t38_malformed, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED PACKET or wrong preference settings]"); col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); @@ -575,13 +575,13 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_INFO, "TCP: IFPPacket"); - while(tvb_length_remaining(tvb,offset)>0) + while(tvb_reported_length_remaining(tvb,offset)>0) { next_tvb = tvb_new_subset_remaining(tvb, offset); offset += dissect_IFPPacket_PDU(next_tvb, pinfo, tr, NULL); ifp_packet_number++; - if(tvb_length_remaining(tvb,offset)>0){ + if(tvb_reported_length_remaining(tvb,offset)>0){ if(t38_tpkt_usage == T38_TPKT_ALWAYS){ proto_tree_add_expert_format(tr, pinfo, &ei_t38_malformed, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED PACKET or wrong preference settings]"); diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index 7fa29ee1c7..aef2791aea 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -152,7 +152,7 @@ VAL_PTR=&Data_Field_field_type_value guint32 value_len; %(DEFAULT_BODY)s - value_len = tvb_length(value_tvb); + value_len = tvb_reported_length(value_tvb); #.FN_FTR Data-Field/_item/field-data if (primary_part){ |