diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-14 14:42:05 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-14 14:42:05 +0000 |
| commit | c766e78cfa1527ed242580b808635b0b5966cf3e (patch) | |
| tree | 7a4318d94e33c292936eb8cffca5e5ff31e73c55 /epan/tvbuff_subset.c | |
| parent | d924325d37c8724a447f76f8789063580bd86876 (diff) | |
| download | wireshark-c766e78cfa1527ed242580b808635b0b5966cf3e.tar.gz wireshark-c766e78cfa1527ed242580b808635b0b5966cf3e.tar.bz2 wireshark-c766e78cfa1527ed242580b808635b0b5966cf3e.zip | |
Rewrite reassemble API to use TVBs instead of raw data.
(it seems to be working for TCP ^^)
svn path=/trunk/; revision=50580
Diffstat (limited to 'epan/tvbuff_subset.c')
| -rw-r--r-- | epan/tvbuff_subset.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/tvbuff_subset.c b/epan/tvbuff_subset.c index a06d60ea09..c37b63b0c2 100644 --- a/epan/tvbuff_subset.c +++ b/epan/tvbuff_subset.c @@ -96,7 +96,9 @@ subset_pbrk_guint8(tvbuff_t *tvb, guint abs_offset, guint limit, const guint8 *n static tvbuff_t * subset_clone(tvbuff_t *tvb, guint abs_offset, guint abs_length) { - return tvb_clone_offset_len(tvb, abs_offset, abs_length); + struct tvb_subset *subset_tvb = (struct tvb_subset *) tvb; + + return tvb_clone_offset_len(subset_tvb->subset.tvb, abs_offset, abs_length); } static const struct tvb_ops tvb_subset_ops = { @@ -222,7 +224,7 @@ tvb_new_subset_remaining(tvbuff_t *backing, const gint backing_offset) } tvbuff_t * -tvb_new_temporary(tvbuff_t *backing) +tvb_new_proxy(tvbuff_t *backing) { return tvb_new_with_subset(backing, backing->reported_length, 0, backing->length); } |