From: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Date: Thu, 9 Jun 2011 21:37:19 +0000 (-0000)
Subject: - Add something to columns when using  mime-encap
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=178def67b7e5c6b3547d79eb4dc31415ab96997c;p=metze%2Fwireshark%2Fwip.git

- 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 7880a7b95f..4dab0fc981 100644
--- 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 c42d95e8ba..b5b0757c9f 100644
--- 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 e0d644f1e7..1a9e5cd830 100644
--- 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;