Changeset 351 in code for trunk/upstream.go

Timestamp:

Jul 6, 2020, 2:04:56 PM (5 years ago)

Author:

contact

Message:

Check upstream address with net.SplitHostPort

Looking for a colon is incorrect, IPv6 addresses can contain colons too.

File:

• trunk/upstream.go (modified) (2 diffs)

trunk/upstream.go

@@ -99 +99 @@
         switch scheme {
         case "ircs":
-                if !strings.ContainsRune(addr, ':') {
+                if _, _, err := net.SplitHostPort(addr); err != nil {
                         addr = addr + ":6697"
                 }
@@ -130 +130 @@
                 netConn, err = tls.DialWithDialer(&dialer, "tcp", addr, cfg)
         case "irc+insecure":
-                if !strings.ContainsRune(addr, ':') {
+                if _, _, err := net.SplitHostPort(addr); err != nil {
                         addr = addr + ":6667"
                 }