aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--packet-gre.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 6dd2ddedf2..c40d28d5fa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -699,6 +699,7 @@ Hannes Gredler <hannes[AT]juniper.net> {
before the PSN byte
Decode the sample rate factor in cflowd5 headers
Support OSI over CHDLC
+ Show the type value for OSI protocols symbolically in GRE
}
Inoue <inoue[AT]ainet.or.jp> {
diff --git a/packet-gre.c b/packet-gre.c
index fc19b21697..b80797c678 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.52 2002/08/28 21:00:13 jmayer Exp $
+ * $Id: packet-gre.c,v 1.53 2002/11/07 22:12:13 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,6 +34,7 @@
#include "etypes.h"
#include "greproto.h"
#include "ipproto.h"
+#include "llcsaps.h"
/*
* See RFC 1701 "Generic Routing Encapsulation (GRE)", RFC 1702
@@ -71,6 +72,7 @@ static void dissect_gre_wccp2_redirect_header(tvbuff_t *, int, proto_tree *);
static const value_string typevals[] = {
{ ETHERTYPE_PPP, "PPP" },
{ ETHERTYPE_IP, "IP" },
+ { SAP_OSINL, "OSI"},
{ GRE_WCCP, "WCCP"},
{ ETHERTYPE_IPX, "IPX"},
{ ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },