Merge pull request #1 from k4m4/master

Network detection issue fixed
This commit is contained in:
Tiago Severino 2017-05-20 20:59:54 +01:00 committed by GitHub
commit 29ac161434
2 changed files with 11 additions and 16 deletions

View File

@ -41,7 +41,7 @@ MacOS Installation
If you would like to install KickThemOut on a Mac, please run the following::
$ sudo python -m pip install pcapy
$ sudo pip install pcapy
$ brew install libdnet scapy nmap
@ -51,7 +51,7 @@ If you would like to install KickThemOut on a Mac, please run the following::
$ cd kickthemout/
$ sudo python -m pip install -r requirements.txt
$ sudo pip install -r requirements.txt
**NOTE**: You need to have `Homebrew <http://brew.sh/>`_ installed before running the Mac OS installation.

View File

@ -352,20 +352,15 @@ def getDefaultInterface(returnNet=False):
if netmask < 16:
return None
return net
for network, netmask, _, interface, address in scapy.config.conf.route.routes:
# loop through IPs (skip if local)
if network == 0 or interface == 'lo' or address == '127.0.0.1' or address == '0.0.0.0':
continue
if netmask <= 0 or netmask == 0xFFFFFFFF:
continue
net = to_CIDR_notation(network, netmask)
if interface != scapy.config.conf.iface:
continue
if net:
if returnNet:
return net
else:
return interface
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:
return net
else:
return interface