Merge "veyron/services/mgmt/build: respecting the GOROOT environment variable setting in order to make the build server test pass with Go 1.4"
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index 692e1f4..3462d38 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -234,7 +234,8 @@
// Need to find a usable IP address since the call to listen
// didn't specify one.
if addrs, err := netstate.GetAccessibleIPs(); err == nil {
- if a, err := chooser(protocol, addrs); err == nil && len(a) > 0 {
+ a, err := chooser(protocol, addrs)
+ if err == nil && len(a) > 0 {
return a, true, nil
}
}
@@ -264,7 +265,7 @@
if err != nil {
return nil, false, err
}
- addrs, unspecified, err := getPossibleAddrs(lep.Network(), host, port, chooser)
+ addrs, unspecified, err := getPossibleAddrs(iep.Protocol, host, port, chooser)
if err != nil {
return nil, false, err
}
