From cbcc84ba6684868996eccd1d94e445eb6868c54a Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Sun, 25 Feb 2018 10:52:12 -0800 Subject: [PATCH] update BIER scapy patch to match the scapy repo PR Change-Id: I4953b8444b49d1ad445c98a199ae8fd1635e24a5 Signed-off-by: Neale Ranns --- test/patches/scapy-2.3.3/bier.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/patches/scapy-2.3.3/bier.patch b/test/patches/scapy-2.3.3/bier.patch index 82a881e9997..97e8a90b392 100644 --- a/test/patches/scapy-2.3.3/bier.patch +++ b/test/patches/scapy-2.3.3/bier.patch @@ -3,7 +3,7 @@ new file mode 100644 index 0000000..e173cdb --- /dev/null +++ b/scapy/contrib/bier.py -@@ -0,0 +1,58 @@ +@@ -0,0 +1,56 @@ +# http://trac.secdev.org/scapy/ticket/31 + +# scapy.contrib.description = BIER @@ -38,9 +38,6 @@ index 0000000..e173cdb + BitField("s", 1, 1), + ByteField("ttl", 0)] + -+ def guess_payload_class(self, payload): -+ return BIER -+ + +class BIER(Packet): + name = "BIER" @@ -62,3 +59,4 @@ index 0000000..e173cdb +bind_layers(BIER, IP, Proto=4) +bind_layers(BIER, IPv6, Proto=5) +bind_layers(UDP, BIFT, dport=8138) ++bind_layers(BIFT, BIER) -- 2.16.6