mirror of
https://github.com/sorenisanerd/gotty.git
synced 2024-11-22 12:24:25 +00:00
Use net.JoinHostPort
for better IPv6 handling
This commit is contained in:
parent
5d2cdd2768
commit
ca14394ec8
10
app/app.go
10
app/app.go
@ -95,7 +95,7 @@ func (app *App) Run() error {
|
|||||||
path += "/" + generateRandomString(8)
|
path += "/" + generateRandomString(8)
|
||||||
}
|
}
|
||||||
|
|
||||||
endpoint := app.options.Address + ":" + app.options.Port
|
endpoint := net.JoinHostPort(app.options.Address, app.options.Port)
|
||||||
|
|
||||||
wsHandler := http.HandlerFunc(app.handleWS)
|
wsHandler := http.HandlerFunc(app.handleWS)
|
||||||
staticHandler := http.FileServer(
|
staticHandler := http.FileServer(
|
||||||
@ -123,7 +123,7 @@ func (app *App) Run() error {
|
|||||||
log.Printf("URL: %s", "http://"+endpoint+path+"/")
|
log.Printf("URL: %s", "http://"+endpoint+path+"/")
|
||||||
} else {
|
} else {
|
||||||
for _, address := range listAddresses() {
|
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 {
|
if err := http.ListenAndServe(endpoint, siteHandler); err != nil {
|
||||||
@ -221,11 +221,7 @@ func listAddresses() (addresses []string) {
|
|||||||
for _, ifAddr := range ifAddrs {
|
for _, ifAddr := range ifAddrs {
|
||||||
switch v := ifAddr.(type) {
|
switch v := ifAddr.(type) {
|
||||||
case *net.IPNet:
|
case *net.IPNet:
|
||||||
if v.IP.To4() == nil {
|
addresses = append(addresses, v.IP.String())
|
||||||
addresses = append(addresses, "["+v.IP.String()+"]")
|
|
||||||
} else {
|
|
||||||
addresses = append(addresses, v.IP.String())
|
|
||||||
}
|
|
||||||
case *net.IPAddr:
|
case *net.IPAddr:
|
||||||
addresses = append(addresses, v.IP.String())
|
addresses = append(addresses, v.IP.String())
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user