aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-01-29 03:51:25 +0000
committerGuy Harris <guy@alum.mit.edu>2004-01-29 03:51:25 +0000
commit073a422f61e286a9d4e6bc56d2eee27bffed78ba (patch)
tree3d9041abaa64f795d44021e84d96c6264fed46c3
parentb024612ad90f90a2ff20d9e56be8c1436437ca1e (diff)
From Shinsuke Suzuki: add the payload type code for IPv6.
svn path=/trunk/; revision=9902
-rw-r--r--AUTHORS1
-rw-r--r--packet-gre.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 774dd273f7..bdfdc1be47 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1021,6 +1021,7 @@ Pavel Novotny <Pavel.Novotny[AT]icn.siemens.de> {
Shinsuke Suzuki <suz[AT]kame.net> {
DHCPv6 and PIM enhancements
+ IPv6 payload for GRE
}
Andrew C. Feren <aferen[AT]cetacean.com> {
diff --git a/packet-gre.c b/packet-gre.c
index 1b15b48a38..4d45bfd503 100644
--- a/packet-gre.c
+++ b/packet-gre.c
@@ -2,7 +2,7 @@
* Routines for the Generic Routing Encapsulation (GRE) protocol
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-gre.c,v 1.54 2003/06/10 05:38:52 guy Exp $
+ * $Id: packet-gre.c,v 1.55 2004/01/29 03:51:25 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -77,6 +77,7 @@ static const value_string typevals[] = {
{ ETHERTYPE_IPX, "IPX"},
{ ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
{ GRE_FR, "Frame Relay"},
+ { ETHERTYPE_IPv6, "IPv6" },
{ 0, NULL }
};