octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 20:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1859 from calmh/fix-1858

Browse Source 
UPnP discovery results must not be collected in a background goroutine (fixes #1858)
This commit is contained in:
Audrius Butkevicius 2015-05-23 22:58:09 +01:00
commit 51ad533be6
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
internal/upnp/upnp.go
View File

@ -103,32 +103,8 @@ func Discover(timeout time.Duration) []IGD {
resultChan := make(chan IGD) resultChan := make(chan IGD)
// Aggregator
go func() {
next:
for result := range resultChan {
for _, existingResult := range results {
if existingResult.uuid == result.uuid {
if debug {
l.Debugf("Skipping duplicate result %s with services:", result.uuid)
for _, svc := range result.services {
l.Debugf("* [%s] %s", svc.serviceID, svc.serviceURL)
}
}
goto next
}
}
results = append(results, result)
if debug {
l.Debugf("UPnP discovery result %s with services:", result.uuid)
for _, svc := range result.services {
l.Debugf("* [%s] %s", svc.serviceID, svc.serviceURL)
}
}
}
}()
wg := sync.NewWaitGroup() wg := sync.NewWaitGroup()
for _, intf := range interfaces { for _, intf := range interfaces {
// Interface flags seem to always be 0 on Windows // Interface flags seem to always be 0 on Windows
if runtime.GOOS != "windows" && (intf.Flags&net.FlagUp == 0 || intf.Flags&net.FlagMulticast == 0) { if runtime.GOOS != "windows" && (intf.Flags&net.FlagUp == 0 || intf.Flags&net.FlagMulticast == 0) {
@ -144,8 +120,33 @@ func Discover(timeout time.Duration) []IGD {
} }
} }
wg.Wait() go func() {
close(resultChan) wg.Wait()
close(resultChan)
}()
nextResult:
for result := range resultChan {
for _, existingResult := range results {
if existingResult.uuid == result.uuid {
if debug {
l.Debugf("Skipping duplicate result %s with services:", result.uuid)
for _, svc := range result.services {
l.Debugf("* [%s] %s", svc.serviceID, svc.serviceURL)
}
}
continue nextResult
}
}
results = append(results, result)
if debug {
l.Debugf("UPnP discovery result %s with services:", result.uuid)
for _, svc := range result.services {
l.Debugf("* [%s] %s", svc.serviceID, svc.serviceURL)
}
}
}
return results return results
} }