github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-29 13:38:00 +00:00
Code Issues Projects Releases Wiki Activity

proxy: tell the /port server the real external IP address

Browse Source 
Before this we accidentally told it the vsock address, which obviously
isn't much good.

Signed-off-by: David Scott <dave.scott@docker.com>
This commit is contained in:
David Scott 2016-04-14 22:13:38 +01:00
parent b0c4fdae37
commit 1d3b8b566e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alpine/packages/proxy/main.go
View File

@ -8,7 +8,6 @@ import (
"os" "os"
"libproxy" "libproxy"
"strings" "strings"
"vsock"
) )
func main() { func main() {
@ -41,7 +40,7 @@ func exposePort(host net.Addr, port int) error {
log.Printf("Failed to open /port/%s/ctl: %#v\n", name, err) log.Printf("Failed to open /port/%s/ctl: %#v\n", name, err)
return err return err
} }
_, err = ctl.WriteString(fmt.Sprintf("%s:%d:%d", name, vsock.VSOCK_CID_SELF, vSockPortOffset + port)) _, err = ctl.WriteString(fmt.Sprintf("%s:%08x", name, port))
if err != nil { if err != nil {
log.Printf("Failed to open /port/%s/ctl: %#v\n", name, err) log.Printf("Failed to open /port/%s/ctl: %#v\n", name, err)
return err return err

6
alpine/packages/proxy/proxy.go
View File

@ -10,7 +10,6 @@ import (
"syscall" "syscall"
"libproxy" "libproxy"
"vsock"
) )
// sendError signals the error to the parent and quits the process. // sendError signals the error to the parent and quits the process.
@ -49,13 +48,12 @@ func parseHostContainerAddrs() (host net.Addr, port int, container net.Addr) {
switch *proto { switch *proto {
case "tcp": case "tcp":
host = &net.TCPAddr{IP: net.ParseIP(*hostIP), Port: *hostPort}
port = vSockPortOffset + *hostPort port = vSockPortOffset + *hostPort
host = &vsock.VsockAddr{Port: uint(port)}
port = *hostPort
container = &net.TCPAddr{IP: net.ParseIP(*containerIP), Port: *containerPort} container = &net.TCPAddr{IP: net.ParseIP(*containerIP), Port: *containerPort}
case "udp": case "udp":
host = &net.UDPAddr{IP: net.ParseIP(*hostIP), Port: *hostPort} host = &net.UDPAddr{IP: net.ParseIP(*hostIP), Port: *hostPort}
port = *hostPort port = vSockPortOffset + *hostPort
container = &net.UDPAddr{IP: net.ParseIP(*containerIP), Port: *containerPort} container = &net.UDPAddr{IP: net.ParseIP(*containerIP), Port: *containerPort}
default: default:
log.Fatalf("unsupported protocol %s", *proto) log.Fatalf("unsupported protocol %s", *proto)