ISON command support

[goircd.git] / goircd.go

diff --git a/goircd.go b/goircd.go
index a0633ad9065aa1a3f310734d07ae7693f458488b..8bc5e3ecfa091928249d319b0941d508a32154dd 100644 (file)
--- a/goircd.go
+++ b/goircd.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 package main
 
 import (
@@ -23,12 +24,9 @@ import (
        "io/ioutil"
        "log"
        "net"
-       "os"
-       "os/signal"
        "path"
        "path/filepath"
        "strings"
-       "syscall"
 )
 
 var (
@@ -39,22 +37,19 @@ var (
        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")
-
-       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.")
+       tlsBind   = flag.String("tlsbind", "", "TLS address to bind to")
+       tlsPEM    = flag.String("tlspem", "", "Path to TLS certificat+key PEM file")
+       verbose   = flag.Bool("v", false, "Enable verbose logging.")
 )
 
-func listenerLoop(sock net.Listener, events chan<- ClientEvent) {
+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)
+               client := NewClient(conn)
                go client.Processor(events)
        }
 }
@@ -63,7 +58,6 @@ func Run() {
        events := make(chan ClientEvent)
        log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
 
-       logSink := make(chan LogEvent)
        if *logdir == "" {
                // Dummy logger
                go func() {
@@ -73,16 +67,12 @@ func Run() {
        } else {
                if !path.IsAbs(*logdir) {
                        log.Fatalln("Need absolute path for logdir")
-                       return
                }
                go Logger(*logdir, logSink)
                log.Println(*logdir, "logger initialized")
        }
 
-       stateSink := make(chan StateEvent)
-       daemon := NewDaemon(version, *hostname, *motd, logSink, stateSink)
-       daemon.Verbose = *verbose
-       log.Println("goircd "+daemon.version+" is starting")
+       log.Println("goircd " + version + " is starting")
        if *statedir == "" {
                // Dummy statekeeper
                go func() {
@@ -102,33 +92,20 @@ func Run() {
                        if err != nil {
                                log.Fatalf("Can not read state %s: %v", state, err)
                        }
-                       room, _ := daemon.RoomRegister(path.Base(state))
+                       room, _ := RoomRegister(path.Base(state))
                        contents := strings.Split(string(buf), "\n")
                        if len(contents) < 2 {
-                               log.Printf("State corrupted for %s: %q", room.name, contents)
+                               log.Printf("State corrupted for %s: %q", *room.name, contents)
                        } else {
-                               room.topic = contents[0]
-                               room.key = contents[1]
-                               log.Println("Loaded state for room", room.name)
+                               room.topic = &contents[0]
+                               room.key = &contents[1]
+                               log.Println("Loaded state for room", *room.name)
                        }
                }
                go StateKeeper(*statedir, stateSink)
                log.Println(*statedir, "statekeeper initialized")
        }
 
-       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 {
@@ -138,9 +115,9 @@ func Run() {
                go listenerLoop(listener, events)
        }
        if *tlsBind != "" {
-               cert, err := tls.LoadX509KeyPair(*tlsCert, *tlsKey)
+               cert, err := tls.LoadX509KeyPair(*tlsPEM, *tlsPEM)
                if err != nil {
-                       log.Fatalf("Could not load TLS keys from %s and %s: %s", *tlsCert, *tlsKey, err)
+                       log.Fatalf("Could not load TLS keys from %s: %s", *tlsPEM, err)
                }
                config := tls.Config{Certificates: []tls.Certificate{cert}}
                listenerTLS, err := tls.Listen("tcp", *tlsBind, &config)
@@ -150,8 +127,7 @@ func Run() {
                log.Println("TLS listening on", *tlsBind)
                go listenerLoop(listenerTLS, events)
        }
-
-       daemon.Processor(events)
+       Processor(events, make(chan struct{}))
 }
 
 func main() {