diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
| commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
| tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-aim-chat.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
| download | wireshark-246fe2ca4c67d8c98caa84e2f57694f6322e2f96.tar.gz | |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-aim-chat.c')
| -rw-r--r-- | epan/dissectors/packet-aim-chat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c index a0ff6e592f..0c648bfa50 100644 --- a/epan/dissectors/packet-aim-chat.c +++ b/epan/dissectors/packet-aim-chat.c @@ -73,7 +73,7 @@ static gint ett_aim_chat = -1; static int dissect_aim_chat_userinfo_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *chat_tree) { int offset = 0; - while(tvb_length_remaining(tvb, offset) > 0) { + while(tvb_captured_length_remaining(tvb, offset) > 0) { offset = dissect_aim_userinfo(tvb, pinfo, offset, chat_tree); } return offset; @@ -89,12 +89,12 @@ static int dissect_aim_chat_outgoing_msg(tvbuff_t *tvb, packet_info *pinfo, prot buddyname_length = aim_get_buddyname( &buddyname, tvb, 30 ); /* channel message from client */ - aim_get_message( msg, tvb, 40 + buddyname_length, tvb_length(tvb) + aim_get_message( msg, tvb, 40 + buddyname_length, tvb_captured_length(tvb) - 40 - buddyname_length ); col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg); - return tvb_length(tvb); + return tvb_captured_length(tvb); } @@ -108,7 +108,7 @@ static int dissect_aim_chat_incoming_msg(tvbuff_t *tvb, packet_info *pinfo, prot msg=(guchar *)wmem_alloc(wmem_packet_scope(), 1000); buddyname_length = aim_get_buddyname( &buddyname, tvb, 30 ); - aim_get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb) + aim_get_message( msg, tvb, 36 + buddyname_length, tvb_captured_length(tvb) - 36 - buddyname_length ); col_append_fstr(pinfo->cinfo, COL_INFO, "from: %s", buddyname); @@ -119,7 +119,7 @@ static int dissect_aim_chat_incoming_msg(tvbuff_t *tvb, packet_info *pinfo, prot "Screen Name: %s", format_text(buddyname, buddyname_length)); } - return tvb_length(tvb); + return tvb_captured_length(tvb); } static const aim_subtype aim_fnac_family_chat[] = { |