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

Merge pull request #482 from djs55/proxy-bind-soft-failure

Browse Source 
proxy: don't fail if the Listen in the VM fails with EADDRNOTAVAIL
This commit is contained in:
Justin Cormack 2016-09-08 14:34:05 +01:00 committed by GitHub
commit 7d4ac3f24d
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
alpine/packages/proxy/one.go
View File

@ -8,6 +8,7 @@ import (
"os" "os"
"proxy/libproxy" "proxy/libproxy"
"strings" "strings"
"syscall"
) )
func onePort() { func onePort() {
@ -17,7 +18,7 @@ func onePort() {
var err error var err error
if localIP { if localIP {
ipP, err = libproxy.NewIPProxy(host, container) ipP, err = listenInVM(host, container)
if err != nil { if err != nil {
sendError(err) sendError(err)
} }
@ -40,6 +41,27 @@ func onePort() {
os.Exit(0) os.Exit(0)
} }
// Best-effort attempt to listen on the address in the VM. This is for
// backwards compatibility with software that expects to be able to listen on
// 0.0.0.0 and then connect from within a container to the external port.
// If the address doesn't exist in the VM (i.e. it exists only on the host)
// then this is not a hard failure.
func listenInVM(host net.Addr, container net.Addr) (libproxy.Proxy, error) {
ipP, err := libproxy.NewIPProxy(host, container)
if err == nil {
return ipP, nil
}
if opError, ok := err.(*net.OpError); ok {
if syscallError, ok := opError.Err.(*os.SyscallError); ok {
if syscallError.Err == syscall.EADDRNOTAVAIL {
log.Printf("Address %s doesn't exist in the VM: only binding on the host", host)
return nil, nil // Non-fatal error
}
}
}
return nil, err
}
func exposePort(host net.Addr, container net.Addr) (*os.File, error) { func exposePort(host net.Addr, container net.Addr) (*os.File, error) {
name := host.Network() + ":" + host.String() + ":" + container.Network() + ":" + container.String() name := host.Network() + ":" + host.String() + ":" + container.Network() + ":" + container.String()
log.Printf("exposePort %s\n", name) log.Printf("exposePort %s\n", name)