From FreeBSD: handle the non-standard Ethertypes for PPPoE that some

3Com hardware uses.

diff --git a/ethertype.h b/ethertype.h
index 959fc0101b8fa2eef4ad6dc62d6ec00ceeb9242f..a6b14c595356b046828e0ca3c5b624587f252625 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -142,6 +142,12 @@
 #ifndef ETHERTYPE_RRCP
 #define ETHERTYPE_RRCP         0x8899
 #endif
+#ifndef ETHERTYPE_PPPOED2
+#define ETHERTYPE_PPPOED2      0x3c12
+#endif
+#ifndef ETHERTYPE_PPPOES2
+#define ETHERTYPE_PPPOES2      0x3c13
+#endif
 #ifndef        ETHERTYPE_LOOPBACK
 #define        ETHERTYPE_LOOPBACK      0x9000
 #endif

diff --git a/print-ether.c b/print-ether.c
index c8d524cbd53dee14e6f4a646872c51635d3ceba9..20a2a65fb868eff1acb5c563bd89c8629983062d 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -290,6 +290,8 @@ ether_encap_print(u_short ether_type, const u_char *p,
 
        case ETHERTYPE_PPPOED:
        case ETHERTYPE_PPPOES:
+       case ETHERTYPE_PPPOED2:
+       case ETHERTYPE_PPPOES2:
                pppoe_print(p, length);
                return (1);