Changeset 412 in code for trunk/downstream.go

Timestamp:

Aug 26, 2020, 1:18:57 PM (5 years ago)

Author:

contact

Message:

Fix downstream PING argument handling

The PONG message should have these arguments:

• Our server name
• The PING message's source name

Closes: ​https://todo.sr.ht/~emersion/soju/92

File:

• trunk/downstream.go (modified) (1 diff)

trunk/downstream.go

@@ -961 +961 @@
                 }
         case "PING":
+                var source, destination string
+                if err := parseMessageParams(msg, &source); err != nil {
+                        return err
+                }
+                if len(msg.Params) > 1 {
+                        destination = msg.Params[1]
+                }
+                if destination != "" && destination != dc.srv.Hostname {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_NOSUCHSERVER,
+                                Params: []string{dc.nick, destination, "No such server"},
+                        }}
+                }
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.srv.prefix(),
                         Command: "PONG",
-                        Params:  msg.Params,
+                        Params:  []string{dc.srv.Hostname, source},
                 })
                 return nil