From b1205db7ac8f0ad249c92f5f82e51b8a61c811a3 Mon Sep 17 00:00:00 2001
From: Majed Abdulaziz <majed.alhajry@gmail.com>
Date: Fri, 27 May 2016 14:14:27 +0000
Subject: [PATCH] cmd/discosrv: Accept host names in announced addresses

GitHub-Pull-Request: https://github.com/syncthing/discosrv/pull/48
---
 cmd/discosrv/querysrv.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmd/discosrv/querysrv.go b/cmd/discosrv/querysrv.go
index 9cd5a891..d1d4f3d5 100644
--- a/cmd/discosrv/querysrv.go
+++ b/cmd/discosrv/querysrv.go
@@ -329,10 +329,12 @@ func (s *querysrv) handleAnnounce(ctx context.Context, remote net.IP, deviceID p
 		}
 
 		ip := net.ParseIP(host)
-		if len(ip) == 0 || ip.IsUnspecified() {
-			uri.Host = net.JoinHostPort(remote.String(), port)
+		if host == "" || ip.IsUnspecified() {
+			host = remote.String()
 		}
 
+		uri.Host = net.JoinHostPort(host, port)
+
 		if err := s.updateAddress(ctx, tx, deviceID, uri.String()); err != nil {
 			internalErr = err
 			return