Changeset 279 in code

Timestamp:

Apr 30, 2020, 8:25:16 AM (5 years ago)

Author:

contact

Message:

Remove network.upstream

This is an artifact from when we used locks. No need for this anymore.

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• service.go (modified) (1 diff)
• user.go (modified) (3 diffs)

trunk/downstream.go

@@ -135 +135 @@
                 return nil
         }
-        return dc.network.upstream()
+        return dc.network.conn
 }
 

trunk/service.go

@@ -246 +246 @@
                 var statuses []string
                 var details string
-                if uc := net.upstream(); uc != nil {
+                if uc := net.conn; uc != nil {
                         if dc.nick != uc.nick {
                                 statuses = append(statuses, "connected as "+uc.nick)

trunk/user.go

@@ -130 +130 @@
 }
 
-func (net *network) upstream() *upstreamConn {
-        return net.conn
-}
-
 func (net *network) Stop() {
         select {
@@ -142 +138 @@
         }
 
-        if uc := net.upstream(); uc != nil {
-                uc.Close()
+        if net.conn != nil {
+                net.conn.Close()
         }
 }
@@ -201 +197 @@
 func (u *user) forEachUpstream(f func(uc *upstreamConn)) {
         for _, network := range u.networks {
-                uc := network.upstream()
-                if uc == nil {
+                if network.conn == nil {
                         continue
                 }
-                f(uc)
+                f(network.conn)
         }
 }