diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-aim.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
| download | wireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.tar.gz wireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.tar.bz2 wireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.zip | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
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 120599b67e..f3616b2f5c 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -1048,7 +1048,7 @@ dissect_aim_tlv_value_client_capabilities(proto_item *ti _U_, guint16 valueid _U offset = dissect_aim_capability(entry, tvb, offset); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int @@ -1065,14 +1065,14 @@ dissect_aim_tlv_value_client_short_capabilities(proto_item *ti _U_, guint16 valu offset = dissect_aim_short_capability(entry, tvb, offset); } - return tvb_captured_length(tvb); + return tvb_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_captured_length(tvb); + return tvb_length(tvb); } int @@ -1117,7 +1117,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_captured_length(tvb); + return tvb_length(tvb); } static int @@ -1148,7 +1148,7 @@ dissect_aim_tlv_value_string (proto_item *ti, guint16 valueid _U_, tvbuff_t *tvb guint8 *buf; gint string_len; - string_len = tvb_captured_length(tvb); + string_len = tvb_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)); @@ -1178,7 +1178,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_captured_length(tvb); + return tvb_length(tvb); } int @@ -1461,7 +1461,7 @@ dissect_aim_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data break; } - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* Code to actually dissect the packets */ @@ -1471,7 +1471,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_captured_length(tvb) >= 1 && tvb_get_guint8(tvb, 0) != 0x2a) + if(tvb_length(tvb) >= 1 && tvb_get_guint8(tvb, 0) != 0x2a) { /* Not an instant messenger packet, just happened to use the * same port @@ -1484,7 +1484,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_captured_length(tvb); + return tvb_length(tvb); } |