felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/connections: Correctly fixup port in IPv6 listen URLs (#6786)

Browse Source 
Previously tcp://[fe80::1] would get "fixed" to tcp://[[fe80::1]]:22000
which is not great.
This commit is contained in:
Jakob Borg
2020-06-22 16:47:15 +01:00
committed by GitHub
parent cbaef624cf
commit b62b7d269e
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/connections/util.go
+8 -3
View File
@@ -18,10 +18,15 @@ func fixupPort(uri *url.URL, defaultPort int) *url.URL {
host, port, err := net.SplitHostPort(uri.Host)
if err != nil && strings.Contains(err.Error(), "missing port") {
// addr is on the form "1.2.3.4"
copyURI.Host = net.JoinHostPort(uri.Host, strconv.Itoa(defaultPort))
// addr is on the form "1.2.3.4" or "[fe80::1]"
host = uri.Host
if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
// net.JoinHostPort will add the brackets again
host = host[1 : len(host)-1]
}
copyURI.Host = net.JoinHostPort(host, strconv.Itoa(defaultPort))
} else if err == nil && port == "" {
// addr is on the form "1.2.3.4:"
// addr is on the form "1.2.3.4:" or "[fe80::1]:"
copyURI.Host = net.JoinHostPort(host, strconv.Itoa(defaultPort))
}