diff --git a/vendor/github.com/hashicorp/go-sockaddr/ifaddrs_windows.go b/vendor/github.com/hashicorp/go-sockaddr/ifaddrs_windows.go index 5eb6163bb9..8d88b9034e 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/ifaddrs_windows.go +++ b/vendor/github.com/hashicorp/go-sockaddr/ifaddrs_windows.go @@ -1,9 +1,6 @@ package sockaddr -import ( - "errors" - "os/exec" -) +import "os/exec" // defaultWindowsIfNameCmd is the comamnd to run on Windows to get the default // interface. @@ -20,23 +17,22 @@ func defaultWindowsIPConfigCmd() []string { // getDefaultIfName is a Windows-specific function for extracting the name of // the interface from `netstat -rn` and `ipconfig`. func getDefaultIfName() (string, error) { - ipAddr, err := getWindowsIPOnDefaultRoute() + var cmd []string = defaultWindowsIfNameCmd() + ifNameOut, err := exec.Command(cmd[0], cmd[1:]...).Output() if err != nil { return "", err } - return ipAddr, nil -} -func getWindowsIPOnDefaultRoute() (string, error) { - var cmd []string = defaultWindowsIfNameCmd() - out, err := exec.Command(cmd[0], cmd[1:]...).Output() + cmd = defaultWindowsIPConfigCmd() + ipconfigOut, err := exec.Command(cmd[0], cmd[1:]...).Output() if err != nil { return "", err } - var defaultIPAddr string - if defaultIPAddr, err = parseDefaultIPAddrWindowsRoute(string(out)); err != nil { - return "", errors.New("No IP on default route found") + ifName, err := parseDefaultIfNameWindows(string(ifNameOut), string(ipconfigOut)) + if err != nil { + return "", err } - return defaultIPAddr, nil + + return ifName, nil } diff --git a/vendor/vendor.json b/vendor/vendor.json index b5de3543df..7d3664bb66 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -420,10 +420,10 @@ "revisionTime": "2016-09-30T03:51:02Z" }, { - "checksumSHA1": "wGgPqc+2Lwn6qbDjM15SLKktd+Y=", + "checksumSHA1": "LmCRW89WaBzau5RaVIhx8QHwLYo=", "path": "github.com/hashicorp/go-sockaddr", - "revision": "3fe949359e7faa30c9dc5b4f921c7beddba1a27c", - "revisionTime": "2016-12-02T06:02:17Z" + "revision": "33afa667d8f9a6ca9d435a8f8c6e87af423c9356", + "revisionTime": "2016-12-02T07:02:37Z" }, { "checksumSHA1": "Y+c+ahUug8/vK+cWRLatV5aB4ps=",