github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clean up network/* packages, revamp online status detection

Browse Source
This commit is contained in:
Daniel
2019-10-25 13:33:36 +02:00
parent c72f956fe8
commit fdb5f6fcf7
27 changed files with 738 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
network/environment/environment_linux.go
View File

@@ -57,7 +57,7 @@ func Gateways() []*net.IP {
continue
}
if len(decoded) != 4 {
log.Warningf("environment: decoded gateway %s from /proc/net/route has wrong length")
log.Warningf("environment: decoded gateway %s from /proc/net/route has wrong length", decoded)
continue
}
gate := net.IPv4(decoded[3], decoded[2], decoded[1], decoded[0])
@@ -90,7 +90,7 @@ func Gateways() []*net.IP {
continue
}
if len(decoded) != 16 {
log.Warningf("environment: decoded gateway %s from /proc/net/ipv6_route has wrong length")
log.Warningf("environment: decoded gateway %s from /proc/net/ipv6_route has wrong length", decoded)
continue
}
gate := net.IP(decoded)
@@ -134,7 +134,6 @@ func Nameservers() []Nameserver {
resolvconfNameservers, err := getNameserversFromResolvconf()
if err != nil {
log.Warningf("environment: could not get nameservers from resolvconf: %s", err)
resolvconfNameservers = make([]Nameserver, 0)
} else {
nameservers = addNameservers(nameservers, resolvconfNameservers)
}
@@ -178,7 +177,7 @@ func getNameserversFromResolvconf() ([]Nameserver, error) {
}
// build array
var nameservers []Nameserver
nameservers := make([]Nameserver, 0, len(servers))
for _, server := range servers {
nameservers = append(nameservers, Nameserver{
IP: server,