diff options
| author | AndersBroman <a.broman@bredband.net> | 2015-04-16 15:58:53 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-16 14:01:45 +0000 |
| commit | 338f3a5eb1618507035fdabaece8f54d6be54379 (patch) | |
| tree | b7c57c1ac38f85e912567b5b0a6a8623e441300f /epan/dissectors/packet-distcc.c | |
| parent | 4171f5590b0df5506c98e559100e21300edb33d0 (diff) | |
Remove deprecated tvb_lengt APIs
Change-Id: Ic3c364384dcc1d87089d646665f5900081de13df
Reviewed-on: https://code.wireshark.org/review/8089
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 2fdc33c296..02eeebf88d 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -61,8 +61,8 @@ void proto_register_distcc(void); extern void proto_reg_handoff_distcc(void); #define CHECK_PDU_LEN(x) \ - if(parameter>tvb_length_remaining(tvb, offset) || parameter < 1){\ - len=tvb_length_remaining(tvb, offset);\ + if(parameter>tvb_captured_length_remaining(tvb, offset) || parameter < 1){\ + len=tvb_captured_length_remaining(tvb, offset);\ col_append_str(pinfo->cinfo, COL_INFO, "[Short" x " PDU]");\ } \ tvb_ensure_bytes_exist(tvb, offset, len); @@ -71,11 +71,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_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){\ - if(parameter>tvb_length_remaining(tvb, offset)){\ + if(tvb_captured_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){\ + if(parameter>tvb_captured_length_remaining(tvb, offset)){\ proto_tree_add_expert_format(tree, pinfo, &ei_distcc_short_pdu, tvb, offset-12, -1, "[Short " x " PDU]");\ pinfo->desegment_offset=offset-12;\ - pinfo->desegment_len=parameter-tvb_length_remaining(tvb, offset);\ + pinfo->desegment_len=parameter-tvb_captured_length_remaining(tvb, offset);\ return offset+len;\ }\ }\ |