Changeset 37 in code for trunk/server.go

Timestamp:

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

Author:

contact

Message:

Per-user connections

File:

• trunk/server.go (modified) (6 diffs)

trunk/server.go

@@ -3 +3 @@
 import (
         "fmt"
+        "log"
         "net"
         "sync"
@@ -31 +32 @@
 }
 
+type user struct {
+        username string
+        srv      *Server
+
+        lock          sync.Mutex
+        upstreamConns []*upstreamConn
+}
+
 type Upstream struct {
         Addr     string
@@ -45 +54 @@
 
         lock            sync.Mutex
+        users           map[string]*user
         downstreamConns []*downstreamConn
-        upstreamConns   []*upstreamConn
+}
+
+func NewServer() *Server {
+        return &Server{
+                Logger: log.New(log.Writer(), "", log.LstdFlags),
+                users:  make(map[string]*user),
+        }
 }
 
@@ -54 +70 @@
 
 func (s *Server) Run() {
+        // TODO: multi-user
+        u := &user{username: "jounce", srv: s}
+
+        s.lock.Lock()
+        s.users[u.username] = u
+        s.lock.Unlock()
+
         for i := range s.Upstreams {
                 upstream := &s.Upstreams[i]
                 // TODO: retry connecting
                 go func() {
-                        conn, err := connectToUpstream(s, upstream)
+                        conn, err := connectToUpstream(u, upstream)
                         if err != nil {
                                 s.Logger.Printf("failed to connect to upstream server %q: %v", upstream.Addr, err)
@@ -64 +87 @@
                         }
 
-                        s.lock.Lock()
-                        s.upstreamConns = append(s.upstreamConns, conn)
-                        s.lock.Unlock()
+                        u.lock.Lock()
+                        u.upstreamConns = append(u.upstreamConns, conn)
+                        u.lock.Unlock()
 
                         if err := conn.readMessages(); err != nil {
@@ -72 +95 @@
                         }
 
-                        s.lock.Lock()
-                        for i, c := range s.upstreamConns {
+                        u.lock.Lock()
+                        for i, c := range u.upstreamConns {
                                 if c == conn {
-                                        s.upstreamConns = append(s.upstreamConns[:i], s.upstreamConns[i+1:]...)
+                                        u.upstreamConns = append(u.upstreamConns[:i], u.upstreamConns[i+1:]...)
                                         break
                                 }
                         }
-                        s.lock.Unlock()
+                        u.lock.Unlock()
                 }()
         }