From ca14394ec884949a9d4f2137809e0ed73e99b9a6 Mon Sep 17 00:00:00 2001
From: Iwasaki Yudai <yudai@arielworks.com>
Date: Mon, 24 Aug 2015 05:22:47 +0900
Subject: [PATCH] Use `net.JoinHostPort` for better IPv6 handling

---
 app/app.go | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/app.go b/app/app.go
index b862a42..26610eb 100644
--- a/app/app.go
+++ b/app/app.go
@@ -95,7 +95,7 @@ func (app *App) Run() error {
 		path += "/" + generateRandomString(8)
 	}
 
-	endpoint := app.options.Address + ":" + app.options.Port
+	endpoint := net.JoinHostPort(app.options.Address, app.options.Port)
 
 	wsHandler := http.HandlerFunc(app.handleWS)
 	staticHandler := http.FileServer(
@@ -123,7 +123,7 @@ func (app *App) Run() error {
 		log.Printf("URL: %s", "http://"+endpoint+path+"/")
 	} else {
 		for _, address := range listAddresses() {
-			log.Printf("URL: %s", "http://"+address+":"+app.options.Port+path+"/")
+			log.Printf("URL: %s", "http://"+net.JoinHostPort(address, app.options.Port)+path+"/")
 		}
 	}
 	if err := http.ListenAndServe(endpoint, siteHandler); err != nil {
@@ -221,11 +221,7 @@ func listAddresses() (addresses []string) {
 		for _, ifAddr := range ifAddrs {
 			switch v := ifAddr.(type) {
 			case *net.IPNet:
-				if v.IP.To4() == nil {
-					addresses = append(addresses, "["+v.IP.String()+"]")
-				} else {
-					addresses = append(addresses, v.IP.String())
-				}
+				addresses = append(addresses, v.IP.String())
 			case *net.IPAddr:
 				addresses = append(addresses, v.IP.String())
 			}