Changeset 236 in code for trunk/downstream.go

Timestamp:

Apr 6, 2020, 5:08:43 PM (5 years ago)

Author:

contact

Message:

Remove downstreamConn.ourMessages

We can just do the filtering when dispatching the message.

File:

• trunk/downstream.go (modified) (4 diffs)

trunk/downstream.go

@@ -67 +67 @@
         network     *network // can be nil
 
-        ourMessages map[*irc.Message]struct{}
-        caps        map[string]bool
-
         negociatingCaps bool
         capVersion      int
+        caps            map[string]bool
 
         saslServer sasl.Server
@@ -79 +77 @@
         logger := &prefixLogger{srv.Logger, fmt.Sprintf("downstream %q: ", netConn.RemoteAddr())}
         dc := &downstreamConn{
-                conn:        *newConn(srv, netConn, logger),
-                id:          id,
-                ourMessages: make(map[*irc.Message]struct{}),
-                caps:        make(map[string]bool),
+                conn: *newConn(srv, netConn, logger),
+                id:   id,
+                caps: make(map[string]bool),
         }
         dc.hostname = netConn.RemoteAddr().String()
@@ -227 +224 @@
 
 func (dc *downstreamConn) sendFromUpstream(msg *irc.Message, uc *upstreamConn) {
-        _, ours := dc.ourMessages[msg]
-        delete(dc.ourMessages, msg)
-        if ours && !dc.caps["echo-message"] {
-                // The message comes from our connection, don't echo it
-                // back
-                return
-        }
-
         msg = msg.Copy()
         switch msg.Command {
@@ -1197 +1186 @@
                                 Params:  []string{upstreamName, text},
                         }
-                        dc.ourMessages[echoMsg] = struct{}{}
 
                         uc.appendLog(upstreamName, echoMsg)
 
-                        uc.produce(echoMsg)
+                        uc.network.ring.Produce(echoMsg)
+
+                        uc.forEachDownstream(func(c *downstreamConn) {
+                                if c != dc || c.caps["echo-message"] {
+                                        c.sendFromUpstream(echoMsg, uc)
+                                }
+                        })
                 }
         case "NOTICE":