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/mpls.py.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/mpls.py.patch')
| -rw-r--r-- | test/patches/scapy-2.3.3/mpls.py.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/test/patches/scapy-2.3.3/mpls.py.patch b/test/patches/scapy-2.3.3/mpls.py.patch new file mode 100644 index 00000000..f63a70a3 --- /dev/null +++ b/test/patches/scapy-2.3.3/mpls.py.patch @@ -0,0 +1,18 @@ +diff --git a/scapy/contrib/mpls.py b/scapy/contrib/mpls.py +index 640a0c5..6af1d4a 100644 +--- a/scapy/contrib/mpls.py ++++ b/scapy/contrib/mpls.py +@@ -18,6 +18,8 @@ class MPLS(Packet): + + def guess_payload_class(self, payload): + if len(payload) >= 1: ++ if not self.s: ++ return MPLS + ip_version = (ord(payload[0]) >> 4) & 0xF + if ip_version == 4: + return IP +@@ -27,3 +29,4 @@ class MPLS(Packet): + + bind_layers(Ether, MPLS, type=0x8847) + bind_layers(GRE, MPLS, proto=0x8847) ++bind_layers(MPLS, MPLS, s=0) |