Simplify listenAddr

Serhii Ponomarov · Serhii Ponomarov · commit cfdf7fbd76f5 · 2023-12-15T14:05:25.000+02:00
diff --git a/cmd/sshfront/sshfront.go b/cmd/sshfront/sshfront.go
@@ -52,9 +52,9 @@ func main() {
 	}
 	SetupHostKey(config)
 
-	var listenAddr string
-	if listenAddr = os.Getenv("SSHFRONT_LISTEN"); listenAddr == "" {
-		listenAddr = fmt.Sprintf("%s:%s", *ListenHost, *ListenPort)
+	listenAddr := os.Getenv("SSHFRONT_LISTEN")
+	if listenAddr == "" {
+		listenAddr = net.JoinHostPort(*ListenHost, *ListenPort)
 	}
 
 	log.Printf("sshfront v%s listening on %s ...\n", Version, listenAddr)

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ func main() {`
`52`	`52`	`}`
`53`	`53`	`SetupHostKey(config)`
`54`	`54`
`55`		`- var listenAddr string`
`56`		`- if listenAddr = os.Getenv("SSHFRONT_LISTEN"); listenAddr == "" {`
`57`		`- listenAddr = fmt.Sprintf("%s:%s", ListenHost, ListenPort)`
	`55`	`+ listenAddr := os.Getenv("SSHFRONT_LISTEN")`
	`56`	`+ if listenAddr == "" {`
	`57`	`+ listenAddr = net.JoinHostPort(ListenHost, ListenPort)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`log.Printf("sshfront v%s listening on %s ...\n", Version, listenAddr)`