Changeset 131 in code for trunk/user.go

Timestamp:

Mar 20, 2020, 9:48:17 PM (5 years ago)

Author:

contact

Message:

Move upstreamConn.history to network

File:

• trunk/user.go (modified) (5 diffs)

trunk/user.go

@@ -21 +21 @@
         Network
         user *user
-        conn *upstreamConn
+
+        lock    sync.Mutex
+        conn    *upstreamConn
+        history map[string]uint64
 }
 
@@ -28 +31 @@
                 Network: *record,
                 user:    user,
+                history: make(map[string]uint64),
         }
 }
@@ -49 +53 @@
                 uc.register()
 
-                net.user.lock.Lock()
+                net.lock.Lock()
                 net.conn = uc
-                net.user.lock.Unlock()
+                net.lock.Unlock()
 
                 if err := uc.readMessages(net.user.upstreamIncoming); err != nil {
@@ -58 +62 @@
                 uc.Close()
 
-                net.user.lock.Lock()
+                net.lock.Lock()
                 net.conn = nil
-                net.user.lock.Unlock()
+                net.lock.Unlock()
         }
 }
@@ -96 +100 @@
         u.lock.Lock()
         for _, network := range u.networks {
+                network.lock.Lock()
                 uc := network.conn
+                network.lock.Unlock()
+
                 if uc == nil || !uc.registered || uc.closed {
                         continue