Add support for writing pcapng files with multiple

encapsulations.
This fixes a bug reported by Sake during the
Sharkfest 09. Thanks for providing a
Netscreen tracefile with multiple link layer
types.
This patch will be included in Wireshark 1.2.1
and higher.

svn path=/trunk/; revision=28862

1 files changed, 6 insertions, 0 deletions

diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index 0dc5269659..6086aa86be 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -272,6 +272,11 @@ typedef struct {
     struct wtap_nstime start_time;
 } dct2000_dump_t;
 
+typedef struct {
+	GArray *interface_data;
+	guint number_of_interfaces;
+} pcapng_dump_t;
+
 struct wtap_dumper {
 	FILE*			fh;
 	int			file_type;
@@ -290,6 +295,7 @@ struct wtap_dumper {
 		k12_dump_t		*k12;
 		dct2000_dump_t		*dct2000;
 		nstrace_dump_t		*nstr;
+		pcapng_dump_t		*pcapng;
 	} dump;
 
 	subtype_write_func	subtype_write;