- Replace jpeg_jfif decoder, with more generic mime_file (no more 64KB limit!).

- Add new dissector packet-mime-encap which understands mime_file fragmentation.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37636 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 4 insertions, 2 deletions

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index b65d714dcc..a233644062 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -212,7 +212,7 @@ extern "C" {
 #define WTAP_ENCAP_NSTRACE_2_0                  120
 #define WTAP_ENCAP_FIBRE_CHANNEL_FC2            121
 #define WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS 122
-#define WTAP_ENCAP_JPEG_JFIF                    123
+#define WTAP_ENCAP_JPEG_JFIF                    123	/* obsoleted by WTAP_ENCAP_MIME*/
 #define WTAP_ENCAP_IPNET                        124
 #define WTAP_ENCAP_SOCKETCAN                    125
 #define WTAP_ENCAP_IEEE802_11_NETMON_RADIO      126
@@ -223,6 +223,7 @@ extern "C" {
 #define WTAP_ENCAP_LAPD                         131
 #define WTAP_ENCAP_DVBCI                        132
 #define WTAP_ENCAP_MUX27010                     133
+#define WTAP_ENCAP_MIME                         134
 
 #define WTAP_NUM_ENCAP_TYPES                    wtap_get_num_encap_types()
 
@@ -288,8 +289,9 @@ extern "C" {
 #define WTAP_FILE_DAINTREE_SNA                  56
 #define WTAP_FILE_NETSCALER_1_0                 57
 #define WTAP_FILE_NETSCALER_2_0                 58
-#define WTAP_FILE_JPEG_JFIF                     59
+#define WTAP_FILE_JPEG_JFIF                     59 /* obsoleted by WTAP_FILE_MIME */
 #define WTAP_FILE_IPFIX                         60
+#define WTAP_FILE_MIME                          61
 
 #define WTAP_NUM_FILE_TYPES                     wtap_get_num_file_types()