Changeset 3 in code

Timestamp:

Feb 4, 2020, 10:25:53 AM (5 years ago)

Author:

contact

Message:

Send "unknown command" replies

Location:

trunk

Files:

• cmd/jounce/main.go (modified) (1 diff)
• server.go (modified) (3 diffs)

trunk/cmd/jounce/main.go

@@ -16 +16 @@
         }
 
+        s := jounce.Server{}
+
         log.Printf("Server listening on %v", addr)
-        log.Fatal(jounce.Serve(ln))
+        log.Fatal(s.Serve(ln))
 }

trunk/server.go

@@ -3 +3 @@
 import (
         "fmt"
+        "io"
         "log"
         "net"
@@ -9 +10 @@
 )
 
-func handleConn(conn net.Conn) error {
-        defer conn.Close()
+type conn struct {
+        net net.Conn
+        irc *irc.Conn
+}
 
-        ircConn := irc.NewConn(conn)
+type Server struct{}
+
+func (s *Server) handleConn(netConn net.Conn) error {
+        defer netConn.Close()
+
+        conn := conn{netConn, irc.NewConn(netConn)}
         for {
-                msg, err := ircConn.ReadMessage()
-                if err != nil {
+                msg, err := conn.irc.ReadMessage()
+                if err == io.EOF {
+                        break
+                } else if err != nil {
                         return err
                 }
+                log.Println(msg)
 
-                log.Println(msg)
+                switch msg.Command {
+                default:
+                        err = conn.irc.WriteMessage(&irc.Message{
+                                Command: irc.ERR_UNKNOWNCOMMAND,
+                                Params: []string{
+                                        "*",
+                                        msg.Command,
+                                        "Unknown command",
+                                },
+                        })
+                }
         }
+
+        return netConn.Close()
 }
 
-func Serve(ln net.Listener) error {
+func (s *Server) Serve(ln net.Listener) error {
         for {
-                conn, err := ln.Accept()
+                c, err := ln.Accept()
                 if err != nil {
                         return fmt.Errorf("failed to accept connection: %v", err)
@@ -31 +54 @@
 
                 go func() {
-                        if err := handleConn(conn); err != nil {
+                        if err := s.handleConn(c); err != nil {
                                 log.Printf("error handling connection: %v", err)
                         }