veyron/go/src/...: replace "127.0.0.1:0" and "localhost:0" with ":0" in address flag default for binaries, and make sure to override --address to "127.0.0.1:0" in tests (since GCE requires ipv4).
Change-Id: Id12564f3e49fe57807fcf4c224cec8fb5e66c900
diff --git a/tunneld/main.go b/tunneld/main.go
index e49dc8e..157e7a2 100644
--- a/tunneld/main.go
+++ b/tunneld/main.go
@@ -18,8 +18,9 @@
)
var (
- // TODO(rthellend): Remove the address and protocol flags when the config manager is working.
- protocol = flag.String("protocol", "tcp", "network to listen on. For example, set to 'veyron' and set --address to the endpoint/name of a proxy to have this tunnel service proxied.")
+ // TODO(rthellend): Remove the protocol and address flags when the config
+ // manager is working.
+ protocol = flag.String("protocol", "tcp", "protocol to listen on. For example, set to 'veyron' and set --address to the endpoint/name of a proxy to have this tunnel service proxied.")
address = flag.String("address", ":0", "address to listen on")
)
diff --git a/tunneld/test.sh b/tunneld/test.sh
index 2aaa4f6..3889c93 100755
--- a/tunneld/test.sh
+++ b/tunneld/test.sh
@@ -30,7 +30,7 @@
# Start mounttabled and find its endpoint.
local -r MTLOG="${TMPDIR}/mt.log"
- ./mounttabled --address=localhost:0 > "${MTLOG}" 2>&1 &
+ ./mounttabled --address=127.0.0.1:0 > "${MTLOG}" 2>&1 &
for i in 1 2 3 4; do
local EP=$(grep "Mount table service at:" "${MTLOG}" | sed -e 's/^.*endpoint: //')
if [[ -n "${EP}" ]]; then
@@ -49,7 +49,7 @@
# Start tunneld and find its endpoint.
local -r TUNLOG="${TMPDIR}/tunnel.log"
- ./tunneld --address=localhost:0 > "${TUNLOG}" 2>&1 &
+ ./tunneld --address=127.0.0.1:0 > "${TUNLOG}" 2>&1 &
for i in 1 2 3 4; do
local EP=$(grep "Listening on endpoint" "${TUNLOG}" | sed -e 's/^.*endpoint //' | awk '{print $1}')
if [[ -n "${EP}" ]]; then
