Changeset 37 in code for trunk/downstream.go

Timestamp:

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

Author:

contact

Message:

Per-user connections

File:

• trunk/downstream.go (modified) (8 diffs)

trunk/downstream.go

@@ -47 +47 @@
 
         registered bool
+        user       *user
         closed     bool
         nick       string
@@ -167 +168 @@
 
 func (c *downstreamConn) register() error {
+        c.srv.lock.Lock()
+        u, ok := c.srv.users[c.username]
+        c.srv.lock.Unlock()
+
+        if !ok {
+                c.messages <- &irc.Message{
+                        Prefix:  c.srv.prefix(),
+                        Command: irc.ERR_PASSWDMISMATCH,
+                        Params:  []string{"*", "Invalid username or password"},
+                }
+                return nil
+        }
+
         c.registered = true
+        c.user = u
 
         c.messages <- &irc.Message{
@@ -174 +189 @@
                 Params:  []string{c.nick, "Welcome to jounce, " + c.nick},
         }
-
         c.messages <- &irc.Message{
                 Prefix:  c.srv.prefix(),
@@ -180 +194 @@
                 Params:  []string{c.nick, "Your host is " + c.srv.Hostname},
         }
-
         c.messages <- &irc.Message{
                 Prefix:  c.srv.prefix(),
@@ -186 +199 @@
                 Params:  []string{c.nick, "This server was created <datetime>"}, // TODO
         }
-
         c.messages <- &irc.Message{
                 Prefix:  c.srv.prefix(),
@@ -192 +204 @@
                 Params:  []string{c.nick, c.srv.Hostname, "jounce", "aiwroO", "OovaimnqpsrtklbeI"},
         }
-
         c.messages <- &irc.Message{
                 Prefix:  c.srv.prefix(),
@@ -199 +210 @@
         }
 
-        c.srv.lock.Lock()
-        for _, uc := range c.srv.upstreamConns {
+        u.lock.Lock()
+        for _, uc := range u.upstreamConns {
                 // TODO: fix races accessing upstream connection data
                 if !uc.registered {
@@ -211 +222 @@
                 }
         }
-        c.srv.lock.Unlock()
+        u.lock.Unlock()
 
         return nil