Handle (GRE-encapsulated) PPTP

diff --git a/ethertype.h b/ethertype.h
index 1d92d78e1b11113cf4e26b06959fac6f064040d6..6e03e721b5c623b99876bd4b806fa1cf3db6aa1f 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.12 2000-09-23 08:03:30 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.13 2001-02-04 02:19:23 fenner Exp $ (LBL)
  */
 
 /*
@@ -102,6 +102,9 @@
 #ifndef ETHERTYPE_IPV6
 #define ETHERTYPE_IPV6         0x86dd
 #endif
+#ifndef ETHERTYPE_PPTP
+#define        ETHERTYPE_PPTP          0x880b
+#endif
 #ifndef ETHERTYPE_PPPOED
 #define ETHERTYPE_PPPOED       0x8863
 #endif

diff --git a/print-ether.c b/print-ether.c
index e6d6b09ca9d3b5b3332b745689c267e3ce69cdc9..fd130b8c78a5f78a549d7c733ca097819048ec53 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.61 2000-12-22 22:45:10 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.62 2001-02-04 02:19:23 fenner Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -226,6 +226,14 @@ ether_encap_print(u_short ethertype, const u_char *p,
                pppoe_print(p, length);
                return (1);
  
+       case ETHERTYPE_PPTP:
+               printf("pptp");
+               if (length) {
+                       printf(": ");
+                       ppp_print(p, length);
+               }
+               return (1);
+
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: