d-b.ca/smtprelay
2
0
Fork 0
forked from drew/smtprelay
Code Pull Requests Activity

Simplify range code for setting up listeners

Browse Source
This commit is contained in:
Jonathon Reinhart
2021-02-15 00:00:38 -05:00
parent ecf830865c
commit 7fa0eebf95
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
main.go
View File

@@ -257,11 +257,9 @@ func main() {
log.SetOutput(io.MultiWriter(os.Stdout, f)) log.SetOutput(io.MultiWriter(os.Stdout, f))
} }
listeners := strings.Split(*listen, " ")
for i := range listeners {
listener := listeners[i]
// Create a server for each desired listen address
for _, listenAddr := range strings.Split(*listen, " ") {
server := &smtpd.Server{ server := &smtpd.Server{
Hostname: *hostName, Hostname: *hostName,
WelcomeMessage: *welcomeMsg, WelcomeMessage: *welcomeMsg,
@@ -283,27 +281,27 @@ func main() {
var lsnr net.Listener var lsnr net.Listener
var err error var err error
if strings.Index(listeners[i], "://") == -1 { if strings.Index(listenAddr, "://") == -1 {
log.Printf("Listen on %s ...\n", listener) log.Printf("Listen on %s ...\n", listenAddr)
lsnr, err = net.Listen("tcp", listener) lsnr, err = net.Listen("tcp", listenAddr)
} else if strings.HasPrefix(listeners[i], "starttls://") { } else if strings.HasPrefix(listenAddr, "starttls://") {
listener = strings.TrimPrefix(listener, "starttls://") listenAddr = strings.TrimPrefix(listenAddr, "starttls://")
server.TLSConfig = getTLSConfig() server.TLSConfig = getTLSConfig()
server.ForceTLS = *localForceTLS server.ForceTLS = *localForceTLS
log.Printf("Listen on %s (STARTTLS) ...\n", listener) log.Printf("Listen on %s (STARTTLS) ...\n", listenAddr)
lsnr, err = net.Listen("tcp", listener) lsnr, err = net.Listen("tcp", listenAddr)
} else if strings.HasPrefix(listeners[i], "tls://") { } else if strings.HasPrefix(listenAddr, "tls://") {
listener = strings.TrimPrefix(listener, "tls://") listenAddr = strings.TrimPrefix(listenAddr, "tls://")
server.TLSConfig = getTLSConfig() server.TLSConfig = getTLSConfig()
log.Printf("Listen on %s (TLS) ...\n", listener) log.Printf("Listen on %s (TLS) ...\n", listenAddr)
lsnr, err = tls.Listen("tcp", listener, server.TLSConfig) lsnr, err = tls.Listen("tcp", listenAddr, server.TLSConfig)
} else { } else {
log.Fatal("Unknown protocol in listener ", listener) log.Fatal("Unknown protocol in listen address ", listenAddr)
} }
if err != nil { if err != nil {