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-aol.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
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-aol.c')
| -rw-r--r-- | epan/dissectors/packet-aol.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-aol.c b/epan/dissectors/packet-aol.c index 6fb9fbaf36..cb8870e838 100644 --- a/epan/dissectors/packet-aol.c +++ b/epan/dissectors/packet-aol.c @@ -144,7 +144,7 @@ static guint dissect_aol_init(tvbuff_t *tvb, packet_info *pinfo _U_, guint offse guint16 win_ver = 0; /* Add the Data subtree */ - data_item = proto_tree_add_item(tree,hf_aol_init,tvb,offset,tvb_captured_length_remaining(tvb,offset)-1,ENC_NA); + data_item = proto_tree_add_item(tree,hf_aol_init,tvb,offset,tvb_length_remaining(tvb,offset)-1,ENC_NA); data_tree = proto_item_add_subtree(data_item,ett_aol_data); /* Now, parse the structure */ @@ -180,8 +180,8 @@ static guint dissect_aol_init(tvbuff_t *tvb, packet_info *pinfo _U_, guint offse proto_tree_add_item(data_tree,hf_aol_num_colors, tvb,offset,2,ENC_LITTLE_ENDIAN); offset += 2; /* 37b */ /* WAOL 1.5 (48b), >= 2.5 (49b) */ - if (tvb_captured_length_remaining(tvb,offset) <= 13) { /* WAOL 1.5 - 3.0 */ - if (tvb_captured_length_remaining(tvb,offset) == 13) { /* WAOL > 1.5 */ + if (tvb_length_remaining(tvb,offset) <= 13) { /* WAOL 1.5 - 3.0 */ + if (tvb_length_remaining(tvb,offset) == 13) { /* WAOL > 1.5 */ proto_tree_add_item(data_tree,hf_aol_filler,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; } @@ -252,7 +252,7 @@ static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (pdu_len > 0) { old_offset = offset; - if (tvb_captured_length_remaining(tvb,offset) > pdu_len) { + if (tvb_length_remaining(tvb,offset) > pdu_len) { /* Init packets are a special case */ if (pdu_type == AOL_P3_TYPE_INIT) { offset = dissect_aol_init(tvb,pinfo,offset,aol_tree); @@ -287,14 +287,14 @@ static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* End-of-Frame Marker */ - if (tvb_captured_length_remaining(tvb,offset) >= 1) { + if (tvb_length_remaining(tvb,offset) >= 1) { proto_tree_add_item(aol_tree,hf_aol_end,tvb,offset,1,ENC_NA);/* offset += 1;*/ } else { /* Malformed Packet */ expert_add_info(pinfo,ti,&ei_aol_end_missing); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } /** @@ -302,11 +302,11 @@ static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ static int dissect_aol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { /* Ensure this really is an AOL packet */ - if (tvb_captured_length(tvb) >= 1 && tvb_get_guint8(tvb,0) != AOL_P3_FRAME_START) return 0; + if (tvb_length(tvb) >= 1 && tvb_get_guint8(tvb,0) != AOL_P3_FRAME_START) return 0; /* Dissect PDUs */ tcp_dissect_pdus(tvb,pinfo,tree,aol_desegment,9,get_aol_pdu_len,dissect_aol_pdu,data); - return tvb_captured_length(tvb); + return tvb_length(tvb); } /** |