X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=goircd.go;h=b0f5e07716db40625c08378d046670c9154c68d8;hb=85e6538f2f610ad66bf0be0eff5bdcf05f1b8e3c;hp=984b47b94144c134e7bfc57158b52de13dddbf84;hpb=a939b027fdb6ce1d0822e76ec50814678ff0050a;p=goircd.git

diff --git a/goircd.go b/goircd.go
index 984b47b..b0f5e07 100644
--- a/goircd.go
+++ b/goircd.go
@@ -32,6 +32,7 @@ import (
 )
 
 var (
+	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")
@@ -39,14 +40,25 @@ var (
 	statedir  = flag.String("statedir", "", "Absolute path to directory for states")
 	passwords = flag.String("passwords", "", "Optional path to passwords file")
 
-	tlsKey  = flag.String("tls_key", "", "TLS keyfile")
-	tlsCert = flag.String("tls_cert", "", "TLS 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)
 
@@ -67,8 +79,9 @@ func Run() {
 	}
 
 	stateSink := make(chan StateEvent)
-	daemon := NewDaemon(*hostname, *motd, logSink, stateSink)
+	daemon := NewDaemon(version, *hostname, *motd, logSink, stateSink)
 	daemon.Verbose = *verbose
+	log.Println("goircd "+daemon.version+" is starting")
 	if *statedir == "" {
 		// Dummy statekeeper
 		go func() {
@@ -102,26 +115,6 @@ func Run() {
 		log.Println(*statedir, "statekeeper initialized")
 	}
 
-	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)
-
 	if *passwords != "" {
 		daemon.PasswordsRefresh()
 		hups := make(chan os.Signal)
@@ -134,16 +127,30 @@ func Run() {
 		}()
 	}
 
-	go daemon.Processor(events)
-	for {
-		conn, err := listener.Accept()
+
+	if *bind != "" {
+		listener, err := net.Listen("tcp", *bind)
 		if err != nil {
-			log.Println("Error during accepting connection", err)
-			continue
+			log.Fatalf("Can not listen on %s: %v", *bind, err)
 		}
-		client = NewClient(*hostname, conn)
-		go client.Processor(events)
+		log.Println("Raw listening on", *bind)
+		go listenerLoop(listener, events)
+	}
+	if *tlsBind != "" {
+		cert, err := tls.LoadX509KeyPair(*tlsPEM, *tlsPEM)
+		if err != nil {
+			log.Fatalf("Could not load TLS keys from %s: %s", *tlsPEM, err)
+		}
+		config := tls.Config{Certificates: []tls.Certificate{cert}}
+		listenerTLS, err := tls.Listen("tcp", *tlsBind, &config)
+		if err != nil {
+			log.Fatalf("Can not listen on %s: %v", *tlsBind, err)
+		}
+		log.Println("TLS listening on", *tlsBind)
+		go listenerLoop(listenerTLS, events)
 	}
+
+	daemon.Processor(events)
 }
 
 func main() {