Merge pull request #311 from stfnw/master

DHCP poisoner: refactor FindIP
This commit is contained in:
lgandx
2025-05-22 04:30:07 -03:00
committed by GitHub

View File

@@ -239,9 +239,12 @@ def ParseSrcDSTAddr(data):
return SrcIP, SrcPort, DstIP, DstPort return SrcIP, SrcPort, DstIP, DstPort
def FindIP(data): def FindIP(data):
data = data.decode('latin-1') IPPos = data.find(b"\x32\x04") + 2
IP = ''.join(re.findall(r'(?<=\x32\x04)[^EOF]*', data)) if IPPos == -1 or IPPos + 4 >= len(data):
return ''.join(IP[0:4]).encode('latin-1') return None
else:
IP = data[IPPos:IPPos+4]
return IP
def ParseDHCPCode(data, ClientIP,DHCP_DNS): def ParseDHCPCode(data, ClientIP,DHCP_DNS):
global DHCPClient global DHCPClient