X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=goircd.go;h=366032c7735d1709f52a267d65c6b40823b59bd1;hb=afbf2b40d4f5accd041a3052ab58718958c8da1c;hp=3d69545e1b633962ab3b95727d2dbd27dfb09b10;hpb=1f4a463c0a9fb411827916c0df60df4538702307;p=goircd.git

diff --git a/goircd.go b/goircd.go
index 3d69545..366032c 100644
--- a/goircd.go
+++ b/goircd.go
@@ -18,12 +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"
@@ -36,9 +35,10 @@ var (
 	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.")
+	tlsKey  = flag.String("tls_key", "", "TLS keyfile")
+	tlsCert = flag.String("tls_cert", "", "TLS certificate")
+
+	verbose = flag.Bool("v", false, "Enable verbose logging.")
 )
 
 func Run() {
@@ -50,8 +50,7 @@ func Run() {
 	if *logdir == "" {
 		// Dummy logger
 		go func() {
-			for {
-				<-log_sink
+			for _ = range log_sink {
 			}
 		}()
 	} else {
@@ -65,48 +64,45 @@ 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")
 	}
 
 	var listener net.Listener
-	if *ssl {
-		cert, err := tls.LoadX509KeyPair(*sslCert, *sslKey)
+	if *tlsKey != "" {
+		cert, err := tls.LoadX509KeyPair(*tlsCert, *tlsKey)
 		if err != nil {
-			log.Fatalf("Could not load SSL keys from %s and %s: %s", *sslCert, *sslKey, err)
+			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)