From 38960ace57db1e691aeec96a850738239d86af6d Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Thu, 9 Feb 2017 11:14:21 +0100
Subject: [PATCH] GRE - fix layer binding
---
scapy/layers/inet6.py | 1 +
scapy/layers/l2.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/scapy/layers/inet6.py b/scapy/layers/inet6.py
index c6058257..7888d27b 100644
--- a/scapy/layers/inet6.py
+++ b/scapy/layers/inet6.py
@@ -3861,6 +3861,7 @@ conf.l2types.register(31, IPv6)
bind_layers(Ether, IPv6, type = 0x86dd )
bind_layers(CookedLinux, IPv6, proto = 0x86dd )
+bind_layers(GRE, IPv6, proto = 0x86dd )
bind_layers(Loopback, IPv6, type = 0x1c )
bind_layers(IPerror6, TCPerror, nh = socket.IPPROTO_TCP )
bind_layers(IPerror6, UDPerror, nh = socket.IPPROTO_UDP )
diff --git a/scapy/layers/l2.py b/scapy/layers/l2.py
index 1bda6318..0a0e6a18 100644
--- a/scapy/layers/l2.py
+++ b/scapy/layers/l2.py
@@ -1090,7 +1090,7 @@ bind_layers( CookedLinux, EAPOL, proto=34958)
bind_layers( GRE, LLC, proto=122)
bind_layers( GRE, Dot1Q, proto=33024)
bind_layers( GRE, Dot1AD, type=0x88a8)
-bind_layers( GRE, Ether, proto=1)
+bind_layers( GRE, Ether, proto=0x6558)
bind_layers( GRE, ARP, proto=2054)
bind_layers( GRE, EAPOL, proto=34958)
bind_layers( GRE, GRErouting, { "routing_present" : 1 } )
--
GitLab