Changeset 693 in code for trunk

Timestamp:

Nov 17, 2021, 10:22:26 AM (4 years ago)

Author:

contact

Message:

Set isMultiUpstream flag in downstreamConn.welcome()

This will make it easier to globally disable multi-upstream mode.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -249 +249 @@
         id uint64
 
-        registered  bool
-        user        *user
-        nick        string
-        nickCM      string
-        rawUsername string
-        networkName string
-        clientName  string
-        realname    string
-        hostname    string
-        password    string   // empty after authentication
-        network     *network // can be nil
+        registered      bool
+        user            *user
+        nick            string
+        nickCM          string
+        rawUsername     string
+        networkName     string
+        clientName      string
+        realname        string
+        hostname        string
+        password        string   // empty after authentication
+        network         *network // can be nil
+        isMultiUpstream bool
 
         negotiatingCaps bool
@@ -308 +309 @@
 }
 
-func (dc *downstreamConn) isMultiUpstream() bool {
-        return dc.network == nil && !dc.caps["soju.im/bouncer-networks"]
-}
-
 func (dc *downstreamConn) forEachNetwork(f func(*network)) {
         if dc.network != nil {
                 f(dc.network)
-        } else if dc.isMultiUpstream() {
+        } else if dc.isMultiUpstream {
                 dc.user.forEachNetwork(f)
         }
@@ -321 +318 @@
 
 func (dc *downstreamConn) forEachUpstream(f func(*upstreamConn)) {
-        if dc.network == nil && !dc.isMultiUpstream() {
+        if dc.network == nil && !dc.isMultiUpstream {
                 return
         }
@@ -1175 +1172 @@
         }
 
+        if dc.network == nil && !dc.caps["soju.im/bouncer-networks"] {
+                dc.isMultiUpstream = true
+        }
+
         isupport := []string{
                 fmt.Sprintf("CHATHISTORY=%v", chatHistoryLimit),
@@ -1186 +1187 @@
                 isupport = append(isupport, "NETWORK="+encodeISUPPORT(title))
         }
-        if dc.network == nil && !dc.isMultiUpstream() {
+        if dc.network == nil && !dc.isMultiUpstream {
                 isupport = append(isupport, "WHOX")
         }
@@ -1229 +1230 @@
                 })
         }
-        if dc.network == nil && !dc.isMultiUpstream() && dc.user.Admin {
+        if dc.network == nil && !dc.isMultiUpstream && dc.user.Admin {
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.srv.prefix(),

trunk/user.go

@@ -153 +153 @@
 func (net *network) forEachDownstream(f func(*downstreamConn)) {
         net.user.forEachDownstream(func(dc *downstreamConn) {
-                if dc.network == nil && !dc.isMultiUpstream() {
+                if dc.network == nil && !dc.isMultiUpstream {
                         return
                 }