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

Fix address list in DeviceDiscovered, add debug prints (ref #2444)

Browse Source
This commit is contained in:
Jakob Borg 2015-11-09 21:27:38 +01:00
parent edf1730fd2
commit e3c55ef307
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/discover/local.go
View File

@ -196,6 +196,7 @@ func (c *localClient) registerDevice(src net.Addr, device Device) bool {
// Any empty or unspecified addresses should be set to the source address // Any empty or unspecified addresses should be set to the source address
// of the announcement. We also skip any addresses we can't parse. // of the announcement. We also skip any addresses we can't parse.
l.Debugln("discover: Registering addresses for", id)
var validAddresses []string var validAddresses []string
for _, addr := range device.Addresses { for _, addr := range device.Addresses {
u, err := url.Parse(addr.URL) u, err := url.Parse(addr.URL)
@ -215,8 +216,10 @@ func (c *localClient) registerDevice(src net.Addr, device Device) bool {
} }
u.Host = net.JoinHostPort(host, strconv.Itoa(tcpAddr.Port)) u.Host = net.JoinHostPort(host, strconv.Itoa(tcpAddr.Port))
validAddresses = append(validAddresses, u.String()) validAddresses = append(validAddresses, u.String())
l.Debugf("discover: Replaced address %v in %s to get %s", tcpAddr.IP, addr.URL, u.String())
} else { } else {
validAddresses = append(validAddresses, addr.URL) validAddresses = append(validAddresses, addr.URL)
l.Debugf("discover: Accepted address %s verbatim", addr.URL)
} }
} }
@ -230,7 +233,7 @@ func (c *localClient) registerDevice(src net.Addr, device Device) bool {
if isNewDevice { if isNewDevice {
events.Default.Log(events.DeviceDiscovered, map[string]interface{}{ events.Default.Log(events.DeviceDiscovered, map[string]interface{}{
"device": id.String(), "device": id.String(),
"addrs": device.Addresses, "addrs": validAddresses,
"relays": device.Relays, "relays": device.Relays,
}) })
} }