From 83ab19a02dfe0b2bf112a6ff90d677c7363377ed Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 21 Jan 2021 20:31:07 +0100 Subject: [PATCH] libpod: move slirp magic IPs to consts Signed-off-by: Giuseppe Scrivano --- libpod/container_internal_linux.go | 4 ++-- libpod/networking_linux.go | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index b81f3f7160..5f18ce1670 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1527,7 +1527,7 @@ func (c *Container) generateResolvConf() (string, error) { nameservers = resolvconf.GetNameservers(resolv.Content) // slirp4netns has a built in DNS server. if c.config.NetMode.IsSlirp4netns() { - nameservers = append([]string{"10.0.2.3"}, nameservers...) + nameservers = append([]string{slirp4netnsDNS}, nameservers...) } } @@ -1607,7 +1607,7 @@ func (c *Container) getHosts() string { if c.Hostname() != "" { if c.config.NetMode.IsSlirp4netns() { // When using slirp4netns, the interface gets a static IP - hosts += fmt.Sprintf("# used by slirp4netns\n%s\t%s %s\n", "10.0.2.100", c.Hostname(), c.config.Name) + hosts += fmt.Sprintf("# used by slirp4netns\n%s\t%s %s\n", slirp4netnsIP, c.Hostname(), c.config.Name) } else { hasNetNS := false netNone := false diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 33441ed5e0..fd91e5d529 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -34,6 +34,15 @@ import ( "golang.org/x/sys/unix" ) +const ( + // slirp4netnsIP is the IP used by slirp4netns to configure the tap device + // inside the network namespace. + slirp4netnsIP = "10.0.2.100" + + // slirp4netnsDNS is the IP for the built-in DNS server in the slirp network + slirp4netnsDNS = "10.0.2.3" +) + // Get an OCICNI network config func (r *Runtime) getPodNetwork(id, name, nsPath string, networks []string, ports []ocicni.PortMapping, staticIP net.IP, staticMAC net.HardwareAddr, netDescriptions ContainerNetworkDescriptions) ocicni.PodNetwork { var networkKey string @@ -544,7 +553,7 @@ func (r *Runtime) setupRootlessPortMappingViaRLK(ctr *Container, netnsPath strin ExitFD: 3, ReadyFD: 4, TmpDir: ctr.runtime.config.Engine.TmpDir, - ChildIP: "10.0.2.100", + ChildIP: slirp4netnsIP, } cfgJSON, err := json.Marshal(cfg) if err != nil {