Browse Source

libnetwork/diagnostic: EnableDiagnostic(): use net.JoinHostPort

Use net.JoinHostPort to account for IPv6 addresses.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 2 years ago
parent
commit
a33d1f9a7c
1 changed files with 6 additions and 1 deletions
  1. 6 1
      libnetwork/diagnostic/server.go

+ 6 - 1
libnetwork/diagnostic/server.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"context"
 	"encoding/json"
 	"encoding/json"
 	"fmt"
 	"fmt"
+	"net"
 	"net/http"
 	"net/http"
+	"strconv"
 	"sync"
 	"sync"
 	"sync/atomic"
 	"sync/atomic"
 
 
@@ -91,7 +93,10 @@ func (s *Server) EnableDiagnostic(ip string, port int) {
 	}
 	}
 
 
 	logrus.Infof("Starting the diagnostic server listening on %d for commands", port)
 	logrus.Infof("Starting the diagnostic server listening on %d for commands", port)
-	srv := &http.Server{Addr: fmt.Sprintf("%s:%d", ip, port), Handler: s}
+	srv := &http.Server{
+		Addr:    net.JoinHostPort(ip, strconv.Itoa(port)),
+		Handler: s,
+	}
 	s.srv = srv
 	s.srv = srv
 	s.enable = 1
 	s.enable = 1
 	go func(n *Server) {
 	go func(n *Server) {