Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compensate for changes in 'netstat -rn' output on Vista

This commit is contained in:
Dirk Loss 2009-07-20 09:10:01 +02:00
parent d69e515573
commit c557b537ad
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scapy/arch/windows/__init__.py
View File

@ -227,7 +227,10 @@ def read_routes():
ok = 0 ok = 0
routes = [] routes = []
ip = '(\d+\.\d+\.\d+\.\d+)\s+' ip = '(\d+\.\d+\.\d+\.\d+)\s+'
netstat_line = ip + ip + ip + ip + "(\d+)" # On Vista and Windows 7 the gateway can be IP or 'on-link'.
# The exact 'on-link' string depends on the locale.
gw_pattern = '([\w\s]+|\d+\.\d+\.\d+\.\d+)\s+'
netstat_line = ip + ip + gw_pattern + ip + "(\d+)"
pattern = re.compile(netstat_line) pattern = re.compile(netstat_line)
f=os.popen("netstat -rn") f=os.popen("netstat -rn")
for l in f.readlines(): for l in f.readlines():
@ -246,6 +249,12 @@ def read_routes():
dest = atol(dest) dest = atol(dest)
mask = atol(mask) mask = atol(mask)
# If the gateway is no IP we assume it's on-link
gw_ipmatch = re.search('\d+\.\d+\.\d+\.\d+', gw)
if gw_ipmatch:
gw = gw_ipmatch.group(0)
else:
gw = netif
routes.append((dest,mask,gw, str(intf["name"]), addr)) routes.append((dest,mask,gw, str(intf["name"]), addr))
f.close() f.close()
return routes return routes