- Add something to columns when using mime-encap

- Replace decoders in wiretap/CMakeLists.txt

svn path=/trunk/; revision=37637

diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c
index 7880a7b95f442b2fa39855afe945ec13f4d4f848..4dab0fc981db916b627dba75f0805193980613a9 100644 (file)
--- a/epan/dissectors/packet-mime-encap.c
+++ b/epan/dissectors/packet-mime-encap.c
@@ -57,6 +57,9 @@ dissect_mime_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item* item;
        guint len;
 
+       /* XXX, COL_INFO */
+
+       col_set_str(pinfo->cinfo, COL_PROTOCOL, "MIME_FILE");
        item = proto_tree_add_item(tree, proto_mime_encap, tvb, 0, -1, FALSE);
 
        /* frames with nsec >= 1000000000 means errors :) */

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index c42d95e8ba1d422c3c982b86921aa4a42ca09136..b5b0757c9f15eac523860eb5a2ee897e3ae12c62 100644 (file)
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -47,11 +47,11 @@ set(WIRETAP_FILES
        ipfix.c
        iptrace.c
        iseries.c
-       jpeg_jfif.c
        k12.c
        lanalyzer.c
        libpcap.c
        mpeg.c
+       mime_file.c
        netmon.c
        netscaler.c
        netscreen.c

diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c
index e0d644f1e71eefa3dd20c04631e0d847058e2390..1a9e5cd830512fece769adfd43811fc0333e55e5 100644 (file)
--- a/wiretap/mime_file.c
+++ b/wiretap/mime_file.c
@@ -85,8 +85,7 @@ mime_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
                return FALSE;
        }
 
-       /* XXX, mtime of file? */
-       wth->phdr.ts.secs = 0;
+       wth->phdr.ts.secs = wth->data_offset;
        wth->phdr.ts.nsecs = 0;
 
        *data_offset = wth->data_offset;