libpod/container_internal_linux.go: Remove slirp

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

libpod/container_internal_linux.go

@@ -22,7 +22,6 @@ import (
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/sirupsen/logrus"
-	"go.podman.io/common/libnetwork/slirp4netns"
 	"go.podman.io/common/libnetwork/types"
 	"go.podman.io/common/pkg/cgroups"
 	"go.podman.io/common/pkg/config"
@@ -559,7 +558,7 @@ func (c *Container) setCgroupsPath(g *generate.Generator) error {
 	return nil
 }
 
-// addSpecialDNS adds special dns servers for slirp4netns and pasta
+// addSpecialDNS adds special dns servers for pasta
 func (c *Container) addSpecialDNS(nameservers []string) []string {
 	switch {
 	case c.config.NetMode.IsBridge():
@@ -569,42 +568,10 @@ func (c *Container) addSpecialDNS(nameservers []string) []string {
 		}
 	case c.pastaResult != nil:
 		nameservers = append(nameservers, c.pastaResult.DNSForwardIPs...)
-	case c.config.NetMode.IsSlirp4netns():
-		// slirp4netns has a built in DNS forwarder.
-		slirp4netnsDNS, err := slirp4netns.GetDNS(c.slirp4netnsSubnet)
-		if err != nil {
-			logrus.Warn("Failed to determine Slirp4netns DNS: ", err.Error())
-		} else {
-			nameservers = append(nameservers, slirp4netnsDNS.String())
-		}
 	}
 	return nameservers
 }
 
-func (c *Container) isSlirp4netnsIPv6() bool {
-	if c.config.NetMode.IsSlirp4netns() {
-		extraOptions := c.config.NetworkOptions[slirp4netns.BinaryName]
-		options := make([]string, 0, len(c.runtime.config.Engine.NetworkCmdOptions.Get())+len(extraOptions))
-		options = append(options, c.runtime.config.Engine.NetworkCmdOptions.Get()...)
-		options = append(options, extraOptions...)
-
-		// loop backwards as the last argument wins and we can exit early
-		// This should be kept in sync with c/common/libnetwork/slirp4netns.
-		for i := len(options) - 1; i >= 0; i-- {
-			switch options[i] {
-			case "enable_ipv6=true":
-				return true
-			case "enable_ipv6=false":
-				return false
-			}
-		}
-		// default is true
-		return true
-	}
-
-	return false
-}
-
 // check for net=none
 func (c *Container) hasNetNone() bool {
 	if !c.config.CreateNetNS {