github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9412 from profnandaa/fix/dialer_function_windows

Browse Source 
pkg/dialer: minor fix on dialer function for windows
This commit is contained in:
Samuel Karp 2023-11-23 00:38:51 +00:00 committed by GitHub
commit 787943dc10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/dialer/dialer_windows.go
View File

@ -17,8 +17,11 @@
package dialer package dialer
import ( import (
"fmt"
"net" "net"
"os" "os"
"path/filepath"
"strings"
"time" "time"
winio "github.com/Microsoft/go-winio" winio "github.com/Microsoft/go-winio"
@ -29,10 +32,16 @@ func isNoent(err error) bool {
} }
func dialer(address string, timeout time.Duration) (net.Conn, error) { func dialer(address string, timeout time.Duration) (net.Conn, error) {
address = strings.TrimPrefix(filepath.ToSlash(address), "npipe://")
return winio.DialPipe(address, &timeout) return winio.DialPipe(address, &timeout)
} }
// DialAddress returns the dial address // DialAddress returns the dial address with npipe:// prepended to the
// provided address
func DialAddress(address string) string { func DialAddress(address string) string {
address = filepath.ToSlash(address)
if !strings.HasPrefix(address, "npipe://") {
address = fmt.Sprintf("npipe://%s", address)
}
return address return address
} }