Refactor a bit the poisoners

This commit is contained in:
jvoisin 2016-07-05 00:18:48 +02:00
parent 04c841d34e
commit f2a2ffbe87
5 changed files with 42 additions and 72 deletions

View file

@ -50,6 +50,16 @@ def text(txt):
return '\r'+re.sub(r'\[([^]]*)\]', "\033[1;34m[\\1]\033[0m", txt)
def IsOnTheSameSubnet(ip, net):
net += '/24'
ipaddr = int(''.join([ '%02x' % int(x) for x in ip.split('.') ]), 16)
netstr, bits = net.split('/')
netaddr = int(''.join([ '%02x' % int(x) for x in netstr.split('.') ]), 16)
mask = (0xffffffff << (32 - int(bits))) & 0xffffffff
return (ipaddr & mask) == (netaddr & mask)
def RespondToThisIP(ClientIp):
if ClientIp.startswith('127.0.0.'):
@ -90,6 +100,7 @@ def OsInterfaceIsSupported():
return False if IsOsX() else True
else:
return False
def IsOsX():
Os_version = sys.platform
if Os_version == "darwin":