Merge pull request #50 from afics/master
Prefer non link-local v6 addresses
This commit is contained in:
commit
f15ab2e34f
@ -118,10 +118,12 @@ class Network(IntervalModule):
|
|||||||
fdict["v4mask"] = v4["netmask"]
|
fdict["v4mask"] = v4["netmask"]
|
||||||
fdict["v4cidr"] = cidr4(v4["addr"], v4["netmask"])
|
fdict["v4cidr"] = cidr4(v4["addr"], v4["netmask"])
|
||||||
if netifaces.AF_INET6 in info:
|
if netifaces.AF_INET6 in info:
|
||||||
v6 = info[netifaces.AF_INET6][0]
|
for v6 in info[netifaces.AF_INET6]:
|
||||||
fdict["v6"] = v6["addr"]
|
fdict["v6"] = v6["addr"]
|
||||||
fdict["v6mask"] = v6["netmask"]
|
fdict["v6mask"] = v6["netmask"]
|
||||||
fdict["v6cidr"] = cidr6(v6["addr"], v6["netmask"])
|
fdict["v6cidr"] = cidr6(v6["addr"], v6["netmask"])
|
||||||
|
if not v6["addr"].startswith("fe80::"): # prefer non link-local addresses
|
||||||
|
break
|
||||||
else:
|
else:
|
||||||
format = self.format_down
|
format = self.format_down
|
||||||
color = self.color_down
|
color = self.color_down
|
||||||
|
Loading…
Reference in New Issue
Block a user