summaryrefslogtreecommitdiff
path: root/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2021-01-21 15:03:16 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2021-01-22 08:08:25 +0100
commit37319dec1771aaa9764c81359f439e862f45d8e1 (patch)
tree5b82653228c39df5a7ebcf9332db9e248ed1ef5a /vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go
parent6fd83de31dab0c60932972c6b26f68fa0bd1871f (diff)
downloadpodman-37319dec1771aaa9764c81359f439e862f45d8e1.tar.gz
podman-37319dec1771aaa9764c81359f439e862f45d8e1.tar.bz2
podman-37319dec1771aaa9764c81359f439e862f45d8e1.zip
vendor: update rootlesskit to v0.12.0
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go')
-rw-r--r--vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go16
1 files changed, 15 insertions, 1 deletions
diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go
index 112a926c3..fc249c2d9 100644
--- a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go
+++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go
@@ -106,7 +106,21 @@ func (d *childDriver) handleConnectRequest(c *net.UnixConn, req *msg.Request) er
return errors.Errorf("unknown proto: %q", req.Proto)
}
var dialer net.Dialer
- targetConn, err := dialer.Dial(req.Proto, fmt.Sprintf("127.0.0.1:%d", req.Port))
+ ip := req.IP
+ if ip == "" {
+ ip = "127.0.0.1"
+ } else {
+ p := net.ParseIP(ip)
+ if p == nil {
+ return errors.Errorf("invalid IP: %q", ip)
+ }
+ p = p.To4()
+ if p == nil {
+ return errors.Errorf("unsupported IP (v6?): %s", ip)
+ }
+ ip = p.String()
+ }
+ targetConn, err := dialer.Dial(req.Proto, fmt.Sprintf("%s:%d", ip, req.Port))
if err != nil {
return err
}