From 6a5bcdca4a12c92b1c408235341bf34b85b6e3bb Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Mon, 23 Nov 2015 16:08:22 -0800
Subject: [PATCH] Oops, SSL needs a different listen address..

---
 socketserver/cmd/ffzsocketserver/socketserver.go | 10 +++-------
 socketserver/server/backend.go                   |  1 +
 socketserver/server/types.go                     |  1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/socketserver/cmd/ffzsocketserver/socketserver.go b/socketserver/cmd/ffzsocketserver/socketserver.go
index 5432f3a3..fedcdf80 100644
--- a/socketserver/cmd/ffzsocketserver/socketserver.go
+++ b/socketserver/cmd/ffzsocketserver/socketserver.go
@@ -43,29 +43,25 @@ func main() {
 		log.Fatal(err)
 	}
 
-	httpServer := &http.Server{
-		Addr: conf.ListenAddr,
-	}
-
 	//	logFile, err := os.OpenFile("output.log", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
 	//	if err != nil {
 	//		log.Fatal("Could not create logfile: ", err)
 	//	}
 
-	server.SetupServerAndHandle(conf, nil)
+	server.SetupServerAndHandle(conf, http.DefaultServeMux)
 	server.SetBuildStamp(BuildTime, BuildHash)
 
 	go commandLineConsole()
 
 	if conf.UseSSL {
 		go func() {
-			if err := httpServer.ListenAndServeTLS(conf.SSLCertificateFile, conf.SSLKeyFile); err != nil {
+			if err := http.ListenAndServeTLS(conf.SSLListenAddr, conf.SSLCertificateFile, conf.SSLKeyFile, http.DefaultServeMux); err != nil {
 				log.Fatal("ListenAndServeTLS: ", err)
 			}
 		}()
 	}
 
-	if err = httpServer.ListenAndServe(); err != nil {
+	if err = http.ListenAndServe(conf.ListenAddr, http.DefaultServeMux); err != nil {
 		log.Fatal("ListenAndServe: ", err)
 	}
 }
diff --git a/socketserver/server/backend.go b/socketserver/server/backend.go
index b0927f86..73fa03aa 100644
--- a/socketserver/server/backend.go
+++ b/socketserver/server/backend.go
@@ -269,6 +269,7 @@ func GenerateKeys(outputFile, serverID, theirPublicStr string) {
 	var err error
 	output := ConfigFile{
 		ListenAddr:      "0.0.0.0:8001",
+		SSLListenAddr:      "0.0.0.0:443",
 		SocketOrigin:    "localhost:8001",
 		BackendURL:      "http://localhost:8002/ffz",
 		MinMemoryKBytes: defaultMinMemoryKB,
diff --git a/socketserver/server/types.go b/socketserver/server/types.go
index bc660aed..2fe42b8a 100644
--- a/socketserver/server/types.go
+++ b/socketserver/server/types.go
@@ -15,6 +15,7 @@ type ConfigFile struct {
 	// Numeric server id known to the backend
 	ServerID   int
 	ListenAddr string
+	SSLListenAddr string
 	// Hostname of the socket server
 	SocketOrigin string
 	// URL to the backend server