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

Fix network detection with multiple interfaces on same net

Browse Source
This commit is contained in:
Daniel
2022-01-22 12:37:38 +01:00
parent caa43f4167
commit f78e516284
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netenv/network-change.go
View File

@@ -40,8 +40,8 @@ serviceLoop:
for {
trigger := false
timeout := time.Minute
if GetOnlineStatus() != StatusOnline {
timeout := 15 * time.Second
if !Online() {
timeout = time.Second
}
// wait for trigger
@@ -62,7 +62,7 @@ serviceLoop:
hasher := sha1.New() //nolint:gosec // not used for security
interfaces, err := net.Interfaces()
if err != nil {
log.Warningf("environment: failed to get interfaces: %s", err)
log.Warningf("netenv: failed to get interfaces: %s", err)
continue
}
for _, iface := range interfaces {
@@ -72,7 +72,7 @@ serviceLoop:
// log.Tracef("adding: %s", iface.Flags.String())
addrs, err := iface.Addrs()
if err != nil {
log.Warningf("environment: failed to get addrs from interface %s: %s", iface.Name, err)
log.Warningf("netenv: failed to get addrs from interface %s: %s", iface.Name, err)
continue
}
for _, addr := range addrs {