Changeset 175 in code for trunk/user.go

Timestamp:

Mar 27, 2020, 10:08:35 PM (5 years ago)

Author:

contact

Message:

Fix race condition in upstreamConn.Close

upstreamConn.closed was a bool accessed from different goroutines. Use
the same pattern as downstreamConn instead.

File:

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

trunk/user.go

@@ -65 +65 @@
                 uc.register()
 
+                // TODO: wait for the connection to be registered before adding it to
+                // net, otherwise messages might be sent to it while still being
+                // unauthenticated
                 net.lock.Lock()
                 net.conn = uc
@@ -113 +116 @@
         for _, network := range u.networks {
                 uc := network.upstream()
-                if uc == nil || !uc.registered || uc.closed {
+                if uc == nil || !uc.registered {
                         continue
                 }
@@ -153 +156 @@
                 case eventUpstreamMessage:
                         msg, uc := e.msg, e.uc
-                        if uc.closed {
+                        if uc.isClosed() {
                                 uc.logger.Printf("ignoring message on closed connection: %v", msg)
                                 break