]> Cypherpunks.ru repositories - goircd.git/blobdiff - goircd.go
Trivial formatting correction
[goircd.git] / goircd.go
index aeca83a73a19756058f3490ca7260a145729da44..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,121 +15,119 @@ 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 (
-       "bytes"
        "crypto/tls"
        "flag"
+       "io/ioutil"
        "log"
        "net"
-       "os"
        "path"
        "path/filepath"
        "strings"
 )
 
 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")
-
-       ssl     = flag.Bool("ssl", false, "Use SSL only.")
-       sslKey  = flag.String("ssl_key", "", "SSL keyfile.")
-       sslCert = flag.String("ssl_cert", "", "SSL certificate.")
+       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")
+       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) {
+       for {
+               conn, err := sock.Accept()
+               if err != nil {
+                       log.Println("Error during accepting connection", err)
+                       continue
+               }
+               client := NewClient(conn)
+               go client.Processor(events)
+       }
+}
+
 func Run() {
-       var client *Client
        events := make(chan ClientEvent)
        log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile)
 
-       log_sink := make(chan LogEvent)
        if *logdir == "" {
                // Dummy logger
                go func() {
-                       for _ = range log_sink {
+                       for _ = range logSink {
                        }
                }()
        } else {
                if !path.IsAbs(*logdir) {
                        log.Fatalln("Need absolute path for logdir")
-                       return
                }
-               go Logger(*logdir, log_sink)
+               go Logger(*logdir, logSink)
                log.Println(*logdir, "logger initialized")
        }
 
-       state_sink := make(chan StateEvent)
-       daemon := NewDaemon(*hostname, *motd, log_sink, state_sink)
+       log.Println("goircd " + version + " is starting")
        if *statedir == "" {
                // Dummy statekeeper
                go func() {
-                       for _ = range state_sink {
+                       for _ = range stateSink {
                        }
                }()
        } else {
                if !path.IsAbs(*statedir) {
                        log.Fatalln("Need absolute path for statedir")
                }
-               states, err := filepath.Glob(*statedir + "/#*")
+               states, err := filepath.Glob(path.Join(*statedir, "#*"))
                if err != nil {
                        log.Fatalln("Can not read statedir", err)
                }
                for _, state := range states {
-                       fd, err := os.Open(state)
+                       buf, err := ioutil.ReadFile(state)
                        if err != nil {
-                               log.Fatalln("Can not open state", state, err)
+                               log.Fatalf("Can not read state %s: %v", state, err)
                        }
-                       buf := make([]byte, 1024)
-                       _, err = fd.Read(buf)
-                       fd.Close()
-                       if err != nil {
-                               log.Fatalln("Can not read state", state, err)
-                       }
-                       room, _ := daemon.RoomRegister(path.Base(state))
-                       buf = bytes.TrimRight(buf, "\x00")
+                       room, _ := RoomRegister(path.Base(state))
                        contents := strings.Split(string(buf), "\n")
-                       room.topic = contents[0]
-                       room.key = contents[1]
-                       log.Println("Loaded state for room", room.name)
+                       if len(contents) < 2 {
+                               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)
+                       }
                }
-               go StateKeeper(*statedir, state_sink)
+               go StateKeeper(*statedir, stateSink)
                log.Println(*statedir, "statekeeper initialized")
        }
 
-       var listener net.Listener
-       if *ssl {
-               cert, err := tls.LoadX509KeyPair(*sslCert, *sslKey)
-               if err != nil {
-                       log.Fatalf("Could not load SSL keys from %s and %s: %s", *sslCert, *sslKey, err)
-               }
-               config := tls.Config{Certificates: []tls.Certificate{cert}}
-               listener, err = tls.Listen("tcp", *bind, &config)
+       if *bind != "" {
+               listener, err := net.Listen("tcp", *bind)
                if err != nil {
                        log.Fatalf("Can not listen on %s: %v", *bind, err)
                }
-       } else {
-               var err error
-               listener, err = net.Listen("tcp", *bind)
+               log.Println("Raw listening on", *bind)
+               go listenerLoop(listener, events)
+       }
+       if *tlsBind != "" {
+               cert, err := tls.LoadX509KeyPair(*tlsPEM, *tlsPEM)
                if err != nil {
-                       log.Fatalf("Can not listen on %s: %v", *bind, err)
+                       log.Fatalf("Could not load TLS keys from %s: %s", *tlsPEM, err)
                }
-       }
-       log.Println("Listening on", *bind)
-
-       go daemon.Processor(events)
-       for {
-               conn, err := listener.Accept()
+               config := tls.Config{Certificates: []tls.Certificate{cert}}
+               listenerTLS, err := tls.Listen("tcp", *tlsBind, &config)
                if err != nil {
-                       log.Println("Error during accepting connection", err)
-                       continue
+                       log.Fatalf("Can not listen on %s: %v", *tlsBind, err)
                }
-               client = NewClient(*hostname, conn)
-               go client.Processor(events)
+               log.Println("TLS listening on", *tlsBind)
+               go listenerLoop(listenerTLS, events)
        }
+       Processor(events, make(chan struct{}))
 }
 
 func main() {