diff options
| author | AndersBroman <a.broman@bredband.net> | 2015-04-14 08:55:47 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-14 06:58:40 +0000 |
| commit | 870d223b69c962902778baeabbe952f560a27426 (patch) | |
| tree | c2181fcceb1ec3f42acc3fd0c35e837a0be861fa /epan/dissectors/packet-aim.c | |
| parent | 62c0e032e062c6e3d932d311bcca9f281ade27f4 (diff) | |
Change deprecated API tvb_length -> tvb_reported_length
Change-Id: I14577dccaed5aa5ed85e94b6810a94b4c8b2e437
Reviewed-on: https://code.wireshark.org/review/8059
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-aim.c')
| -rw-r--r-- | epan/dissectors/packet-aim.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index b6d99cb4d6..7b66e1f8c0 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -1034,7 +1034,7 @@ dissect_aim_tlv_value_client_capabilities(proto_item *ti _U_, guint16 valueid _U offset = dissect_aim_capability(entry, tvb, offset); } - return tvb_length(tvb); + return tvb_reported_length(tvb); } static int @@ -1051,14 +1051,14 @@ dissect_aim_tlv_value_client_short_capabilities(proto_item *ti _U_, guint16 valu offset = dissect_aim_short_capability(entry, tvb, offset); } - return tvb_length(tvb); + return tvb_reported_length(tvb); } int dissect_aim_tlv_value_time(proto_item *ti _U_, guint16 valueid _U_, tvbuff_t *tvb, packet_info *pinfo _U_) { /* FIXME */ - return tvb_length(tvb); + return tvb_reported_length(tvb); } int @@ -1103,7 +1103,7 @@ static int dissect_aim_tlv_value_userstatus(proto_item *ti _U_, guint16 valueid _U_, tvbuff_t *tvb, packet_info *pinfo _U_) { /* FIXME */ - return tvb_length(tvb); + return tvb_reported_length(tvb); } static int @@ -1134,7 +1134,7 @@ dissect_aim_tlv_value_string (proto_item *ti, guint16 valueid _U_, tvbuff_t *tvb guint8 *buf; gint string_len; - string_len = tvb_length(tvb); + string_len = tvb_reported_length(tvb); buf = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, string_len, ENC_UTF_8|ENC_NA); proto_item_set_text(ti, "Value: %s", format_text(buf, string_len)); @@ -1164,7 +1164,7 @@ dissect_aim_tlv_value_string08_array (proto_item *ti, guint16 valueid _U_, tvbuf int dissect_aim_tlv_value_bytes (proto_item *ti _U_, guint16 valueid _U_, tvbuff_t *tvb _U_, packet_info *pinfo _U_) { - return tvb_length(tvb); + return tvb_reported_length(tvb); } int @@ -1445,7 +1445,7 @@ dissect_aim_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data break; } - return tvb_length(tvb); + return tvb_reported_length(tvb); } /* Code to actually dissect the packets */ @@ -1455,7 +1455,7 @@ dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /* check, if this is really an AIM packet, they start with 0x2a */ /* XXX - I've seen some stuff starting with 0x5a followed by 0x2a */ - if(tvb_length(tvb) >= 1 && tvb_get_guint8(tvb, 0) != 0x2a) + if(tvb_reported_length(tvb) >= 1 && tvb_get_guint8(tvb, 0) != 0x2a) { /* Not an instant messenger packet, just happened to use the * same port @@ -1468,7 +1468,7 @@ dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) tcp_dissect_pdus(tvb, pinfo, tree, aim_desegment, 6, get_aim_pdu_len, dissect_aim_pdu, data); - return tvb_length(tvb); + return tvb_reported_length(tvb); } |