diff options
| author |   Sachin Saxena <sachin.saxena@freescale.com> | 2018-02-28 20:28:52 +0530 |
|---|---|---|
| committer |   Sachin Saxena <sachin.saxena@nxp.com> | 2018-02-28 20:34:56 +0530 |
| commit | 0689fce93ba269c48f83a2f70f971b3976d04c90 (patch) | |
| tree | 4cc2908df3598507cc1828ac19d8c43b22450ffa /test/patches/scapy-2.3.3/gre-layers.patch | |
| parent | 746b57564deede624261ab8a96c94f562f24d22c (diff) | |
| parent | d594711a5d79859a7d0bde83a516f7ab52051d9b (diff) | |
Merge branch 'stable/1710' of https://gerrit.fd.io/r/vpp into 17101710
Diffstat (limited to 'test/patches/scapy-2.3.3/gre-layers.patch')
| -rw-r--r-- | test/patches/scapy-2.3.3/gre-layers.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/test/patches/scapy-2.3.3/gre-layers.patch b/test/patches/scapy-2.3.3/gre-layers.patch new file mode 100644 index 00000000..605a705b --- /dev/null +++ b/test/patches/scapy-2.3.3/gre-layers.patch @@ -0,0 +1,25 @@ +diff --git a/scapy/layers/inet6.py b/scapy/layers/inet6.py +index 03b80ec..a7e1e0f 100644 +--- a/scapy/layers/inet6.py ++++ b/scapy/layers/inet6.py +@@ -3722,6 +3722,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(IPerror6, TCPerror, nh = socket.IPPROTO_TCP ) + bind_layers(IPerror6, UDPerror, nh = socket.IPPROTO_UDP ) + bind_layers(IPv6, TCP, nh = socket.IPPROTO_TCP ) +diff --git a/scapy/layers/l2.py b/scapy/layers/l2.py +index 4f491d2..661a5da 100644 +--- a/scapy/layers/l2.py ++++ b/scapy/layers/l2.py +@@ -628,7 +628,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 } ) |