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-dcc.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-dcc.c')
| -rw-r--r-- | epan/dissectors/packet-dcc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index b5babf0b3e..7208a9d10c 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -89,7 +89,7 @@ static gint ett_dcc_trace = -1; #define D_TEXT(label, endpad) { \ int next_offset,left; \ while (tvb_offset_exists(tvb, offset+endpad)) { \ - left = tvb_captured_length_remaining(tvb,offset) - endpad; \ + left = tvb_length_remaining(tvb,offset) - endpad; \ tvb_find_line_end(tvb, offset, left, &next_offset, \ FALSE); \ proto_tree_add_text(dcc_optree, tvb, offset, \ @@ -215,7 +215,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) } /* get at least a full packet structure */ - if ( tvb_captured_length(tvb) < sizeof(DCC_HDR) ) { + if ( tvb_length(tvb) < sizeof(DCC_HDR) ) { /* Doesn't have enough bytes to contain packet header. */ return FALSE; } @@ -240,7 +240,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_item(dcc_tree, hf_dcc_len, tvb, offset, 2, ENC_BIG_ENDIAN); - if ( tvb_captured_length(tvb) < tvb_get_ntohs(tvb, offset)) { + if ( tvb_length(tvb) < tvb_get_ntohs(tvb, offset)) { /* Doesn't have number of bytes that header claims. */ proto_tree_add_text(dcc_tree, tvb, offset, 2, "Error - packet is shorter than header claims!"); } @@ -320,7 +320,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case DCC_OP_ADMN: if ( is_response ) { - int left_local = tvb_captured_length_remaining(tvb, offset) - + int left_local = tvb_length_remaining(tvb, offset) - (int)sizeof(DCC_SIGNATURE); if ( left_local == sizeof(DCC_ADMN_RESP_CLIENTS) ) { |