sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Route NAMES, WHO, WHOIS replies to the requesting downstream

Browse Source 
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.
This commit is contained in:
delthas 2020-03-23 03:53:54 +01:00 committed by Simon Ser
parent e19f8aaba4
commit 6e72071716
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
downstream.go
View File

@ -1004,7 +1004,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
sendNames(dc, ch) sendNames(dc, ch)
} else { } else {
// NAMES on a channel we have not joined, ask upstream // NAMES on a channel we have not joined, ask upstream
uc.SendMessage(&irc.Message{ uc.SendMessageLabeled(dc, &irc.Message{
Command: "NAMES", Command: "NAMES",
Params: []string{upstreamChannel}, Params: []string{upstreamChannel},
}) })
@ -1051,7 +1051,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
params = []string{upstreamName} params = []string{upstreamName}
} }
uc.SendMessage(&irc.Message{ uc.SendMessageLabeled(dc, &irc.Message{
Command: "WHO", Command: "WHO",
Params: params, Params: params,
}) })
@ -1108,7 +1108,7 @@ func (dc *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
params = []string{upstreamNick} params = []string{upstreamNick}
} }
uc.SendMessage(&irc.Message{ uc.SendMessageLabeled(dc, &irc.Message{
Command: "WHOIS", Command: "WHOIS",
Params: params, Params: params,
}) })

20
upstream.go
View File

@ -750,7 +750,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
ch, ok := uc.channels[name] ch, ok := uc.channels[name]
if !ok { if !ok {
// NAMES on a channel we have not joined, forward to downstream // 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) channel := dc.marshalChannel(uc, name)
members := strings.Split(members, " ") members := strings.Split(members, " ")
for i, member := range members { for i, member := range members {
@ -787,7 +787,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
ch, ok := uc.channels[name] ch, ok := uc.channels[name]
if !ok { if !ok {
// NAMES on a channel we have not joined, forward to downstream // 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) channel := dc.marshalChannel(uc, name)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
@ -826,7 +826,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
trailing = strconv.Itoa(hops) + " " + realname trailing = strconv.Itoa(hops) + " " + realname
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
channel := channel channel := channel
if channel != "*" { if channel != "*" {
channel = dc.marshalChannel(uc, channel) channel = dc.marshalChannel(uc, channel)
@ -844,7 +844,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
return err return err
} }
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
name := name name := name
if name != "*" { if name != "*" {
// TODO: support WHO masks // TODO: support WHO masks
@ -862,7 +862,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
return err return err
} }
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalNick(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
@ -876,7 +876,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
return err return err
} }
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalNick(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
@ -890,7 +890,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
return err return err
} }
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalNick(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
@ -904,7 +904,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
return err return err
} }
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalNick(uc, nick)
params := []string{dc.nick, nick} params := []string{dc.nick, nick}
params = append(params, msg.Params[2:]...) params = append(params, msg.Params[2:]...)
@ -921,7 +921,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
} }
channels := strings.Split(channelList, " ") channels := strings.Split(channelList, " ")
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalNick(uc, nick)
channelList := make([]string, len(channels)) channelList := make([]string, len(channels))
for i, channel := range channels { for i, channel := range channels {
@ -942,7 +942,7 @@ func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
return err return err
} }
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstreamById(downstreamId, func(dc *downstreamConn) {
nick := dc.marshalNick(uc, nick) nick := dc.marshalNick(uc, nick)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),