Changeset 66 in code

Timestamp:

Feb 18, 2020, 4:07:58 PM (5 years ago)

Author:

contact

Message:

Properly handle PING messages

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• upstream.go (modified) (1 diff)

trunk/downstream.go

@@ -196 +196 @@
                 return dc.Close()
         case "PING":
-                // TODO: handle params
+                var from, to string
+                if len(msg.Params) >= 1 {
+                        from = msg.Params[0]
+                }
+                if len(msg.Params) >= 2 {
+                        to = msg.Params[1]
+                }
+
+                if to != "" && to != dc.srv.Hostname {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_NOSUCHSERVER,
+                                Params:  []string{to, "No such server"},
+                        }}
+                }
+
+                params := []string{dc.srv.Hostname}
+                if from != "" {
+                        params = append(params, from)
+                }
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.srv.prefix(),
                         Command: "PONG",
-                        Params:  []string{dc.srv.Hostname},
+                        Params:  params,
                 })
                 return nil

trunk/upstream.go

@@ -110 +110 @@
         switch msg.Command {
         case "PING":
-                // TODO: handle params
+                var from, to string
+                if len(msg.Params) >= 1 {
+                        from = msg.Params[0]
+                }
+                if len(msg.Params) >= 2 {
+                        to = msg.Params[1]
+                }
+
+                if to != "" && to != uc.srv.Hostname {
+                        return fmt.Errorf("invalid PING destination %q", to)
+                }
+
+                params := []string{uc.srv.Hostname}
+                if from != "" {
+                        params = append(params, from)
+                }
                 uc.SendMessage(&irc.Message{
                         Command: "PONG",
-                        Params:  []string{uc.srv.Hostname},
+                        Params:  params,
                 })
                 return nil