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-ositp.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-ositp.c')
| -rw-r--r-- | epan/dissectors/packet-ositp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index b9aca85360..b286bf26e6 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -925,7 +925,7 @@ static int ositp_decode_DR(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, /* User data */ call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; @@ -1181,7 +1181,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, offset += li; next_tvb = tvb_new_subset_remaining(tvb, offset); - fragment_length = tvb_captured_length(next_tvb); + fragment_length = tvb_length(next_tvb); if (fragment) { col_append_fstr(pinfo->cinfo, COL_INFO, " [COTP fragment, %u byte%s]", fragment_length, plurality(fragment_length, "", "s")); @@ -1253,7 +1253,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, } } - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; @@ -1455,7 +1455,7 @@ static int ositp_decode_ED(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, next_tvb = tvb_new_subset_remaining(tvb, offset); call_dissector(data_handle,next_tvb, pinfo, tree); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; @@ -1665,7 +1665,7 @@ static int ositp_decode_CC(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, } else call_dissector(data_handle, next_tvb, pinfo, tree); - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; @@ -2147,7 +2147,7 @@ static int ositp_decode_UD(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, /*call_dissector(data_handle,next_tvb, pinfo, tree); */ - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; |