Changeset 22 in code for trunk

Timestamp:

Feb 6, 2020, 8:11:35 PM (5 years ago)

Author:

contact

Message:

Maintain a list of downstream connections

Location:

trunk

Files:

• downstream.go (modified) (4 diffs)
• server.go (modified) (2 diffs)

trunk/downstream.go

@@ -43 +43 @@
         irc        *irc.Conn
         srv        *Server
+        logger     Logger
+
         registered bool
         closed     bool
@@ -48 +50 @@
         username   string
         realname   string
+}
+
+func newDownstreamConn(srv *Server, netConn net.Conn) *downstreamConn {
+        return &downstreamConn{
+                net: netConn,
+                irc: irc.NewConn(netConn),
+                srv: srv,
+                logger: &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())},
+        }
+}
+
+func (c *downstreamConn) readMessages() error {
+        c.logger.Printf("new connection")
+        defer c.Close()
+
+        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)
+                }
+
+                err = c.handleMessage(msg)
+                if ircErr, ok := err.(ircError); ok {
+                        ircErr.Message.Prefix = c.srv.prefix()
+                        if err := c.WriteMessage(ircErr.Message); err != nil {
+                                return fmt.Errorf("failed to write IRC reply: %v", err)
+                        }
+                } else if err != nil {
+                        return fmt.Errorf("failed to handle IRC command %q: %v", msg.Command, err)
+                }
+
+                if c.closed {
+                        return nil
+                }
+        }
+
+        return c.Close()
 }
 
@@ -96 +137 @@
                 return c.Close()
         default:
+                c.logger.Printf("unhandled message: %v", msg)
                 return newUnknownCommandError(msg.Command)
         }
@@ -163 +205 @@
                 return c.Close()
         default:
+                c.logger.Printf("unhandled message: %v", msg)
                 return newUnknownCommandError(msg.Command)
         }
 }
-
-func handleConn(s *Server, netConn net.Conn) error {
-        s.Logger.Printf("Handling connection from %v", netConn.RemoteAddr())
-
-        c := downstreamConn{net: netConn, irc: irc.NewConn(netConn), srv: s}
-        defer c.Close()
-        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)
-                }
-                s.Logger.Printf("Downstream message: %v", msg)
-
-                err = c.handleMessage(msg)
-                if ircErr, ok := err.(ircError); ok {
-                        ircErr.Message.Prefix = s.prefix()
-                        if err := c.WriteMessage(ircErr.Message); err != nil {
-                                return fmt.Errorf("failed to write IRC reply: %v", err)
-                        }
-                } else if err != nil {
-                        return fmt.Errorf("failed to handle IRC command %q: %v", msg.Command, err)
-                }
-
-                if c.closed {
-                        return nil
-                }
-        }
-
-        return c.Close()
-}

trunk/server.go

@@ -42 +42 @@
         Logger    Logger
         Upstreams []Upstream // TODO: per-user
+
+        downstreamConns []*downstreamConn
 }
 
@@ -62 +64 @@
 func (s *Server) Serve(ln net.Listener) error {
         for {
-                c, err := ln.Accept()
+                netConn, err := ln.Accept()
                 if err != nil {
                         return fmt.Errorf("failed to accept connection: %v", err)
                 }
 
+                conn := newDownstreamConn(s, netConn)
+                s.downstreamConns = append(s.downstreamConns, conn)
                 go func() {
-                        if err := handleConn(s, c); err != nil {
-                                s.Logger.Printf("Error handling connection: %v", err)
+                        if err := conn.readMessages(); err != nil {
+                                conn.logger.Printf("Error handling messages: %v", err)
                         }
                 }()