aboutsummaryrefslogtreecommitdiffstats
path: root/etypes.h
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-01-13 07:47:49 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-01-13 07:47:49 +0000
commit9671071c794c069c51c77e0a535b5fa4bfd6ba37 (patch)
tree83661db200a66c8c887f770684abd0475ca4dba3 /etypes.h
parent050a89004a9444cbed4473b4b3cba31d22df8ea7 (diff)
Make GRE use a dissector table for its protocol types, and register
dissectors for protcools that can be encapsulated inside GRE in that table. Fix a bug in the handling of WCCPv2 IP encapsulation (it was constructing the next tvbuff before, rather than after, advancing the offset past the redirection header). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2893 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'etypes.h')
-rw-r--r--etypes.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/etypes.h b/etypes.h
index d7a5e70f1a..0c21cc4bb2 100644
--- a/etypes.h
+++ b/etypes.h
@@ -1,7 +1,7 @@
/* etypes.h
* Defines ethernet packet types, similar to tcpdump's ethertype.h
*
- * $Id: etypes.h,v 1.14 2000/08/09 22:10:23 deniel Exp $
+ * $Id: etypes.h,v 1.15 2001/01/13 07:47:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -154,6 +154,10 @@
#define ETHERTYPE_MPLS_MULTI 0x8848 /* MPLS multicast packet */
#endif
+#ifndef ETHERTYPE_PPP
+#define ETHERTYPE_PPP 0x880b /* no, this is not PPPoE */
+#endif
+
#endif /* etypes.h */