From William J. Hulley: support for the Transparent Ethernet Bridge

ethertype in GRE.

diff --git a/CREDITS b/CREDITS
index cf42105aa1712275f2bbb1a44a1ef9bbf42463e8..665553516fefe3dcd8f2866838a0fdfdb219f0b8 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -161,7 +161,8 @@ Additional people who have contributed patches:
        Victor Oppleman                 <oppleman at users dot sourceforge dot net>
        Wesley Griffin                  <wgriffin at users dot sourceforge dot net>
        Wilbert de Graaf                <wilbertdg at hetnet dot nl>
-        Will Drewry                     <will at alum dot bu dot edu>
+       Will Drewry                     <will at alum dot bu dot edu>
+       William J. Hulley               <bill dot hulley at gmail dot com>
        Yen Yen Lim
        Yoshifumi Nishida
 

diff --git a/ethertype.h b/ethertype.h
index dbbbae4afd44b2dcba5e6fcf7649fcf29df89fcb..959fc0101b8fa2eef4ad6dc62d6ec00ceeb9242f 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -76,6 +76,9 @@
 #ifndef ETHERTYPE_SCA
 #define ETHERTYPE_SCA          0x6007
 #endif
+#ifndef ETHERTYPE_TEB
+#define ETHERTYPE_TEB          0x6558
+#endif
 #ifndef        ETHERTYPE_LANBRIDGE
 #define        ETHERTYPE_LANBRIDGE     0x8038
 #endif

diff --git a/print-ether.c b/print-ether.c
index c93fd6c8643f0a92d913fd3b90ff4223ae0a966e..c8d524cbd53dee14e6f4a646872c51635d3ceba9 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -56,6 +56,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_DN,             "DN" },
     { ETHERTYPE_LAT,            "LAT" },
     { ETHERTYPE_SCA,            "SCA" },
+    { ETHERTYPE_TEB,            "TEB" },
     { ETHERTYPE_LANBRIDGE,      "Lanbridge" },
     { ETHERTYPE_DECDNS,         "DEC DNS" },
     { ETHERTYPE_DECDTS,         "DEC DTS" },

diff --git a/print-gre.c b/print-gre.c
index 55f0e9d16b3380bd16269c2699eebe7f24a42ba7..8473848d373b3f0aba4fdfbafce7a35874dce52a 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -225,6 +225,9 @@ gre_print_0(const u_char *bp, u_int length)
        case ETHERTYPE_GRE_ISO:
                isoclns_print(bp, len, len);
                break;
+       case ETHERTYPE_TEB:
+               ether_print(bp, len, len);
+               break;
        default:
                printf("gre-proto-0x%x", prot);
        }