Changeset 694 in code for trunk

Timestamp:

Nov 17, 2021, 10:41:11 AM (4 years ago)

Author:

contact

Message:

Add config option to globally disable multi-upstream mode

Closes: ​https://todo.sr.ht/~emersion/soju/122

Location:

trunk

Files:

• cmd/soju/main.go (modified) (1 diff)
• config/config.go (modified) (3 diffs)
• doc/soju.1.scd (modified) (1 diff)
• downstream.go (modified) (1 diff)
• server.go (modified) (2 diffs)

trunk/cmd/soju/main.go

@@ -93 +93 @@
                 AcceptProxyIPs:  raw.AcceptProxyIPs,
                 MaxUserNetworks: raw.MaxUserNetworks,
+                MultiUpstream:   raw.MultiUpstream,
                 Debug:           debug,
                 MOTD:            motd,

trunk/config/config.go

@@ -52 +52 @@
 
         MaxUserNetworks int
+        MultiUpstream   bool
 }
 
@@ -64 +65 @@
                 SQLSource:       "soju.db",
                 MaxUserNetworks: -1,
+                MultiUpstream:   true,
         }
 }
@@ -139 +141 @@
                                 return nil, fmt.Errorf("directive %q: %v", d.Name, err)
                         }
+                case "multi-upstream-mode":
+                        var str string
+                        if err := d.ParseParams(&str); err != nil {
+                                return nil, err
+                        }
+                        v, err := strconv.ParseBool(str)
+                        if err != nil {
+                                return nil, fmt.Errorf("directive %q: %v", d.Name, err)
+                        }
+                        srv.MultiUpstream = v
                 default:
                         return nil, fmt.Errorf("unknown directive %q", d.Name)

trunk/doc/soju.1.scd

@@ -153 +153 @@
         bound to a specific network. By default, no MOTD is sent.
 
+*multi-upstream-mode* true|false
+        Globally enable or disable multi-upstream mode. By default, multi-upstream
+        mode is enabled.
+
 # IRC SERVICE
 

trunk/downstream.go

@@ -1172 +1172 @@
         }
 
-        if dc.network == nil && !dc.caps["soju.im/bouncer-networks"] {
+        if dc.network == nil && !dc.caps["soju.im/bouncer-networks"] && dc.srv.Config().MultiUpstream {
                 dc.isMultiUpstream = true
         }

trunk/server.go

@@ -62 +62 @@
         AcceptProxyIPs  config.IPSet
         MaxUserNetworks int
+        MultiUpstream   bool
         MOTD            string
 }
@@ -86 +87 @@
                 users:     make(map[string]*user),
         }
-        srv.config.Store(&Config{Hostname: "localhost", MaxUserNetworks: -1})
+        srv.config.Store(&Config{
+                Hostname:        "localhost",
+                MaxUserNetworks: -1,
+                MultiUpstream:   true,
+        })
         return srv
 }