Witness: enum witness_interface_state

[metze/wireshark/wip.git] / frame_tvbuff.c

diff --git a/frame_tvbuff.c b/frame_tvbuff.c
index b6d454511392b62ec4a7ae59333d4ea383110907..7682f10d2a608161a1940dae92120f2c27cc9639 100644 (file)
--- a/frame_tvbuff.c
+++ b/frame_tvbuff.c
@@ -56,7 +56,10 @@ frame_read(struct tvb_frame *frame_tvb, struct wtap_pkthdr *phdr, Buffer *buf)
        if (cfile.wth != frame_tvb->wth)
                return FALSE;
 
-       if (!wtap_seek_read(frame_tvb->wth, frame_tvb->file_off, phdr, buf, frame_tvb->tvb.length + frame_tvb->offset, &err, &err_info)) {
+       /* XXX, what if phdr->caplen isn't equal to
+        * frame_tvb->tvb.length + frame_tvb->offset?
+        */
+       if (!wtap_seek_read(frame_tvb->wth, frame_tvb->file_off, phdr, buf, &err, &err_info)) {
                switch (err) {
                        case WTAP_ERR_UNSUPPORTED_ENCAP:
                        case WTAP_ERR_BAD_FILE:
@@ -208,11 +211,12 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf)
 
        frame_tvb = (struct tvb_frame *) tvb;
 
-       /* XXX, how to handle fd->file_off == -1 (edited packet) ?? */
-       /* don't care, reassemble code was doing whole copy of data, so it'll work the same */
-
        /* XXX, wtap_can_seek() */
-       if (cfile.wth && cfile.wth->random_fh) {
+       if (cfile.wth && cfile.wth->random_fh 
+#ifdef WANT_PACKET_EDITOR
+               && fd->file_off != -1 /* generic clone for modified packets */
+#endif
+       ) {
                frame_tvb->wth = cfile.wth;
                frame_tvb->file_off = fd->file_off;
                frame_tvb->offset = 0;
@@ -266,3 +270,71 @@ frame_clone(tvbuff_t *tvb, guint abs_offset, guint abs_length)
 
        return cloned_tvb;
 }
+
+
+/* based on tvb_new_real_data() */
+tvbuff_t *
+file_tvbuff_new(const frame_data *fd, const guint8 *buf)
+{
+       struct tvb_frame *frame_tvb;
+       tvbuff_t *tvb;
+
+       tvb = tvb_new(&tvb_frame_ops);
+
+       /*
+        * XXX - currently, the length arguments in
+        * tvbuff structure are signed, but the captured
+        * and reported length values are unsigned; this means
+        * that length values > 2^31 - 1 will appear as
+        * negative lengths
+        *
+        * Captured length values that large will already
+        * have been filtered out by the Wiretap modules
+        * (the file will be reported as corrupted), to
+        * avoid trying to allocate large chunks of data.
+        *
+        * Reported length values will not have been
+        * filtered out, and should not be filtered out,
+        * as those lengths are not necessarily invalid.
+        *
+        * For now, we clip the reported length at G_MAXINT
+        *
+        * (XXX, is this still a problem?) There was an exception when we call
+        * tvb_new_real_data() now there's no one
+        */
+
+       tvb->real_data       = buf;
+       tvb->length          = fd->cap_len;
+       tvb->reported_length = fd->pkt_len > G_MAXINT ? G_MAXINT : fd->pkt_len;
+       tvb->initialized     = TRUE;
+
+       /*
+        * This is the top-level real tvbuff for this data source,
+        * so its data source tvbuff is itself.
+        */
+       tvb->ds_tvb = tvb;
+
+       frame_tvb = (struct tvb_frame *) tvb;
+
+       /* XXX, wtap_can_seek() */
+       if (cfile.wth && cfile.wth->random_fh 
+#ifdef WANT_PACKET_EDITOR
+               && fd->file_off != -1 /* generic clone for modified packets */
+#endif
+       ) {
+               frame_tvb->wth = cfile.wth;
+               frame_tvb->file_off = fd->file_off;
+               frame_tvb->offset = 0;
+       } else
+               frame_tvb->wth = NULL;
+
+       frame_tvb->buf = NULL;
+
+       return tvb;
+}
+
+tvbuff_t *
+file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf)
+{
+       return frame_tvbuff_new(fd, buffer_start_ptr(buf));
+}