Changeset 23 in code for trunk

Timestamp:

Feb 6, 2020, 8:20:22 PM (5 years ago)

Author:

contact

Message:

Allow Server to have access to upstreamConn

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• server.go (modified) (2 diffs)
• upstream.go (modified) (3 diffs)

trunk/downstream.go

@@ -40 +40 @@
 
 type downstreamConn struct {
-        net        net.Conn
-        irc        *irc.Conn
-        srv        *Server
-        logger     Logger
+        net    net.Conn
+        irc    *irc.Conn
+        srv    *Server
+        logger Logger
 
         registered bool
@@ -54 +54 @@
 func newDownstreamConn(srv *Server, netConn net.Conn) *downstreamConn {
         return &downstreamConn{
-                net: netConn,
-                irc: irc.NewConn(netConn),
-                srv: srv,
+                net:    netConn,
+                irc:    irc.NewConn(netConn),
+                srv:    srv,
                 logger: &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())},
         }

trunk/server.go

@@ -55 +55 @@
                 // TODO: retry connecting
                 go func() {
-                        if err := connect(s, upstream); err != nil {
-                                s.Logger.Printf("Failed to connect to upstream server %q: %v", upstream.Addr, err)
+                        conn, err := connectToUpstream(s, upstream)
+                        if err != nil {
+                                s.Logger.Printf("failed to connect to upstream server %q: %v", upstream.Addr, err)
+                                return
+                        }
+                        if err := conn.readMessages(); err != nil {
+                                conn.logger.Printf("failed to handle messages: %v", err)
                         }
                 }()
@@ -73 +78 @@
                 go func() {
                         if err := conn.readMessages(); err != nil {
-                                conn.logger.Printf("Error handling messages: %v", err)
+                                conn.logger.Printf("failed to handle messages: %v", err)
                         }
                 }()

trunk/upstream.go

@@ -176 +176 @@
 }
 
-func connect(s *Server, upstream *Upstream) error {
+func (c *upstreamConn) readMessages() error {
+        defer c.net.Close()
+
+        err := c.irc.WriteMessage(&irc.Message{
+                Command: "NICK",
+                Params:  []string{c.upstream.Nick},
+        })
+        if err != nil {
+                return err
+        }
+
+        err = c.irc.WriteMessage(&irc.Message{
+                Command: "USER",
+                Params:  []string{c.upstream.Username, "0", "*", c.upstream.Realname},
+        })
+        if err != nil {
+                return err
+        }
+
+        for {
+                msg, err := c.irc.ReadMessage()
+                if err == io.EOF {
+                        break
+                } else if err != nil {
+                        return fmt.Errorf("failed to read IRC command: %v", err)
+                }
+
+                if err := c.handleMessage(msg); err != nil {
+                        c.logger.Printf("failed to handle message %q: %v", msg, err)
+                }
+        }
+
+        return c.net.Close()
+}
+
+func connectToUpstream(s *Server, upstream *Upstream) (*upstreamConn, error) {
         logger := &prefixLogger{s.Logger, fmt.Sprintf("upstream %q: ", upstream.Addr)}
         logger.Printf("connecting to server")
@@ -182 +217 @@
         netConn, err := tls.Dial("tcp", upstream.Addr, nil)
         if err != nil {
-                return fmt.Errorf("failed to dial %q: %v", upstream.Addr, err)
-        }
-
-        c := upstreamConn{
+                return nil, fmt.Errorf("failed to dial %q: %v", upstream.Addr, err)
+        }
+
+        return &upstreamConn{
                 upstream: upstream,
                 logger:   logger,
@@ -192 +227 @@
                 srv:      s,
                 channels: make(map[string]*upstreamChannel),
-        }
-        defer netConn.Close()
-
-        err = c.irc.WriteMessage(&irc.Message{
-                Command: "NICK",
-                Params:  []string{upstream.Nick},
-        })
-        if err != nil {
-                return err
-        }
-
-        err = c.irc.WriteMessage(&irc.Message{
-                Command: "USER",
-                Params:  []string{upstream.Username, "0", "*", upstream.Realname},
-        })
-        if err != nil {
-                return err
-        }
-
-        for {
-                msg, err := c.irc.ReadMessage()
-                if err == io.EOF {
-                        break
-                } else if err != nil {
-                        return fmt.Errorf("failed to read IRC command: %v", err)
-                }
-
-                if err := c.handleMessage(msg); err != nil {
-                        c.logger.Printf("failed to handle message %q: %v", msg, err)
-                }
-        }
-
-        return netConn.Close()
-}
+        }, nil
+}