Changeset 136 in code for trunk

Timestamp:

Mar 21, 2020, 9:24:38 AM (5 years ago)

Author:

contact

Message:

Add network.upstream helper

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• user.go (modified) (2 diffs)

trunk/downstream.go

@@ -144 +144 @@
                 return nil
         }
-
-        var upstream *upstreamConn
-        dc.forEachUpstream(func(uc *upstreamConn) {
-                upstream = uc
-        })
-        return upstream
+        return dc.network.upstream()
 }
 

trunk/user.go

@@ -68 +68 @@
 }
 
+func (net *network) upstream() *upstreamConn {
+        net.lock.Lock()
+        defer net.lock.Unlock()
+        return net.conn
+}
+
 type user struct {
         User
@@ -100 +106 @@
         u.lock.Lock()
         for _, network := range u.networks {
-                network.lock.Lock()
-                uc := network.conn
-                network.lock.Unlock()
-
+                uc := network.upstream()
                 if uc == nil || !uc.registered || uc.closed {
                         continue