aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2005-05-13 19:44:25 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2005-05-13 19:44:25 +0000
commit25dd1ce767f63e1a203cb0115aa36a738131ebdd (patch)
treebd15b6584c3c8fbcfec9808b5cdf52fe198f908a
parent1eeda6e94652bc2b7ca674bc3516fedf29a1a2c6 (diff)
Add WTAP_GCOM_TIE1 and WTAP_GCOM_SERIAL for
Oolan Zimmer <ethereal@gcom.com> svn path=/trunk/; revision=14362
-rw-r--r--wiretap/libpcap.c4
-rw-r--r--wiretap/wtap.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 2fc7b78a02..7147b28b38 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -373,6 +373,10 @@ static const struct {
* Framing Procedure.
*/
+ /* Registered by Gcom, Inc. */
+ { 172, WTAP_GCOM_TIE1 },
+ { 173, WTAP_GCOM_SERIAL },
+
/*
* To repeat:
*
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index a6f4ab6cd7..96d2b747ff 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -166,8 +166,10 @@
#define WTAP_ENCAP_NETTL_UNKNOWN 75
#define WTAP_ENCAP_MTP2_WITH_PHDR 76
#define WTAP_ENCAP_JUNIPER_PPPOE 77
+#define WTAP_GCOM_TIE1 78
+#define WTAP_GCOM_SERIAL 79
/* last WTAP_ENCAP_ value + 1 */
-#define WTAP_NUM_ENCAP_TYPES 78
+#define WTAP_NUM_ENCAP_TYPES 80
/* File types that can be read by wiretap.
We support writing some many of these file types, too, so we