Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1826 from AudriusButkevicius/screwflags 

Don't check interface flags on Windows
This commit is contained in:
Jakob Borg 2015-05-19 14:59:16 +02:00
parent e4b57a978f f112ef34f6
commit 12f76b448c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/discover/discover.go
View File

@ -12,6 +12,7 @@ import (
"errors" "errors"
"io" "io"
"net" "net"
"runtime"
"strconv" "strconv"
"time" "time"
@ -110,7 +111,8 @@ func (d *Discoverer) startLocalIPv6Multicasts(localMCAddr string) {
v6Intfs := 0 v6Intfs := 0
for _, intf := range intfs { for _, intf := range intfs {
if intf.Flags&net.FlagUp == 0 || intf.Flags&net.FlagMulticast == 0 { // Interface flags seem to always be 0 on Windows
if runtime.GOOS != "windows" && (intf.Flags&net.FlagUp == 0 || intf.Flags&net.FlagMulticast == 0) {
continue continue
} }

7
internal/upnp/upnp.go
View File

@ -21,6 +21,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"regexp" "regexp"
"runtime"
"strings" "strings"
"time" "time"
@ -129,10 +130,8 @@ func Discover(timeout time.Duration) []IGD {
wg := sync.NewWaitGroup() wg := sync.NewWaitGroup()
for _, intf := range interfaces { for _, intf := range interfaces {
if intf.Flags&net.FlagUp == 0 { // Interface flags seem to always be 0 on Windows
continue if runtime.GOOS != "windows" && (intf.Flags&net.FlagUp == 0 || intf.Flags&net.FlagMulticast == 0) {
}
if intf.Flags&net.FlagMulticast == 0 {
continue continue
} }