From d46052773d7bd00491c6db6d5d8978e96da3040d Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 18 May 2016 21:37:17 +0100 Subject: [PATCH] proxy: update the 9P protocol We now tell the 9P server proto1:ip1:port1:
which means please listen on proto1:ip1:port1, then connect to the port proxy in Moby and tell it the connection is for
. Note this requires a corresponding change in hostnet/vpnkit. Signed-off-by: David Scott --- alpine/packages/proxy/one.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/alpine/packages/proxy/one.go b/alpine/packages/proxy/one.go index 64d0f7f2d..ab90a0a63 100644 --- a/alpine/packages/proxy/one.go +++ b/alpine/packages/proxy/one.go @@ -23,7 +23,7 @@ func onePort() { sendError(err) } - ctl, err := exposePort(host, port) + ctl, err := exposePort(host, container) if err != nil { sendError(err) } @@ -37,8 +37,8 @@ func onePort() { os.Exit(0) } -func exposePort(host net.Addr, port int) (*os.File, error) { - name := host.Network() + ":" + host.String() +func exposePort(host net.Addr, container net.Addr) (*os.File, error) { + name := host.Network() + ":" + host.String() + ":" + container.Network() + ":" + container.String() log.Printf("exposePort %s\n", name) err := os.Mkdir("/port/"+name, 0) if err != nil { @@ -50,7 +50,7 @@ func exposePort(host net.Addr, port int) (*os.File, error) { log.Printf("Failed to open /port/%s/ctl: %#v\n", name, err) return nil, err } - _, err = ctl.WriteString(fmt.Sprintf("%s:%08x", name, port)) + _, err = ctl.WriteString(fmt.Sprintf("%s", name)) if err != nil { log.Printf("Failed to open /port/%s/ctl: %#v\n", name, err) return nil, err