Changeset 463 in code for trunk

Timestamp:

Mar 15, 2021, 10:41:37 PM (4 years ago)

Author:

contact

Message:

Passthrough some ISUPPORT tokens

Location:

trunk

Files:

• downstream.go (modified) (3 diffs)
• irc.go (modified) (2 diffs)
• upstream.go (modified) (2 diffs)

trunk/downstream.go

@@ -80 +80 @@
         "extended-join": "",
         "multi-prefix":  "",
+}
+
+// passthroughIsupport is the set of ISUPPORT tokens that are directly passed
+// through from the upstream server to downstream clients.
+//
+// This is only effective in single-upstream mode.
+var passthroughIsupport = map[string]bool{
+        "AWAYLEN":    true,
+        "CHANLIMIT":  true,
+        "CHANMODES":  true,
+        "CHANNELLEN": true,
+        "CHANTYPES":  true,
+        "EXCEPTS":    true,
+        "EXTBAN":     true,
+        "HOSTLEN":    true,
+        "INVEX":      true,
+        "KICKLEN":    true,
+        "MAXLIST":    true,
+        "MAXTARGETS": true,
+        "MODES":      true,
+        "NETWORK":    true,
+        "NICKLEN":    true,
+        "PREFIX":     true,
+        "SAFELIST":   true,
+        "TARGMAX":    true,
+        "TOPICLEN":   true,
+        "USERLEN":    true,
 }
 
@@ -881 +908 @@
         }
 
-        if uc := dc.upstream(); uc != nil && uc.isupport["NETWORK"] != nil {
-                isupport = append(isupport, fmt.Sprintf("NETWORK=%v", *uc.isupport["NETWORK"]))
+        if uc := dc.upstream(); uc != nil {
+                for k := range passthroughIsupport {
+                        v, ok := uc.isupport[k]
+                        if !ok {
+                                continue
+                        }
+                        if v != nil {
+                                isupport = append(isupport, fmt.Sprintf("%v=%v", k, *v))
+                        } else {
+                                isupport = append(isupport, k)
+                        }
+                }
         }
 
@@ -905 +942 @@
                 Params:  []string{dc.nick, dc.srv.Hostname, "soju", "aiwroO", "OovaimnqpsrtklbeI"},
         })
-        // TODO: other RPL_ISUPPORT tokens
-        dc.SendMessage(&irc.Message{
-                Prefix:  dc.srv.prefix(),
-                Command: irc.RPL_ISUPPORT,
-                Params:  append(append([]string{dc.nick}, isupport...), "are supported"),
-        })
+        for _, msg := range generateIsupport(dc.srv.prefix(), dc.nick, isupport) {
+                dc.SendMessage(msg)
+        }
         dc.SendMessage(&irc.Message{
                 Prefix:  dc.srv.prefix(),

trunk/irc.go

@@ -18 +18 @@
 )
 
-const maxMessageLength = 512
+const (
+        maxMessageLength = 512
+        maxMessageParams = 15
+)
 
 // The server-time layout, as defined in the IRCv3 spec.
@@ -349 +352 @@
 }
 
+func generateIsupport(prefix *irc.Prefix, nick string, tokens []string) []*irc.Message {
+        maxTokens := maxMessageParams - 2 // 2 reserved params: nick + text
+
+        var msgs []*irc.Message
+        for len(tokens) > 0 {
+                var msgTokens []string
+                if len(tokens) > maxTokens {
+                        msgTokens = tokens[:maxTokens]
+                        tokens = tokens[maxTokens:]
+                } else {
+                        msgTokens = tokens
+                        tokens = nil
+                }
+
+                msgs = append(msgs, &irc.Message{
+                        Prefix:  prefix,
+                        Command: irc.RPL_ISUPPORT,
+                        Params:  append(append([]string{nick}, msgTokens...), "are supported"),
+                })
+        }
+
+        return msgs
+}
+
 type joinSorter struct {
         channels []string

trunk/upstream.go

@@ -614 +614 @@
                         return err
                 }
+
+                var downstreamIsupport []string
                 for _, token := range msg.Params[1 : len(msg.Params)-1] {
                         parameter := token
@@ -659 +661 @@
                                 return err
                         }
-                }
+
+                        if passthroughIsupport[parameter] {
+                                downstreamIsupport = append(downstreamIsupport, token)
+                        }
+                }
+
+                uc.forEachDownstream(func(dc *downstreamConn) {
+                        if dc.network == nil {
+                                return
+                        }
+                        msgs := generateIsupport(dc.srv.prefix(), dc.nick, downstreamIsupport)
+                        for _, msg := range msgs {
+                                dc.SendMessage(msg)
+                        }
+                })
         case "BATCH":
                 var tag string