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-distcc.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-distcc.c')
| -rw-r--r-- | epan/dissectors/packet-distcc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 537c262c2a..196ca7a92d 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -63,8 +63,8 @@ void proto_register_distcc(void); extern void proto_reg_handoff_distcc(void); #define CHECK_PDU_LEN(x) \ - if(parameter>tvb_captured_length_remaining(tvb, offset) || parameter < 1){\ - len=tvb_captured_length_remaining(tvb, offset);\ + if(parameter>tvb_length_remaining(tvb, offset) || parameter < 1){\ + len=tvb_length_remaining(tvb, offset);\ col_append_str(pinfo->cinfo, COL_INFO, "[Short" x " PDU]");\ } \ tvb_ensure_bytes_exist(tvb, offset, len); @@ -73,11 +73,11 @@ extern void proto_reg_handoff_distcc(void); #define DESEGMENT_TCP(x) \ if(distcc_desegment && pinfo->can_desegment){\ /* only attempt reassembly if whe have the full segment */\ - if(tvb_captured_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){\ - if(parameter>tvb_captured_length_remaining(tvb, offset)){\ + if(tvb_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){\ + if(parameter>tvb_length_remaining(tvb, offset)){\ proto_tree_add_text(tree, tvb, offset-12, -1, "[Short " x " PDU]");\ pinfo->desegment_offset=offset-12;\ - pinfo->desegment_len=parameter-tvb_captured_length_remaining(tvb, offset);\ + pinfo->desegment_len=parameter-tvb_length_remaining(tvb, offset);\ return offset+len;\ }\ }\ |