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

Be lenient towards malformed UPnP IGD UUIDs (fixes #890)

Browse Source
This commit is contained in:
Jakob Borg 2014-10-21 13:12:57 +02:00
parent 3f842221f7
commit 198cbacc3e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/model/puller.go
View File

@ -636,7 +636,7 @@ nextBlock:
continue nextBlock continue nextBlock
} }
// Select the least busy device to pull the block frop.model. If we found no // Select the least busy device to pull the block from. If we found no
// feasible device at all, fail the block (and in the long run, the // feasible device at all, fail the block (and in the long run, the
// file). // file).
potentialDevices := p.model.availability(p.folder, state.file.Name) potentialDevices := p.model.availability(p.folder, state.file.Name)

3
internal/upnp/upnp.go
View File

@ -236,8 +236,7 @@ func handleSearchResponse(deviceType string, knownDevices []*IGD, resp []byte, l
deviceUUID := strings.TrimLeft(strings.Split(deviceUSN, "::")[0], "uuid:") deviceUUID := strings.TrimLeft(strings.Split(deviceUSN, "::")[0], "uuid:")
matched, err := regexp.MatchString("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}", deviceUUID) matched, err := regexp.MatchString("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}", deviceUUID)
if !matched { if !matched {
l.Infoln("Invalid IGD response: invalid device UUID " + deviceUUID) l.Infoln("Invalid IGD response: invalid device UUID", deviceUUID, "(continuing anyway)")
return
} }
// Don't re-add devices that are already known // Don't re-add devices that are already known