diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-02-25 12:27:18 -0800 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2018-03-19 13:09:45 +0000 |
| commit | 2bc940272ec75d1094326eafb4a3fa2c614e3a7b (patch) | |
| tree | d813084708e143fc9eb6edbca408ba93beadaf41 /test/patches/scapy-2.4/bier.patch | |
| parent | f38bef46a3511249f352d18072f97a49f2c5b06c (diff) | |
Scapy upgrade to 2.4.0.rc5
- many of the patches fd.io applies in test/patches/2.3.3 are now upstreamed in 2.4
- 2.4 adds support for IGMPv3 which is my main motivation for the upgrade
Change-Id: If2c0a524e3cba320b4a5d8cd07817c6ea2bf0c5a
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test/patches/scapy-2.4/bier.patch')
| -rw-r--r-- | test/patches/scapy-2.4/bier.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/test/patches/scapy-2.4/bier.patch b/test/patches/scapy-2.4/bier.patch new file mode 100644 index 00000000000..82a881e9997 --- /dev/null +++ b/test/patches/scapy-2.4/bier.patch @@ -0,0 +1,64 @@ +diff --git a/scapy/contrib/bier.py b/scapy/contrib/bier.py +new file mode 100644 +index 0000000..e173cdb +--- /dev/null ++++ b/scapy/contrib/bier.py +@@ -0,0 +1,58 @@ ++# http://trac.secdev.org/scapy/ticket/31 ++ ++# scapy.contrib.description = BIER ++# scapy.contrib.status = loads ++ ++from scapy.packet import * ++from scapy.fields import * ++from scapy.layers.inet import IP, UDP ++from scapy.layers.inet6 import IPv6 ++ ++ ++class BIERLength: ++ BIER_LEN_64 = 0 ++ BIER_LEN_128 = 1 ++ BIER_LEN_256 = 2 ++ BIER_LEN_512 = 3 ++ BIER_LEN_1024 = 4 ++ ++ ++BIERnhcls = {1: "MPLS", ++ 2: "MPLS", ++ 4: "IPv4", ++ 5: "IPv6"} ++ ++ ++class BIFT(Packet): ++ name = "BIFT" ++ fields_desc = [BitField("bsl", 0, 4), ++ BitField("sd", 0, 8), ++ BitField("set", 0, 8), ++ BitField("cos", 0, 3), ++ BitField("s", 1, 1), ++ ByteField("ttl", 0)] ++ ++ def guess_payload_class(self, payload): ++ return BIER ++ ++ ++class BIER(Packet): ++ name = "BIER" ++ fields_desc = [BitField("id", 5, 4), ++ BitField("version", 0, 4), ++ BitFieldLenField("length", BIERLength.BIER_LEN_256, 4, ++ length_of=lambda x:(x.BitString >> 8)), ++ BitField("entropy", 0, 20), ++ BitField("OAM", 0, 2), ++ BitField("RSV", 0, 2), ++ BitField("DSCP", 0, 6), ++ BitEnumField("Proto", 2, 6, BIERnhcls), ++ ShortField("BFRID", 0), ++ StrLenField("BitString", ++ "", ++ length_from=lambda x:(8 << x.length))] ++ ++ ++bind_layers(BIER, IP, Proto=4) ++bind_layers(BIER, IPv6, Proto=5) ++bind_layers(UDP, BIFT, dport=8138) |