aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gre.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2010-09-23 13:31:28 +0000
committerJörg Mayer <jmayer@loplof.de>2010-09-23 13:31:28 +0000
commit527f5d56535804df80ba90219cfdda0536537b29 (patch)
treee7518558a2c704b91dc24b1945eded0f84fdfc66 /epan/dissectors/packet-gre.c
parentdfcc9ec3f705e82eb309c5a1901baca1aff97d57 (diff)
Jason Masker <jason at masker.net>:
Updates for the Cisco ERSPAN type III (version 2) protocol. svn path=/trunk/; revision=34209
Diffstat (limited to 'epan/dissectors/packet-gre.c')
-rw-r--r--epan/dissectors/packet-gre.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c
index 9c6d3eff5b..94678dec9a 100644
--- a/epan/dissectors/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
@@ -89,7 +89,8 @@ const value_string gre_typevals[] = {
{ SAP_OSINL5, "OSI"},
{ GRE_WCCP, "WCCP"},
{ GRE_NHRP, "NHRP"},
- { GRE_ERSPAN, "ERSPAN"},
+ { GRE_ERSPAN_88BE, "ERSPAN"},
+ { GRE_ERSPAN_22EB, "ERSPAN"},
{ ETHERTYPE_IPX, "IPX"},
{ ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
{ ETHERTYPE_RAW_FR, "Frame Relay"},