Changeset 261 in code

Timestamp:

Apr 16, 2020, 3:23:35 PM (5 years ago)

Author:

contact

Message:

Support sending history when upstream is disconnected

Previously, we were dropping the history.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -239 +239 @@
 // that it's suitable for being sent on this downstream connection. Only
 // messages that may appear in logs are supported.
-func (dc *downstreamConn) marshalMessage(msg *irc.Message, uc *upstreamConn) *irc.Message {
+func (dc *downstreamConn) marshalMessage(msg *irc.Message, net *network) *irc.Message {
         msg = msg.Copy()
-        msg.Prefix = dc.marshalUserPrefix(uc.network, msg.Prefix)
+        msg.Prefix = dc.marshalUserPrefix(net, msg.Prefix)
 
         switch msg.Command {
         case "PRIVMSG", "NOTICE":
-                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(net, msg.Params[0])
         case "NICK":
                 // Nick change for another user
-                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(net, msg.Params[0])
         case "JOIN", "PART":
-                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(net, msg.Params[0])
         case "KICK":
-                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
-                msg.Params[1] = dc.marshalEntity(uc.network, msg.Params[1])
+                msg.Params[0] = dc.marshalEntity(net, msg.Params[0])
+                msg.Params[1] = dc.marshalEntity(net, msg.Params[1])
         case "TOPIC":
-                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(net, msg.Params[0])
         case "MODE":
-                msg.Params[0] = dc.marshalEntity(uc.network, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(net, msg.Params[0])
         case "QUIT":
                 // This space is intentinally left blank
@@ -711 +711 @@
                 consumer := history.ring.NewConsumer(seq)
 
-                // TODO: this means all history is lost when trying to send it while the
-                // upstream is disconnected. We need to store history differently so that
-                // we don't need access to upstreamConn to forward it to a downstream
-                // client.
-                uc := net.upstream()
-                if uc == nil {
-                        dc.logger.Printf("ignoring messages for upstream %q: upstream is disconnected", net.Addr)
-                        return
-                }
-
                 batchRef := "history"
                 if dc.caps["batch"] {
@@ -753 +743 @@
                         }
 
-                        dc.SendMessage(dc.marshalMessage(msg, uc))
+                        dc.SendMessage(dc.marshalMessage(msg, net))
                 }
 

trunk/upstream.go

@@ -563 +563 @@
                 if !me {
                         uc.forEachDownstream(func(dc *downstreamConn) {
-                                dc.SendMessage(dc.marshalMessage(msg, uc))
+                                dc.SendMessage(dc.marshalMessage(msg, uc.network))
                         })
                 }
@@ -669 +669 @@
                 if msg.Prefix.Name != uc.nick {
                         uc.forEachDownstream(func(dc *downstreamConn) {
-                                dc.SendMessage(dc.marshalMessage(msg, uc))
+                                dc.SendMessage(dc.marshalMessage(msg, uc.network))
                         })
                 }
@@ -1332 +1332 @@
         uc.forEachDownstream(func(dc *downstreamConn) {
                 if dc != origin || dc.caps["echo-message"] {
-                        dc.SendMessage(dc.marshalMessage(msg, uc))
+                        dc.SendMessage(dc.marshalMessage(msg, uc.network))
                 }
         })