Mention TLS and -verbose options in documentation

[goircd.git] / goircd.go

diff --git a/goircd.go b/goircd.go
index 824b5f0b675ef6a4618d940d813b589f15e6786b..366032c7735d1709f52a267d65c6b40823b59bd1 100644 (file)
--- a/goircd.go
+++ b/goircd.go
@@ -18,11 +18,11 @@ 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"
@@ -34,6 +34,11 @@ var (
        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")
+
+       tlsKey  = flag.String("tls_key", "", "TLS keyfile")
+       tlsCert = flag.String("tls_cert", "", "TLS certificate")
+
+       verbose = flag.Bool("v", false, "Enable verbose logging.")
 )
 
 func Run() {
@@ -45,8 +50,7 @@ func Run() {
        if *logdir == "" {
                // Dummy logger
                go func() {
-                       for {
-                               <-log_sink
+                       for _ = range log_sink {
                        }
                }()
        } else {
@@ -60,46 +64,57 @@ func Run() {
 
        state_sink := make(chan StateEvent)
        daemon := NewDaemon(*hostname, *motd, log_sink, state_sink)
+       daemon.Verbose = *verbose
        if *statedir == "" {
                // Dummy statekeeper
                go func() {
-                       for {
-                               <-state_sink
+                       for _ = range state_sink {
                        }
                }()
        } 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)
-                       if err != nil {
-                               log.Fatalln("Can not open state", state, err)
-                       }
-                       buf := make([]byte, 1024)
-                       _, err = fd.Read(buf)
-                       fd.Close()
+                       buf, err := ioutil.ReadFile(state)
                        if err != nil {
-                               log.Fatalln("Can not read state", state, err)
+                               log.Fatalf("Can not read state %s: %v", state, err)
                        }
                        room, _ := daemon.RoomRegister(path.Base(state))
-                       buf = bytes.TrimRight(buf, "\x00")
                        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)
                log.Println(*statedir, "statekeeper initialized")
        }
 
-       listener, err := net.Listen("tcp", *bind)
-       if err != nil {
-               log.Fatalln("Can not listen on ", *bind)
+       var listener net.Listener
+       if *tlsKey != "" {
+               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)
+               if err != nil {
+                       log.Fatalf("Can not listen on %s: %v", *bind, err)
+               }
        }
        log.Println("Listening on", *bind)