From: Guy Harris <gharris@steve.local>
Date: Thu, 26 Feb 2009 09:04:20 +0000 (-0800)
Subject: From William J. Hulley: support for the Transparent Ethernet Bridge
X-Git-Tag: tcpdump-4.1.0~141
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/9248d0c2fac920cd401d8ea2a6c7a871e0182f86

From William J. Hulley: support for the Transparent Ethernet Bridge
ethertype in GRE.
---

diff --git a/CREDITS b/CREDITS
index cf42105a..66555351 100644
--- 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 dbbbae4a..959fc010 100644
--- 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 c93fd6c8..c8d524cb 100644
--- 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 55f0e9d1..8473848d 100644
--- 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);
 	}