Changeset 355 in code for trunk

Timestamp:

Jul 8, 2020, 4:21:52 PM (5 years ago)

Author:

contact

Message:

Broadcast unhandled messages to downstream connections

In case labelled-response isn't supported, broadcast unhandled messages
to all downstream connections. That's better than silently dropping the
messages.

File:

• trunk/upstream.go (modified) (2 diffs)

trunk/upstream.go

@@ -1316 +1316 @@
                 }
 
-                if downstreamID != 0 {
-                        uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                                dc.SendMessage(&irc.Message{
-                                        Prefix:  uc.srv.prefix(),
-                                        Command: msg.Command,
-                                        Params:  []string{dc.nick, command, reason},
-                                })
-                        })
-                }
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  uc.srv.prefix(),
+                                Command: msg.Command,
+                                Params:  []string{dc.nick, command, reason},
+                        })
+                })
         case "ACK":
                 // Ignore
@@ -1348 +1346 @@
         default:
                 uc.logger.Printf("unhandled message: %v", msg)
-                if downstreamID != 0 {
-                        uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                                // best effort marshaling for unknown messages, replies and errors:
-                                // most numerics start with the user nick, marshal it if that's the case
-                                // otherwise, conservately keep the params without marshaling
-                                params := msg.Params
-                                if _, err := strconv.Atoi(msg.Command); err == nil { // numeric
-                                        if len(msg.Params) > 0 && isOurNick(uc.network, msg.Params[0]) {
-                                                params[0] = dc.nick
-                                        }
+
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                        // best effort marshaling for unknown messages, replies and errors:
+                        // most numerics start with the user nick, marshal it if that's the case
+                        // otherwise, conservately keep the params without marshaling
+                        params := msg.Params
+                        if _, err := strconv.Atoi(msg.Command); err == nil { // numeric
+                                if len(msg.Params) > 0 && isOurNick(uc.network, msg.Params[0]) {
+                                        params[0] = dc.nick
                                 }
-                                dc.SendMessage(&irc.Message{
-                                        Prefix:  uc.srv.prefix(),
-                                        Command: msg.Command,
-                                        Params:  params,
-                                })
-                        })
-                }
+                        }
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  uc.srv.prefix(),
+                                Command: msg.Command,
+                                Params:  params,
+                        })
+                })
         }
         return nil