X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=goircd.go;h=95b463aef0c00fb0ee439cc1cfbc6e46adbae5b3;hp=9fdabc0357d1a7430a422aee6c919284b936ce28;hb=171c6d6df3afbd6d0895528b2a8a38cb3d25d5f0;hpb=41f96494948d1f9f1e0c3066099e0bd9ad0ee8dd

diff --git a/goircd.go b/goircd.go
index 9fdabc0..95b463a 100644
--- 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 (
@@ -29,47 +30,59 @@ import (
 )
 
 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")
+	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(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 {
 		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)
+	stateSink := make(chan StateEvent)
+	daemon := NewDaemon(version, hostname, motd, passwords, 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 {
@@ -95,40 +108,33 @@ func Run() {
 				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)
 	}
+
+	daemon.Processor(events)
 }
 
 func main() {