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-tds.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-tds.c')
| -rw-r--r-- | epan/dissectors/packet-tds.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index b438b18f7f..48e811fb4d 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -1406,7 +1406,7 @@ netlib_check_login_pkt(tvbuff_t *tvb, guint offset, packet_info *pinfo, guint8 t { guint tds_major, bytes_avail; - bytes_avail = tvb_captured_length(tvb) - offset; + bytes_avail = tvb_length(tvb) - offset; /* * we have two login packet styles, one for TDS 4.2 and 5.0 */ @@ -2110,7 +2110,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tree = proto_item_add_subtree(item, ett_tds_message); dissect_tds_all_headers(tvb, &offset, pinfo, tree); - while(tvb_captured_length_remaining(tvb, offset) > 0) { + while(tvb_length_remaining(tvb, offset) > 0) { /* * RPC name. */ @@ -2149,7 +2149,7 @@ dissect_tds_rpc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; /* dissect parameters */ - while(tvb_captured_length_remaining(tvb, offset) > 0) { + while(tvb_length_remaining(tvb, offset) > 0) { gboolean plp; len = tvb_get_guint8(tvb, offset); @@ -2603,7 +2603,7 @@ dissect_tds_tcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * * If we don't have even enough data for a Netlib header, * just say it's not TDS. */ - if (tvb_captured_length(tvb) < 8) + if (tvb_length(tvb) < 8) return FALSE; /* |