security-and-privacy/kickthemout
security-and-privacy/kickthemout
1
0
Fork 0
mirror of https://github.com/k4m4/kickthemout.git synced 2024-11-21 20:44:25 +01:00
Code Issues Releases Wiki Activity

Fix scanning animation on input bug (fixes #399)

Browse Source
This commit is contained in:
k4m4 2019-10-06 17:12:48 -04:00
parent de7d3e8ab5
commit 9655ab8f28
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kickthemout.py
View File

@ -185,7 +185,9 @@ def getDefaultInterfaceMAC():
def getGatewayIP(): def getGatewayIP():
global stopAnimation global stopAnimation
try: try:
getGateway = sr1(IP(dst="github.com", ttl=0) / ICMP() / "XXXXXXXXXXX", verbose=False) getGateway, timeout = sr1(IP(dst="github.com", ttl=0) / ICMP() / "XXXXXXXXXXX", verbose=False, timeout=4)
if timeout:
raise Exception()
return getGateway.src return getGateway.src
except: except:
# request gateway IP address (after failed detection by scapy) # request gateway IP address (after failed detection by scapy)
@ -229,7 +231,7 @@ def resolveMac(mac):
# regenerate online IPs array & configure gateway # regenerate online IPs array & configure gateway
def regenOnlineIPs(): def regenOnlineIPs():
global onlineIPs, defaultGatewayMac, defaultGatewayMacSet global onlineIPs, defaultGatewayMac, defaultGatewayMacSet, stopAnimation
if not defaultGatewayMacSet: if not defaultGatewayMacSet:
defaultGatewayMac = "" defaultGatewayMac = ""
@ -243,6 +245,7 @@ def regenOnlineIPs():
if not defaultGatewayMacSet and defaultGatewayMac == "": if not defaultGatewayMacSet and defaultGatewayMac == "":
# request gateway MAC address (after failed detection by scapy) # request gateway MAC address (after failed detection by scapy)
stopAnimation = True
print("\n{}ERROR: Default Gateway MAC Address could not be obtained. Please enter MAC manually.{}\n".format(RED, END)) 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)) header = ("{}kickthemout{}> {}Enter your gateway's MAC Address {}(MM:MM:MM:SS:SS:SS): ".format(BLUE, WHITE, RED, END))
defaultGatewayMac = input(header) defaultGatewayMac = input(header)