diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 17:30:22 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-24 00:31:25 +0000 |
| commit | 9b5b7c1a9074c7d64bd07fe68377d9ad06ccbc2a (patch) | |
| tree | fbb55ae5fdfb2799424c6ad919f0ef1c7429392d /epan/reassemble.c | |
| parent | 893e1e516ae58d662aeaec78f86838eb9d3246c5 (diff) | |
Remove deprecated tvb_length calls
Trust that the files in epan/ immediately (not dissectors) know what they're
doing so just blindly convert them to captured length.
Change-Id: I872f7d58b2e15ae82c75fd56f4873996fbc97be7
Reviewed-on: https://code.wireshark.org/review/9083
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/reassemble.c')
| -rw-r--r-- | epan/reassemble.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/reassemble.c b/epan/reassemble.c index 811fd2fb3f..16abe70918 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -1451,7 +1451,7 @@ fragment_add_check(reassembly_table *table, tvbuff_t *tvb, const int offset, * If this is a short frame, then we can't, and don't, do * reassembly on it. We just give up. */ - if (tvb_reported_length(tvb) > tvb_length(tvb)) + if (tvb_reported_length(tvb) > tvb_captured_length(tvb)) return NULL; if (fragment_add_work(fd_head, tvb, offset, pinfo, frag_offset, @@ -2256,8 +2256,8 @@ show_fragment(fragment_item *fd, const int offset, const fragment_items *fit, } else { name = g_strdup(proto_registrar_get_name(*(fit->hf_fragments))); } - proto_item_set_text(fi, "%u %s (%u byte%s): ", count, name, tvb_length(tvb), - plurality(tvb_length(tvb), "", "s")); + proto_item_set_text(fi, "%u %s (%u byte%s): ", count, name, tvb_captured_length(tvb), + plurality(tvb_captured_length(tvb), "", "s")); g_free(name); } else { proto_item_append_text(fi, ", "); @@ -2379,13 +2379,13 @@ show_fragment_tree(fragment_head *fd_head, const fragment_items *fit, if (fit->hf_reassembled_length) { proto_item *fli = proto_tree_add_uint(ft, *(fit->hf_reassembled_length), - tvb, 0, 0, tvb_length (tvb)); + tvb, 0, 0, tvb_captured_length (tvb)); PROTO_ITEM_SET_GENERATED(fli); } if (fit->hf_reassembled_data) { proto_item *fli = proto_tree_add_item(ft, *(fit->hf_reassembled_data), - tvb, 0, tvb_length(tvb), ENC_NA); + tvb, 0, tvb_captured_length(tvb), ENC_NA); PROTO_ITEM_SET_GENERATED(fli); } @@ -2439,13 +2439,13 @@ show_fragment_seq_tree(fragment_head *fd_head, const fragment_items *fit, if (fit->hf_reassembled_length) { proto_item *fli = proto_tree_add_uint(ft, *(fit->hf_reassembled_length), - tvb, 0, 0, tvb_length (tvb)); + tvb, 0, 0, tvb_captured_length (tvb)); PROTO_ITEM_SET_GENERATED(fli); } if (fit->hf_reassembled_data) { proto_item *fli = proto_tree_add_item(ft, *(fit->hf_reassembled_data), - tvb, 0, tvb_length(tvb), ENC_NA); + tvb, 0, tvb_captured_length(tvb), ENC_NA); PROTO_ITEM_SET_GENERATED(fli); } |