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-wlccp.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-wlccp.c')
| -rw-r--r-- | epan/dissectors/packet-wlccp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 33e545cea4..19b134edbb 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -1009,7 +1009,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(get_tlv_flag() || get_mic_flag()) { - if (tvb_captured_length_remaining(tvb,offset) < 4) + if (tvb_length_remaining(tvb,offset) < 4) { /* something is wrong if the TLV flag is set and there's not enough left in the buffer */ @@ -1019,7 +1019,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { - while (tvb_captured_length_remaining(tvb,offset) >= 4) + while (tvb_length_remaining(tvb,offset) >= 4) { old_offset = offset; offset = dissect_wlccp_tlvs(wlccp_tree, tvb, offset, 0); @@ -2010,9 +2010,9 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse DISSECTOR_ASSERT(_offset > _old_offset); } /* while bytes_left >= 4*/ - } /* _container_flag && (tvb_captured_length_remaining(_tvb,_offset) >= 4) */ + } /* _container_flag && (tvb_length_remaining(_tvb,_offset) >= 4) */ - } /*_container_flag && (tvb_captured_length_remaining(_tvb,_offset) < 4) */ + } /*_container_flag && (tvb_length_remaining(_tvb,_offset) < 4) */ /* done with decoding the contained TLVs */ |