aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2016-06-14 21:12:16 +0200
committerJörg Mayer <jmayer@loplof.de>2016-06-14 19:13:54 +0000
commit76ed7813d9ce514e8ca39fcc0abffd63a125c34d (patch)
tree3e07196fb251a0d0cc48db198f12b5a160fb5937 /epan/dissectors
parente86af3a5fc0d236925a818c4f6ce673ed9dcf4ec (diff)
Add Aerohive gre tunnel between APs.
Change-Id: I24d0320cd164ead2802af37d07016c9c46d18e9e Reviewed-on: https://code.wireshark.org/review/15903 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-gre.c1
-rw-r--r--epan/dissectors/packet-gre.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c
index 4c1dbc08f7..f81f42885a 100644
--- a/epan/dissectors/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
@@ -129,6 +129,7 @@ const value_string gre_typevals[] = {
{ GRE_ERSPAN_88BE, "ERSPAN"},
{ GRE_ERSPAN_22EB, "ERSPAN"},
{ GRE_MIKROTIK_EOIP, "MIKROTIK EoIP"},
+ { GRE_AIROHIVE, "AIROHIVE AP AP"},
{ ETHERTYPE_IPX, "IPX"},
{ ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
{ ETHERTYPE_RAW_FR, "Frame Relay"},
diff --git a/epan/dissectors/packet-gre.h b/epan/dissectors/packet-gre.h
index dd9ac558c7..b066182a1c 100644
--- a/epan/dissectors/packet-gre.h
+++ b/epan/dissectors/packet-gre.h
@@ -27,6 +27,7 @@
#define GRE_ERSPAN_88BE 0x88BE
#define GRE_ERSPAN_22EB 0x22EB
#define GRE_MIKROTIK_EOIP 0x6400
+#define GRE_AIROHIVE 0xFEAE
/* ************************************************************************* */
/* Aruba GRE Encapsulation ID */
/* ************************************************************************* */