Changeset 269 in code for trunk

Timestamp:

Apr 28, 2020, 9:41:13 AM (5 years ago)

Author:

delthas

Message:

Add support for IRC address schemes

This is preparatory work for adding other connection types to upstream
servers. The service command network create now accepts a scheme in
the address flag, which specifies how to connect to the upstream server.

The only supported scheme for now is ircs, which is also the default if
no scheme is specified. ircs connects to a network over a TLS TCP
connection.

Location:

trunk

Files:

• doc/soju.1.scd (modified) (1 diff)
• service.go (modified) (1 diff)
• upstream.go (modified) (1 diff)

trunk/doc/soju.1.scd

@@ -94 +94 @@
 
 *network create* *-addr* <addr> [options...]
-        Connect to a new network at _addr_. _-addr_ is mandatory. Other options are:
+        Connect to a new network at _addr_. _-addr_ is mandatory.
+
+        _addr_ supports several connection types:
+        - _[ircs://]host[:port]_ connects with TLS over TCP
+
+        Other options are:
 
         *-name* <name>

trunk/service.go

@@ -204 +204 @@
         }
 
+        if addrParts := strings.SplitN(*addr, "://", 2); len(addrParts) == 2 {
+                scheme := addrParts[0]
+                switch scheme {
+                case "ircs":
+                default:
+                        return fmt.Errorf("unknown scheme %q (supported schemes: ircs)", scheme)
+                }
+        }
+
         for _, command := range connectCommands {
                 _, err := irc.ParseMessage(command)

trunk/upstream.go

@@ -67 +67 @@
         logger := &prefixLogger{network.user.srv.Logger, fmt.Sprintf("upstream %q: ", network.Addr)}
 
-        addr := network.Addr
-        if !strings.ContainsRune(addr, ':') {
-                addr = addr + ":6697"
+        var scheme string
+        var addr string
+
+        addrParts := strings.SplitN(network.Addr, "://", 2)
+        if len(addrParts) == 2 {
+                scheme = addrParts[0]
+                addr = addrParts[1]
+        } else {
+                scheme = "ircs"
+                addr = addrParts[0]
         }
 
         dialer := net.Dialer{Timeout: connectTimeout}
 
-        logger.Printf("connecting to TLS server at address %q", addr)
-        netConn, err := tls.DialWithDialer(&dialer, "tcp", addr, nil)
+        var netConn net.Conn
+        var err error
+        switch scheme {
+        case "ircs":
+                if !strings.ContainsRune(addr, ':') {
+                        addr = addr + ":6697"
+                }
+
+                logger.Printf("connecting to TLS server at address %q", addr)
+                netConn, err = tls.DialWithDialer(&dialer, "tcp", addr, nil)
+        default:
+                return nil, fmt.Errorf("failed to dial %q: unknown scheme: %v", addr, scheme)
+        }
         if err != nil {
                 return nil, fmt.Errorf("failed to dial %q: %v", addr, err)