Ability to listen on raw and TLS sockets simultaneously

[goircd.git] / goircd.go

diff --git a/goircd.go b/goircd.go
index dbf6d7dd84384e182a9ee00f3290d4d107033db0..a0633ad9065aa1a3f310734d07ae7693f458488b 100644 (file)
--- a/goircd.go
+++ b/goircd.go
@@ -23,26 +23,43 @@ import (
        "io/ioutil"
        "log"
        "net"
+       "os"
+       "os/signal"
        "path"
        "path/filepath"
        "strings"
+       "syscall"
 )
 
 var (
-       hostname = flag.String("hostname", "localhost", "Hostname")
-       bind     = flag.String("bind", ":6667", "Address to bind to")
-       motd     = flag.String("motd", "", "Path to MOTD file")
-       logdir   = flag.String("logdir", "", "Absolute path to directory for logs")
-       statedir = flag.String("statedir", "", "Absolute path to directory for states")
+       version   string
+       hostname  = flag.String("hostname", "localhost", "Hostname")
+       bind      = flag.String("bind", ":6667", "Address to bind to")
+       motd      = flag.String("motd", "", "Path to MOTD file")
+       logdir    = flag.String("logdir", "", "Absolute path to directory for logs")
+       statedir  = flag.String("statedir", "", "Absolute path to directory for states")
+       passwords = flag.String("passwords", "", "Optional path to passwords file")
 
-       tlsKey  = flag.String("tls_key", "", "TLS keyfile")
-       tlsCert = flag.String("tls_cert", "", "TLS certificate")
+       tlsBind = flag.String("tlsbind", "", "TLS address to bind to")
+       tlsKey  = flag.String("tlskey", "", "TLS keyfile")
+       tlsCert = flag.String("tlscert", "", "TLS certificate")
 
        verbose = flag.Bool("v", false, "Enable verbose logging.")
 )
 
+func listenerLoop(sock net.Listener, events chan<- ClientEvent) {
+       for {
+               conn, err := sock.Accept()
+               if err != nil {
+                       log.Println("Error during accepting connection", err)
+                       continue
+               }
+               client := NewClient(*hostname, conn)
+               go client.Processor(events)
+       }
+}
+
 func Run() {
-       var client *Client
        events := make(chan ClientEvent)
        log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
 
@@ -63,8 +80,9 @@ func Run() {
        }
 
        stateSink := make(chan StateEvent)
-       daemon := NewDaemon(*hostname, *motd, logSink, stateSink)
+       daemon := NewDaemon(version, *hostname, *motd, logSink, stateSink)
        daemon.Verbose = *verbose
+       log.Println("goircd "+daemon.version+" is starting")
        if *statedir == "" {
                // Dummy statekeeper
                go func() {
@@ -98,36 +116,42 @@ func Run() {
                log.Println(*statedir, "statekeeper initialized")
        }
 
-       var listener net.Listener
-       if *tlsKey != "" {
+       if *passwords != "" {
+               daemon.PasswordsRefresh()
+               hups := make(chan os.Signal)
+               signal.Notify(hups, syscall.SIGHUP)
+               go func() {
+                       for {
+                               <-hups
+                               daemon.PasswordsRefresh()
+                       }
+               }()
+       }
+
+
+       if *bind != "" {
+               listener, err := net.Listen("tcp", *bind)
+               if err != nil {
+                       log.Fatalf("Can not listen on %s: %v", *bind, err)
+               }
+               log.Println("Raw listening on", *bind)
+               go listenerLoop(listener, events)
+       }
+       if *tlsBind != "" {
                cert, err := tls.LoadX509KeyPair(*tlsCert, *tlsKey)
                if err != nil {
                        log.Fatalf("Could not load TLS keys from %s and %s: %s", *tlsCert, *tlsKey, err)
                }
                config := tls.Config{Certificates: []tls.Certificate{cert}}
-               listener, err = tls.Listen("tcp", *bind, &config)
-               if err != nil {
-                       log.Fatalf("Can not listen on %s: %v", *bind, err)
-               }
-       } else {
-               var err error
-               listener, err = net.Listen("tcp", *bind)
+               listenerTLS, err := tls.Listen("tcp", *tlsBind, &config)
                if err != nil {
-                       log.Fatalf("Can not listen on %s: %v", *bind, err)
+                       log.Fatalf("Can not listen on %s: %v", *tlsBind, err)
                }
+               log.Println("TLS listening on", *tlsBind)
+               go listenerLoop(listenerTLS, events)
        }
-       log.Println("Listening on", *bind)
 
-       go daemon.Processor(events)
-       for {
-               conn, err := listener.Accept()
-               if err != nil {
-                       log.Println("Error during accepting connection", err)
-                       continue
-               }
-               client = NewClient(*hostname, conn)
-               go client.Processor(events)
-       }
+       daemon.Processor(events)
 }
 
 func main() {