Changeset 156 in code for trunk

Timestamp:

Mar 25, 2020, 10:21:14 PM (5 years ago)

Author:

delthas

Message:

Route NAMES, WHO, WHOIS replies to the requesting downstream

Using labeled-response, the replies to several commands such as NAMES,
WHO, WHOIS can be routed back to a specific downstream, rather than
being broadcast to all downstreams.

For example, after this commit, if the server supports labeled-response,
if a downstream requests the NAMES or WHO or WHOIS of a channel, the
replies of the upstream will only be sent back to that downstream, and
the other downstreams won't receive these messages.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -1005 +1005 @@
                         } else {
                                 // NAMES on a channel we have not joined, ask upstream
-                                uc.SendMessage(&irc.Message{
+                                uc.SendMessageLabeled(dc, &irc.Message{
                                         Command: "NAMES",
                                         Params:  []string{upstreamChannel},
@@ -1052 +1052 @@
                 }
 
-                uc.SendMessage(&irc.Message{
+                uc.SendMessageLabeled(dc, &irc.Message{
                         Command: "WHO",
                         Params:  params,
@@ -1109 +1109 @@
                 }
 
-                uc.SendMessage(&irc.Message{
+                uc.SendMessageLabeled(dc, &irc.Message{
                         Command: "WHOIS",
                         Params:  params,

trunk/upstream.go

@@ -751 +751 @@
                 if !ok {
                         // NAMES on a channel we have not joined, forward to downstream
-                        uc.forEachDownstream(func(dc *downstreamConn) {
+                        uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                                 channel := dc.marshalChannel(uc, name)
                                 members := strings.Split(members, " ")
@@ -788 +788 @@
                 if !ok {
                         // NAMES on a channel we have not joined, forward to downstream
-                        uc.forEachDownstream(func(dc *downstreamConn) {
+                        uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                                 channel := dc.marshalChannel(uc, name)
 
@@ -827 +827 @@
                 trailing = strconv.Itoa(hops) + " " + realname
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                         channel := channel
                         if channel != "*" {
@@ -845 +845 @@
                 }
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                         name := name
                         if name != "*" {
@@ -863 +863 @@
                 }
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         dc.SendMessage(&irc.Message{
@@ -877 +877 @@
                 }
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         dc.SendMessage(&irc.Message{
@@ -891 +891 @@
                 }
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         dc.SendMessage(&irc.Message{
@@ -905 +905 @@
                 }
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         params := []string{dc.nick, nick}
@@ -922 +922 @@
                 channels := strings.Split(channelList, " ")
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         channelList := make([]string, len(channels))
@@ -943 +943 @@
                 }
 
-                uc.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
                         nick := dc.marshalNick(uc, nick)
                         dc.SendMessage(&irc.Message{