cvs diff -u6 -N packet-tzsp.c wiretap/libpcap.c wiretap/wtap.c wiretap/wtap.h 
cvs server: I know nothing about packet-tzsp.c
Index: wiretap/libpcap.c
===================================================================
RCS file: /cvsroot/ethereal/wiretap/libpcap.c,v
retrieving revision 1.85
diff -u -6 -r1.85 libpcap.c
--- libpcap.c	2002/11/27 22:23:34	1.85
+++ libpcap.c	2002/12/27 05:55:03
@@ -237,12 +237,13 @@
 
 	{ 118,		WTAP_ENCAP_CISCO_IOS },
 	{ 119,		WTAP_ENCAP_PRISM_HEADER }, /* Prism monitor mode hdr */
 	{ 121,		WTAP_ENCAP_HHDLC },	/* HiPath HDLC */
 	{ 122,		WTAP_ENCAP_IP_OVER_FC },   /* RFC 2625 IP-over-FC */
 	{ 123,		WTAP_ENCAP_ATM_SNIFFER }, /* SunATM */
+	{ 126,		WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */
 
 	/*
 	 * The following are entries for libpcap type values that have
 	 * different meanings on different OSes.
 	 *
 	 * We put these *after* the entries for the platform-independent
Index: wiretap/wtap.c
===================================================================
RCS file: /cvsroot/ethereal/wiretap/wtap.c,v
retrieving revision 1.74
diff -u -6 -r1.74 wtap.c
--- wtap.c	2002/11/06 21:49:34	1.74
+++ wtap.c	2002/12/27 05:55:03
@@ -148,13 +148,15 @@
 
 	/* WTAP_ENCAP_COSINE */
 	{ "CoSine L2 debug log", "cosine" },
 
 	/* WTAP_ENCAP_WLAN_HEADER */
 	{ "IEEE 802.11 plus AVS WLAN monitor header", "wlan" },
-
+
+	/* WTAP_ENCAP_TZSP */
+	{ "Tazmen sniffer protocol", "tzsp" },
 };
 
 /* Name that should be somewhat descriptive. */
 const char
 *wtap_encap_string(int encap)
 {
Index: wiretap/wtap.h
===================================================================
RCS file: /cvsroot/ethereal/wiretap/wtap.h,v
retrieving revision 1.126
diff -u -6 -r1.126 wtap.h
--- wtap.h	2002/12/05 22:33:11	1.126
+++ wtap.h	2002/12/27 05:55:05
@@ -117,15 +117,17 @@
 #define WTAP_ENCAP_PRISM_HEADER			25
 #define WTAP_ENCAP_PFLOG			26
 #define WTAP_ENCAP_HHDLC			27
 #define WTAP_ENCAP_DOCSIS			28
 #define WTAP_ENCAP_COSINE			29
 #define WTAP_ENCAP_WLAN_HEADER			30
+#define WTAP_ENCAP_TZSP				31
 
+
 /* last WTAP_ENCAP_ value + 1 */
-#define WTAP_NUM_ENCAP_TYPES			31
+#define WTAP_NUM_ENCAP_TYPES			32
 
 /* File types that can be read by wiretap.
    We support writing some many of these file types, too, so we
    distinguish between different versions of them. */
 #define WTAP_FILE_UNKNOWN			0
 #define WTAP_FILE_WTAP				1