Changeset 552 in code for trunk

Timestamp:

Jun 9, 2021, 7:29:36 PM (4 years ago)

Author:

greg

Message:

Forward MOTD messages downstream

The first MOTD upon connection is ignored, but subsequent MOTD messages
(requested by the "MOTD" message from the client, typically using a
/motd command) are forwarded.

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• upstream.go (modified) (3 diffs)

trunk/downstream.go

@@ -1106 +1106 @@
                 Prefix:  dc.srv.prefix(),
                 Command: irc.ERR_NOMOTD,
-                Params:  []string{dc.nick, "No MOTD"},
+                Params:  []string{dc.nick, "Use /motd to read the message of the day"},
         })
 

trunk/upstream.go

@@ -104 +104 @@
         // set of LIST commands in progress, per downstream
         pendingLISTDownstreamSet map[uint64]struct{}
+
+        gotMotd bool
 }
 
@@ -663 +665 @@
                         uc.nickCM = uc.network.casemap(uc.nick)
                 }
+
+                if !uc.gotMotd {
+                        // Ignore the initial MOTD upon connection, but forward
+                        // subsequent MOTD messages downstream
+                        uc.gotMotd = true
+                        return nil
+                }
+
+                uc.forEachDownstreamByID(downstreamID, func (dc *downstreamConn) {
+                        dc.SendMessage(&irc.Message {
+                                Prefix: uc.srv.prefix(),
+                                Command: msg.Command,
+                                Params: msg.Params,
+                        })
+                })
         case "BATCH":
                 var tag string
@@ -1422 +1439 @@
                 // Ignore
         case irc.RPL_MOTDSTART, irc.RPL_MOTD:
-                // Ignore
+                if !uc.gotMotd {
+                        return nil
+                }
+
+                uc.forEachDownstreamByID(downstreamID, func (dc *downstreamConn) {
+                        dc.SendMessage(&irc.Message {
+                                Prefix: uc.srv.prefix(),
+                                Command: msg.Command,
+                                Params: msg.Params,
+                        })
+                })
         case irc.RPL_LISTSTART:
                 // Ignore