diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 15:17:27 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 22:17:56 +0000 |
| commit | 0a9a2554a46ce4e040dba669a3ed22f0e9ab709e (patch) | |
| tree | 931067907b96dc2f2ad7bf815f28aad90f6a0f6b /epan/dissectors/packet-ositp.c | |
| parent | d4f6480253cf303f70c3d831098adf7582403b8f (diff) | |
Remove more deprecated tvb_length calls
Change-Id: Ie137e6f4e20fe26b1a4d9510e267896219c1c631
Reviewed-on: https://code.wireshark.org/review/9075
Reviewed-by: Evan Huus <eapache@gmail.com>
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 15db2649a9..1d2769ba18 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -875,7 +875,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_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; @@ -1131,7 +1131,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_length(next_tvb); + fragment_length = tvb_captured_length(next_tvb); if (fragment) { col_append_fstr(pinfo->cinfo, COL_INFO, " [COTP fragment, %u byte%s]", fragment_length, plurality(fragment_length, "", "s")); @@ -1203,7 +1203,7 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, } } - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; @@ -1405,7 +1405,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_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; @@ -1607,7 +1607,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_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; @@ -2080,7 +2080,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_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); /* we dissected all of the containing PDU */ return offset; |