From de7d3e8ab549e1462e30a9212b691f5d91dc8a56 Mon Sep 17 00:00:00 2001
From: k4m4 <nikolaskam@gmail.com>
Date: Sun, 6 Oct 2019 16:35:23 -0400
Subject: [PATCH] Switch back to original Scapy (closes #409)

---
 kickthemout.py   | 18 +++++++++---------
 requirements.txt |  2 +-
 spoof.py         |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kickthemout.py b/kickthemout.py
index 15e7924..718c4f6 100644
--- a/kickthemout.py
+++ b/kickthemout.py
@@ -25,11 +25,11 @@ def shutdown():
           '\nCatch ya later!{}'.format(GREEN, END))
     os._exit(0)
 
-logging.getLogger("kamene.runtime").setLevel(logging.ERROR)  # Shut up kamene!
+logging.getLogger("scapy.runtime").setLevel(logging.ERROR)  # Shut up scapy!
 try:
-    from kamene.config import conf  
+    from scapy.config import conf  
     conf.ipv6_enabled = False
-    from kamene.all import *
+    from scapy.all import *
     import scan, spoof, nmap
     from urllib.request import urlopen, Request
     from urllib.error import URLError
@@ -143,15 +143,15 @@ def getDefaultInterface(returnNet=False):
             raise ValueError("illegal netmask value", hex(arg))
         return 32 - int(round(math.log(0xFFFFFFFF - arg, 2)))
     def to_CIDR_notation(bytes_network, bytes_netmask):
-        network = kamene.utils.ltoa(bytes_network)
+        network = scapy.utils.ltoa(bytes_network)
         netmask = long2net(bytes_netmask)
         net = "%s/%s" % (network, netmask)
         if netmask < 16:
             return None
         return net
 
-    iface_routes = [route for route in kamene.config.conf.route.routes if route[3] == kamene.config.conf.iface and route[1] != 0xFFFFFFFF]
-    network, netmask, _, interface, address = max(iface_routes, key=lambda item:item[1])
+    iface_routes = [route for route in scapy.config.conf.route.routes if route[3] == scapy.config.conf.iface and route[1] != 0xFFFFFFFF]
+    network, netmask, _, interface, address, _ = max(iface_routes, key=lambda item:item[1])
     net = to_CIDR_notation(network, netmask)
     if net:
         if returnNet:
@@ -174,7 +174,7 @@ def getDefaultInterfaceMAC():
         else:
             return defaultInterfaceMac
     except:
-        # request interface MAC address (after failed detection by kamene)
+        # request interface MAC address (after failed detection by scapy)
         print("\n{}ERROR: Default Interface MAC Address could not be obtained. Please enter MAC manually.{}\n".format(RED, END))
         header = ('{}kickthemout{}> {}Enter MAC Address {}(MM:MM:MM:SS:SS:SS): '.format(BLUE, WHITE, RED, END))
         return (input(header))
@@ -188,7 +188,7 @@ def getGatewayIP():
         getGateway = sr1(IP(dst="github.com", ttl=0) / ICMP() / "XXXXXXXXXXX", verbose=False)
         return getGateway.src
     except:
-        # request gateway IP address (after failed detection by kamene)
+        # request gateway IP address (after failed detection by scapy)
         stopAnimation = True
         print("\n{}ERROR: Gateway IP could not be obtained. Please enter IP manually.{}\n".format(RED, END))
         header = ('{}kickthemout{}> {}Enter Gateway IP {}(e.g. 192.168.1.1): '.format(BLUE, WHITE, RED, END))
@@ -242,7 +242,7 @@ def regenOnlineIPs():
                 defaultGatewayMac = host[1]
 
     if not defaultGatewayMacSet and defaultGatewayMac == "":
-        # request gateway MAC address (after failed detection by kamene)
+        # request gateway MAC address (after failed detection by scapy)
         print("\n{}ERROR: Default Gateway MAC Address could not be obtained. Please enter MAC manually.{}\n".format(RED, END))
         header = ("{}kickthemout{}> {}Enter your gateway's MAC Address {}(MM:MM:MM:SS:SS:SS): ".format(BLUE, WHITE, RED, END))
         defaultGatewayMac = input(header)
diff --git a/requirements.txt b/requirements.txt
index 0401b2b..c44a6c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-kamene
+scapy
 python-nmap
 netifaces
\ No newline at end of file
diff --git a/spoof.py b/spoof.py
index e704751..8a8872f 100644
--- a/spoof.py
+++ b/spoof.py
@@ -8,8 +8,8 @@ See License at nikolaskama.me (https://nikolaskama.me/kickthemoutproject)
 """
 
 import sys, logging
-logging.getLogger("kamene.runtime").setLevel(logging.ERROR)
-from kamene.all import (
+logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
+from scapy.all import (
     get_if_hwaddr,
     getmacbyip,
     ARP,