drew/smtprelay
1
0
Fork 1
mirror of https://github.com/decke/smtprelay.git synced 2025-12-26 04:42:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactor common code in listener setup

Browse Source
This commit is contained in:
Jonathon Reinhart
2021-02-14 23:30:31 -05:00
parent fd3f513b18
commit 4fd6bb1004
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main.go
View File

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