Changeset 105 in code for trunk

Timestamp:

Mar 16, 2020, 1:28:45 PM (5 years ago)

Author:

contact

Message:

Echo downstream PRIVMSGs to other downstream connections

File:

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

trunk/downstream.go

@@ -7 +7 @@
         "net"
         "strings"
+        "sync"
         "time"
 
@@ -70 +71 @@
         password    string   // empty after authentication
         network     *network // can be nil
+
+        lock        sync.Mutex
+        ourMessages map[*irc.Message]struct{}
 }
 
@@ -81 +85 @@
                 ringMessages: make(chan ringMessage),
                 closed:       make(chan struct{}),
+                ourMessages:  make(map[*irc.Message]struct{}),
         }
 
@@ -230 +235 @@
                                         break
                                 }
+
+                                dc.lock.Lock()
+                                _, ours := dc.ourMessages[msg]
+                                delete(dc.ourMessages, msg)
+                                dc.lock.Unlock()
+                                if ours {
+                                        // The message comes from our connection, don't echo it
+                                        // back
+                                        continue
+                                }
+
                                 msg = msg.Copy()
                                 switch msg.Command {
@@ -639 +655 @@
                                 Params:  []string{upstreamName, text},
                         })
+
+                        dc.lock.Lock()
+                        dc.ourMessages[msg] = struct{}{}
+                        dc.lock.Unlock()
+
+                        uc.ring.Produce(msg)
                 }
         default: