aboutsummaryrefslogtreecommitdiffstats
path: root/test/patches/scapy-2.3.3/gre-layers.patch
blob: 605a705b0f74da2f59706650fc7be15ffe0eafd1 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
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 } )
s="c"># distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. ############################################################################### # Global Defines ############################################################################### AUTOMAKE_OPTIONS = foreign subdir-objects ACLOCAL_AMFLAGS = -I m4 AM_LIBTOOLFLAGS = --quiet AM_CFLAGS = -Wall SUBDIRS = . SUFFIXES = .api.h .api .api.json API_FILES = noinst_HEADERS = dist_bin_SCRIPTS = lib_LTLIBRARIES = BUILT_SOURCES = CLEANFILES = install-data-local: @echo "Building vppctl command list..." @DIR_SEARCH="$(srcdir)" ; \ DIR_EXCLUDE="examples" ; \ GREP_TIME=`time (grep -wIr "\.path = " $$DIR_SEARCH --exclude-dir=$$DIR_EXCLUDE \ | cut -d '"' -f2 | sort -u > $(srcdir)/scripts/vppctl-cmd-list) 2>&1` ; \ GREP_TIME=`echo $$GREP_TIME | awk '{print $$2}'` ; \ echo "Command list built, Time taken: $$GREP_TIME" ############################################################################### # Components ############################################################################### include vppinfra.am include vppapigen.am if ENABLE_PERFTOOL include perftool.am endif if ENABLE_G2 include g2.am endif if ENABLE_SVM include svm.am endif if ENABLE_VLIB include vlib.am endif if ENABLE_SVM if ENABLE_VLIB include vlib-api.am include vnet.am include vpp.am include vpp-api-test.am include uri.am SUBDIRS += plugins if ENABLE_PAPI include vpp-api.am SUBDIRS += vpp-api/python endif if ENABLE_JAPI SUBDIRS += vpp-api/java endif ############################################################################### # API ############################################################################### include suffix-rules.mk # Set the suffix list apidir = $(prefix)/share/vpp/api/core api_DATA = \ $(patsubst %.api,%.api.json,$(API_FILES)) BUILT_SOURCES += \ $(patsubst %.api,%.api.h,$(API_FILES)) endif # if ENABLE_VLIB endif # if ENABLE_SVM CLEANFILES += $(BUILT_SOURCES) $(api_DATA)