From Martin Mathieson:

patch and new files provide support for Catapult DCT2000 
.out files to wiretap and ethereal.

This wiretap support (catapult_dct2000.c+h) appends a short header to 
each packet giving some context, and a corresponding ethereal dissector 
(packet-catapult-dct2000.c) parses this before passing the real payload 
onto an existing ethereal dissector (for ethernet, ip, lapd, ppp, 
frame-relay,...).

For now, there is only support for saving dct2000 files in their own 
format, although I may add support for converting between dct2000 and 
libpcap later.

updated version of these files and patch, now with support 
for MTP2.  Olivier's trace used the ANSI variant - the MTP2 and MTP3 
decode fine with the right preferences set (although the ISUP dissector 
reports a reserved/retired message type).

Witha a change to NOT to declare gboolean catapult_dct2000_board_ports_only;
as extern as MSVC choked on it.

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

1 files changed, 11 insertions, 0 deletions

diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index 5d0c5eadef..847ed8d2df 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -144,6 +144,11 @@ typedef struct {
 
 typedef struct _k12_t k12_t;
 
+typedef struct {
+	time_t	start_secs;
+	guint32	start_usecs;
+} catapult_dct2000_t;
+
 typedef gboolean (*subtype_read_func)(struct wtap*, int*, char**, long*);
 typedef gboolean (*subtype_seek_read_func)(struct wtap*, long, union wtap_pseudo_header*,
 					guint8*, int, int *, char **);
@@ -174,6 +179,7 @@ struct wtap {
 		airopeek9_t		*airopeek9;
 		erf_t			*erf;
 		k12_t			*k12;
+		catapult_dct2000_t*	catapult_dct2000;
 		void			*generic;
 	} capture;
 
@@ -231,6 +237,10 @@ typedef struct {
 	guint32 file_offset;
 } k12_dump_t;
 
+typedef struct {
+    gboolean           first_packet_written;
+    struct wtap_nstime start_time;
+} dct2000_dump_t;
 
 struct wtap_dumper {
 	FILE*			fh;
@@ -248,6 +258,7 @@ struct wtap_dumper {
 		_5views_dump_t		*_5views;
 		niobserver_dump_t	*niobserver;
 		k12_dump_t		*k12;
+		dct2000_dump_t		*dct2000;
 	} dump;
 
 	subtype_write_func	subtype_write;