From 4fd6bb1004eaa4b043fc138b42f29ea5d93a8408 Mon Sep 17 00:00:00 2001
From: Jonathon Reinhart <Jonathon.Reinhart@gmail.com>
Date: Sun, 14 Feb 2021 23:30:31 -0500
Subject: [PATCH] Refactor common code in listener setup

---
 main.go | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/main.go b/main.go
index afa258d..20ffd56 100644
--- a/main.go
+++ b/main.go
@@ -272,16 +272,13 @@ func main() {
 			server.Authenticator = authChecker
 		}
 
+		var lsnr net.Listener
+		var err error
+
 		if strings.Index(listeners[i], "://") == -1 {
 			log.Printf("Listen on %s ...\n", listener)
 
-			lsnr, err := net.Listen("tcp", listener)
-			if err != nil {
-				log.Fatal(err)
-			}
-			defer lsnr.Close()
-
-			go server.Serve(lsnr)
+			lsnr, err = net.Listen("tcp", listener)
 		} else if strings.HasPrefix(listeners[i], "starttls://") {
 			listener = strings.TrimPrefix(listener, "starttls://")
 
@@ -289,30 +286,24 @@ func main() {
 			server.ForceTLS = *localForceTLS
 
 			log.Printf("Listen on %s (STARTTLS) ...\n", listener)
-			lsnr, err := net.Listen("tcp", listener)
-			if err != nil {
-				log.Fatal(err)
-			}
-			defer lsnr.Close()
-
-			go server.Serve(lsnr)
+			lsnr, err = net.Listen("tcp", listener)
 		} else if strings.HasPrefix(listeners[i], "tls://") {
-
 			listener = strings.TrimPrefix(listener, "tls://")
 
 			server.TLSConfig = getTLSConfig()
 
 			log.Printf("Listen on %s (TLS) ...\n", listener)
-			lsnr, err := tls.Listen("tcp", listener, server.TLSConfig)
-			if err != nil {
-				log.Fatal(err)
-			}
-			defer lsnr.Close()
-
-			go server.Serve(lsnr)
+			lsnr, err = tls.Listen("tcp", listener, server.TLSConfig)
 		} else {
 			log.Fatal("Unknown protocol in listener ", listener)
 		}
+
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer lsnr.Close()
+
+		go server.Serve(lsnr)
 	}
 
 	for true {