From ee1f70416aa0b0049a16efc1b9c7909cb3e999f7 Mon Sep 17 00:00:00 2001 From: Zhifei Fang Date: Mon, 28 Mar 2016 20:50:20 -0400 Subject: [PATCH 1/2] If we do need those options in the sub class, delete them we will have problem See the DHCPv6_am, in the parse_options method, in there we need to know the interface information to compute the source ip address --- scapy/ansmachine.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scapy/ansmachine.py b/scapy/ansmachine.py index b087ac4..2cf0712 100644 --- a/scapy/ansmachine.py +++ b/scapy/ansmachine.py @@ -73,8 +73,8 @@ def parse_all_options(self, mode, kargs): sniffopt[k] = kargs[k] if k in self.send_options_list: sendopt[k] = kargs[k] - if k in self.sniff_options_list+self.send_options_list: - del(kargs[k]) + #if k in self.sniff_options_list+self.send_options_list: + # del(kargs[k]) if mode != 2 or kargs: if mode == 1: self.optam0 = kargs From 818865cf1e5faecc6bb9b772a87165902c69a464 Mon Sep 17 00:00:00 2001 From: Zhifei Fang Date: Mon, 28 Mar 2016 21:58:28 -0400 Subject: [PATCH 2/2] Missing import of themes Using the class color --- scapy/layers/dhcp6.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scapy/layers/dhcp6.py b/scapy/layers/dhcp6.py index a11a414..4b45941 100644 --- a/scapy/layers/dhcp6.py +++ b/scapy/layers/dhcp6.py @@ -15,6 +15,7 @@ from scapy.fields import * from scapy.utils6 import * from scapy.layers.inet6 import * +from scapy.themes import * from scapy.ansmachine import AnsweringMachine #############################################################################