Merge pull request #2922 from tamird/avoid-type-assertion

Consistently connect to Unix sockets

Author: AkihiroSuda

pkg/networks/usernet/client.go

@@ -139,8 +139,9 @@ func NewClient(endpointSock string, subnet net.IP) *Client {
 func create(sock string, subnet net.IP, base string) *Client {
 	client := &http.Client{
 		Transport: &http.Transport{
-			DialContext: func(context.Context, string, string) (net.Conn, error) {
-				return net.Dial("unix", sock)
+			DialContext: func(ctx context.Context, _, _ string) (net.Conn, error) {
+				var d net.Dialer
+				return d.DialContext(ctx, "unix", sock)
 			},
 		},
 	}

pkg/qemu/qemu_driver.go

@@ -417,9 +417,9 @@ func (a *qArgTemplateApplier) applyTemplate(qArg string) (string, error) {
 				if !ok {
 					return "", fmt.Errorf("non-string argument %+v", v)
 				}
-				addr := &net.UnixAddr{
-					Net:  "unix",
-					Name: s,
+				addr, err := net.ResolveUnixAddr("unix", s)
+				if err != nil {
+					return "", err
 				}
 				conn, err := net.DialUnix("unix", nil, addr)
 				if err != nil {

pkg/vz/network_darwin.go

@@ -18,7 +18,11 @@ import (
 )
 
 func PassFDToUnix(unixSock string) (*os.File, error) {
-	unixConn, err := net.Dial("unix", unixSock)
+	unixAddr, err := net.ResolveUnixAddr("unix", unixSock)
+	if err != nil {
+		return nil, err
+	}
+	unixConn, err := net.DialUnix("unix", nil, unixAddr)
 	if err != nil {
 		return nil, err
 	}
@@ -27,7 +31,7 @@ func PassFDToUnix(unixSock string) (*os.File, error) {
 	if err != nil {
 		return nil, err
 	}
-	err = fd.Put(unixConn.(*net.UnixConn), server)
+	err = fd.Put(unixConn, server)
 	if err != nil {
 		return nil, err
 	}