Changeset 40 in code for trunk

Timestamp:

Feb 7, 2020, 10:56:36 AM (5 years ago)

Author:

contact

Message:

Add user.forEachDownstream

Location:

trunk

Files:

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

trunk/downstream.go

@@ -116 +116 @@
                 return fmt.Errorf("downstream connection already closed")
         }
-        if err := c.net.Close(); err != nil {
-                return err
-        }
+
+        if u := c.user; u != nil {
+                u.lock.Lock()
+                for i := range u.downstreamConns {
+                        if u.downstreamConns[i] == c {
+                                u.downstreamConns = append(u.downstreamConns[:i], u.downstreamConns[i+1:]...)
+                        }
+                }
+                u.lock.Unlock()
+        }
+
         close(c.messages)
         c.closed = true
-        return nil
+
+        return c.net.Close()
 }
 
@@ -182 +191 @@
         c.registered = true
         c.user = u
+
+        u.lock.Lock()
+        u.downstreamConns = append(u.downstreamConns, c)
+        u.lock.Unlock()
 
         c.messages <- &irc.Message{

trunk/server.go

@@ -36 +36 @@
         srv      *Server
 
-        lock          sync.Mutex
-        upstreamConns []*upstreamConn
+        lock            sync.Mutex
+        upstreamConns   []*upstreamConn
+        downstreamConns []*downstreamConn
 }
 
@@ -47 +48 @@
                 }
                 f(uc)
+        }
+        u.lock.Unlock()
+}
+
+func (u *user) forEachDownstream(f func(dc *downstreamConn)) {
+        u.lock.Lock()
+        for _, dc := range u.downstreamConns {
+                f(dc)
         }
         u.lock.Unlock()

trunk/upstream.go

@@ -126 +126 @@
                         }
 
-                        c.srv.lock.Lock()
-                        for _, dc := range c.srv.downstreamConns {
+                        c.user.forEachDownstream(func(dc *downstreamConn) {
                                 dc.messages <- msg
-                        }
-                        c.srv.lock.Unlock()
+                        })
                 }
         case "NOTICE":
@@ -175 +173 @@
                 }
 
-                c.srv.lock.Lock()
-                for _, dc := range c.srv.downstreamConns {
+                c.user.forEachDownstream(func(dc *downstreamConn) {
                         dc.messages <- msg
-                }
-                c.srv.lock.Unlock()
+                })
         case "PART":
                 if len(msg.Params) < 1 {
@@ -198 +194 @@
                 }
 
-                c.srv.lock.Lock()
-                for _, dc := range c.srv.downstreamConns {
+                c.user.forEachDownstream(func(dc *downstreamConn) {
                         dc.messages <- msg
-                }
-                c.srv.lock.Unlock()
+                })
         case irc.RPL_TOPIC, irc.RPL_NOTOPIC:
                 if len(msg.Params) < 3 {
@@ -276 +270 @@
                 ch.complete = true
 
-                c.srv.lock.Lock()
-                for _, dc := range c.srv.downstreamConns {
+                c.user.forEachDownstream(func(dc *downstreamConn) {
                         forwardChannel(dc, ch)
-                }
-                c.srv.lock.Unlock()
+                })
         case "PRIVMSG":
-                c.srv.lock.Lock()
-                for _, dc := range c.srv.downstreamConns {
+                c.user.forEachDownstream(func(dc *downstreamConn) {
                         dc.messages <- msg
-                }
-                c.srv.lock.Unlock()
+                })
         case irc.RPL_YOURHOST, irc.RPL_CREATED:
                 // Ignore