diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-02 04:13:16 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-02 04:13:16 -0800 |
commit | 7497dcba6cd240908a9b0948eb561ad9c264fc8f (patch) | |
tree | 6f70df48b8bcac6dac2ee4087c759771a3d4f132 /vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go | |
parent | 8af66806c8042501ca32e66efdeb463cf5346cab (diff) | |
parent | 2f0fc2911cc98d60ad0695411218bff30720a083 (diff) | |
download | podman-7497dcba6cd240908a9b0948eb561ad9c264fc8f.tar.gz podman-7497dcba6cd240908a9b0948eb561ad9c264fc8f.tar.bz2 podman-7497dcba6cd240908a9b0948eb561ad9c264fc8f.zip |
Merge pull request #9565 from AkihiroSuda/bump-rootlesskit-20210302
Bump RootlessKit v0.14.0-beta.0
Diffstat (limited to 'vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go')
-rw-r--r-- | vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go index f6e5e56ed..e7ce641e1 100644 --- a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go +++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go @@ -15,6 +15,7 @@ import ( "github.com/pkg/errors" + "github.com/rootless-containers/rootlesskit/pkg/api" "github.com/rootless-containers/rootlesskit/pkg/port" "github.com/rootless-containers/rootlesskit/pkg/port/builtin/msg" "github.com/rootless-containers/rootlesskit/pkg/port/builtin/opaque" @@ -56,6 +57,14 @@ type driver struct { nextID int } +func (d *driver) Info(ctx context.Context) (*api.PortDriverInfo, error) { + info := &api.PortDriverInfo{ + Driver: "builtin", + Protos: []string{"tcp", "tcp4", "tcp6", "udp", "udp4", "udp6"}, + } + return info, nil +} + func (d *driver) OpaqueForChild() map[string]string { return map[string]string{ opaque.SocketPath: d.socketPath, @@ -134,9 +143,9 @@ func (d *driver) AddPort(ctx context.Context, spec port.Spec) (*port.Status, err return nil // FIXME } switch spec.Proto { - case "tcp": + case "tcp", "tcp4", "tcp6": err = tcp.Run(d.socketPath, spec, routineStopCh, d.logWriter) - case "udp": + case "udp", "udp4", "udp6": err = udp.Run(d.socketPath, spec, routineStopCh, d.logWriter) default: // NOTREACHED |