Changeset 39 in code for trunk

Timestamp:

Feb 7, 2020, 10:46:44 AM (5 years ago)

Author:

contact

Message:

Add user.forEachUpstream

Location:

trunk

Files:

• downstream.go (modified) (4 diffs)
• server.go (modified) (1 diff)

trunk/downstream.go

@@ -5 +5 @@
         "io"
         "net"
+        "strings"
 
         "gopkg.in/irc.v3"
@@ -168 +169 @@
 
 func (c *downstreamConn) register() error {
-        u := c.srv.getUser(c.username)
+        u := c.srv.getUser(strings.TrimPrefix(c.username, "~"))
         if u == nil {
+                c.logger.Printf("failed authentication: unknown username %q", c.username)
                 c.messages <- &irc.Message{
                         Prefix:  c.srv.prefix(),
@@ -207 +209 @@
         }
 
-        u.lock.Lock()
-        for _, uc := range u.upstreamConns {
+        u.forEachUpstream(func(uc *upstreamConn) {
                 // TODO: fix races accessing upstream connection data
-                if !uc.registered {
-                        continue
-                }
                 for _, ch := range uc.channels {
                         if ch.complete {
@@ -218 +216 @@
                         }
                 }
-        }
-        u.lock.Unlock()
-
+        })
         return nil
 }

trunk/server.go

@@ -38 +38 @@
         lock          sync.Mutex
         upstreamConns []*upstreamConn
+}
+
+func (u *user) forEachUpstream(f func(uc *upstreamConn)) {
+        u.lock.Lock()
+        for _, uc := range u.upstreamConns {
+                if !uc.registered {
+                        continue
+                }
+                f(uc)
+        }
+        u.lock.Unlock()
 }