Accept host names in announced addresses #48
Conversation
| @@ -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() { | |||
There was a problem hiding this comment.
Nil ip is not unspecified.
There was a problem hiding this comment.
Judging by go lang source, ip.IsUnspecified returns false for nil ip
There was a problem hiding this comment.
Yes, hence why the len(ip)==0 was there.
There was a problem hiding this comment.
But net.ParseIP(host) returns nil for FQDN's as well, becuase they are not IP's. The if condition is specific for empty host names xxx://:port and unspecified IP addresses xxx://0.0.0.0:port. Any other value for the host part will be kept as-is.
There was a problem hiding this comment.
Now I think about it, tcp6://:port and tcp6://[::]:port addresses might not be mapped correctly to IPv6 client address with this implementation..
There was a problem hiding this comment.
Ah yes, it should be fine. I'll leave for @calmh to merge, looks good to me.
|
@st-review merge it |
GitHub-Pull-Request: syncthing/discosrv#48
Fixes #46. Now correctly maps
xxx://:portandxxx://0.0.0.0:porttoxxx://<client remote address>:port