Skip to content

Commit 218b398

Browse files
committed
libpod/networking_slirp4netns.go: Remove Slirp4netns
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
1 parent 5dfc619 commit 218b398

File tree

1 file changed

+0
-43
lines changed

1 file changed

+0
-43
lines changed

libpod/networking_slirp4netns.go

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package libpod
55
import (
66
"fmt"
77
"io"
8-
"net"
98
"os"
109
"path/filepath"
1110

@@ -15,44 +14,6 @@ import (
1514
"go.podman.io/common/libnetwork/types"
1615
)
1716

18-
// setupSlirp4netns can be called in rootful as well as in rootless
19-
func (r *Runtime) setupSlirp4netns(ctr *Container, netns string) error {
20-
ports := ctr.convertPortMappings()
21-
22-
if !ctr.config.PostConfigureNetNS {
23-
var err error
24-
ctr.rootlessSlirpSyncR, ctr.rootlessSlirpSyncW, err = os.Pipe()
25-
if err != nil {
26-
return fmt.Errorf("failed to create rootless network sync pipe: %w", err)
27-
}
28-
if len(ports) > 0 {
29-
ctr.rootlessPortSyncR, ctr.rootlessPortSyncW, err = os.Pipe()
30-
if err != nil {
31-
return fmt.Errorf("failed to create rootless port sync pipe: %w", err)
32-
}
33-
}
34-
}
35-
defer errorhandling.CloseQuiet(ctr.rootlessSlirpSyncR)
36-
if ctr.rootlessPortSyncR != nil {
37-
defer errorhandling.CloseQuiet(ctr.rootlessPortSyncR)
38-
}
39-
40-
res, err := slirp4netns.Setup(&slirp4netns.SetupOptions{
41-
Config: r.config,
42-
ContainerID: ctr.ID(),
43-
Netns: netns,
44-
Ports: ports,
45-
ExtraOptions: ctr.config.NetworkOptions[slirp4netns.BinaryName],
46-
Slirp4netnsExitPipeR: ctr.rootlessSlirpSyncR,
47-
RootlessPortExitPipeR: ctr.rootlessPortSyncR,
48-
})
49-
if err != nil {
50-
return err
51-
}
52-
ctr.slirp4netnsSubnet = res.Subnet
53-
return nil
54-
}
55-
5617
func (r *Runtime) setupRootlessPortMappingViaRLK(ctr *Container, netnsPath string, netStatus map[string]types.StatusBlock) error {
5718
var err error
5819
if !ctr.config.PostConfigureNetNS {
@@ -100,7 +61,3 @@ func (c *Container) reloadRootlessRLKPortMapping() error {
10061
}
10162
return nil
10263
}
103-
104-
func getSlirp4netnsIP(subnet *net.IPNet) (*net.IP, error) {
105-
return slirp4netns.GetIP(subnet)
106-
}

0 commit comments

Comments
 (0)