X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=goircd.go;h=a0633ad9065aa1a3f310734d07ae7693f458488b;hb=b35f6e7b3c510bea24c0927073720a459055816e;hp=e1768048f5858ac01be79a9955b9b0f4544048af;hpb=c1d256aaa0af4e0cb3649552e5067a9ec3bc94d5;p=goircd.git

diff --git a/goircd.go b/goircd.go
index e176804..a0633ad 100644
--- a/goircd.go
+++ b/goircd.go
@@ -18,41 +18,56 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"bytes"
 	"crypto/tls"
 	"flag"
+	"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")
 
-	ssl     = flag.Bool("ssl", false, "Use SSL only.")
-	sslKey  = flag.String("ssl_key", "", "SSL keyfile.")
-	sslCert = flag.String("ssl_cert", "", "SSL 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)
 
-	log_sink := make(chan LogEvent)
+	logSink := make(chan LogEvent)
 	if *logdir == "" {
 		// Dummy logger
 		go func() {
-			for _ = range log_sink {
+			for _ = range logSink {
 			}
 		}()
 	} else {
@@ -60,79 +75,83 @@ func Run() {
 			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)
+	stateSink := make(chan StateEvent)
+	daemon := NewDaemon(version, *hostname, *motd, logSink, stateSink)
 	daemon.Verbose = *verbose
+	log.Println("goircd "+daemon.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)
-			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)
+		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 *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)
 		}
-	} 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(*tlsCert, *tlsKey)
 		if err != nil {
-			log.Fatalf("Can not listen on %s: %v", *bind, err)
+			log.Fatalf("Could not load TLS keys from %s and %s: %s", *tlsCert, *tlsKey, 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)
 	}
+
+	daemon.Processor(events)
 }
 
 func main() {