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

cmd/discosrv: Accept host names in announced addresses

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/discosrv/pull/48
This commit is contained in:
Majed Abdulaziz 2016-05-27 14:14:27 +00:00 committed by Jakob Borg
parent ff0cd413e6
commit b1205db7ac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/discosrv/querysrv.go
View File

@ -329,10 +329,12 @@ func (s *querysrv) handleAnnounce(ctx context.Context, remote net.IP, deviceID p
} }
ip := net.ParseIP(host) ip := net.ParseIP(host)
if len(ip) == 0 || ip.IsUnspecified() { if host == "" || ip.IsUnspecified() {
uri.Host = net.JoinHostPort(remote.String(), port) host = remote.String()
} }
uri.Host = net.JoinHostPort(host, port)
if err := s.updateAddress(ctx, tx, deviceID, uri.String()); err != nil { if err := s.updateAddress(ctx, tx, deviceID, uri.String()); err != nil {
internalErr = err internalErr = err
return return