Changeset 10 in code for trunk

Timestamp:

Feb 6, 2020, 3:03:07 PM (5 years ago)

Author:

contact

Message:

Connect to upstream servers

Location:

trunk

Files:

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

trunk/cmd/jounce/main.go

@@ -16 +16 @@
         }
 
+        // TODO: load from config/DB
         s := jounce.Server{
                 Hostname: "localhost",
-                Logger: log.New(log.Writer(), "", log.LstdFlags),
+                Logger:   log.New(log.Writer(), "", log.LstdFlags),
+                Upstreams: []jounce.Upstream{{
+                        Addr:     "chat.freenode.net:6697",
+                        Nick:     "jounce",
+                        Username: "jounce",
+                        Realname: "jounce",
+                }},
         }
 
         log.Printf("Server listening on %v", addr)
+        go s.Run()
         log.Fatal(s.Serve(ln))
 }

trunk/server.go

@@ -2 +2 @@
 
 import (
+        "crypto/tls"
         "fmt"
         "io"
@@ -75 +76 @@
                 return c.WriteMessage(&irc.Message{
                         Command: "PONG",
-                        Params: []string{c.srv.Hostname},
+                        Params:  []string{c.srv.Hostname},
                 })
         default:
@@ -147 +148 @@
         err = c.WriteMessage(&irc.Message{
                 Command: irc.ERR_NOMOTD,
-                Params: []string{c.nick, "No MOTD"},
+                Params:  []string{c.nick, "No MOTD"},
         })
         if err != nil {
@@ -173 +174 @@
 }
 
-type Server struct{
-        Hostname string
-        Logger   Logger
+type upstreamConn struct {
+        net net.Conn
+        irc *irc.Conn
+        srv *Server
+}
+
+type Upstream struct {
+        Addr     string
+        Nick     string
+        Username string
+        Realname string
+}
+
+type Server struct {
+        Hostname  string
+        Logger    Logger
+        Upstreams []Upstream // TODO: per-user
 }
 
@@ -194 +209 @@
                         return fmt.Errorf("failed to read IRC command: %v", err)
                 }
-                s.Logger.Print(msg)
+                s.Logger.Printf("Downstream message: %v", msg)
 
                 err = c.handleMessage(msg)
@@ -214 +229 @@
 }
 
+func (s *Server) connect(upstream *Upstream) error {
+        s.Logger.Printf("Connecting to %v", upstream.Addr)
+
+        netConn, err := tls.Dial("tcp", upstream.Addr, nil)
+        if err != nil {
+                return fmt.Errorf("failed to dial %q: %v", upstream.Addr, err)
+        }
+
+        c := upstreamConn{net: netConn, irc: irc.NewConn(netConn), srv: s}
+        defer netConn.Close()
+
+        err = c.irc.WriteMessage(&irc.Message{
+                Command: "NICK",
+                Params:  []string{upstream.Nick},
+        })
+        if err != nil {
+                return err
+        }
+
+        err = c.irc.WriteMessage(&irc.Message{
+                Command: "USER",
+                Params:  []string{upstream.Username, "0", "*", upstream.Realname},
+        })
+        if err != nil {
+                return err
+        }
+
+        for {
+                msg, err := c.irc.ReadMessage()
+                if err == io.EOF {
+                        break
+                } else if err != nil {
+                        return fmt.Errorf("failed to read IRC command: %v", err)
+                }
+                log.Printf("Upstream message: %v", msg)
+        }
+
+        return netConn.Close()
+}
+
+func (s *Server) Run() {
+        for i := range s.Upstreams {
+                // TODO: retry connecting
+                go s.connect(&s.Upstreams[i])
+        }
+}
+
 func (s *Server) Serve(ln net.Listener) error {
         for {