re-added scapy, changed imports

core/netcreds/NetCreds.py

@@ -17,7 +17,7 @@ from urllib import unquote
 
 # shut up scapy
 logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from mitmflib.scapy.all import *
+from scapy.all import *
 conf.verb=0
 
 mitmf_logger = logging.getLogger('mitmf')

core/poisoners/arp/ARPWatch.py

@@ -3,7 +3,7 @@ import os
 import sys
 import threading
 
-from mitmflib.scapy.all import *
+from scapy.all import *
 from core.utils import shutdown
 
 mitmf_logger = logging.getLogger('mitmf')

core/poisoners/arp/ARPpoisoner.py

@@ -5,7 +5,7 @@ from traceback import print_exc
 from netaddr import IPNetwork, IPRange, IPAddress, AddrFormatError
 from time import sleep
 from core.utils import shutdown
-from mitmflib.scapy.all import *
+from scapy.all import *
 
 mitmf_logger = logging.getLogger('mitmf')
 

core/poisoners/dhcp/DHCPpoisoner.py

@@ -4,7 +4,7 @@ import binascii
 import random
 
 logging.getLogger("scapy.runtime").setLevel(logging.ERROR)  #Gets rid of IPV6 Error when importing scapy
-from mitmflib.scapy.all import *
+from scapy.all import *
 
 mitmf_logger = logging.getLogger('mitmf')
 

core/poisoners/icmp/ICMPpoisoner.py

@@ -30,7 +30,7 @@ from time import sleep
 #from netfilterqueue import NetfilterQueue
 
 logging.getLogger("scapy.runtime").setLevel(logging.ERROR)  #Gets rid of IPV6 Error when importing scapy
-from mitmflib.scapy.all import *
+from scapy.all import *
 
 mitmf_logger = logging.getLogger('mitmf')
 

core/utils.py

@@ -26,7 +26,7 @@ import re
 import sys
 
 logging.getLogger("scapy.runtime").setLevel(logging.ERROR)  #Gets rid of IPV6 Error when importing scapy
-from mitmflib.scapy.all import get_if_addr, get_if_hwaddr
+from scapy.all import get_if_addr, get_if_hwaddr
 from core.sergioproxy.ProxyPlugins import ProxyPlugins
 
 mitmf_logger = logging.getLogger('mitmf')

plugins/Spoof.py

@@ -25,7 +25,7 @@ from core.servers.dns.DNSchef import DNSChef
 from core.poisoners.dhcp.DHCPpoisoner import DHCPpoisoner
 from core.poisoners.icmp.ICMPpoisoner import ICMPpoisoner
 from plugins.plugin import Plugin
-from mitmflib.scapy.all import *
+from scapy.all import *
 
 class Spoof(Plugin):
     name        = "Spoof"

requirements.txt

@@ -1,6 +1,7 @@
 Twisted
 requests
 netaddr
+scapy
 msgpack-python
 configobj
 mitmflib