opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 20:54:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod: move slirp magic IPs to consts

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2021-01-21 20:31:07 +01:00
committed by Matthew Heon
parent 5172cfe6a5
commit f11aabd3e0
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_internal_linux.go
View File

@ -1735,7 +1735,7 @@ func (c *Container) generateResolvConf() (string, error) {
nameservers = resolvconf.GetNameservers(resolv.Content) nameservers = resolvconf.GetNameservers(resolv.Content)
// slirp4netns has a built in DNS server. // slirp4netns has a built in DNS server.
if c.config.NetMode.IsSlirp4netns() { if c.config.NetMode.IsSlirp4netns() {
nameservers = append([]string{"10.0.2.3"}, nameservers...) nameservers = append([]string{slirp4netnsDNS}, nameservers...)
} }
} }
@ -1815,7 +1815,7 @@ func (c *Container) getHosts() string {
if c.Hostname() != "" { if c.Hostname() != "" {
if c.config.NetMode.IsSlirp4netns() { if c.config.NetMode.IsSlirp4netns() {
// When using slirp4netns, the interface gets a static IP // 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 { } else {
hasNetNS := false hasNetNS := false
netNone := false netNone := false

11
libpod/networking_linux.go
View File

@ -35,6 +35,15 @@ import (
"golang.org/x/sys/unix" "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 // 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 { 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 var networkKey string
@ -547,7 +556,7 @@ func (r *Runtime) setupRootlessPortMappingViaRLK(ctr *Container, netnsPath strin
ExitFD: 3, ExitFD: 3,
ReadyFD: 4, ReadyFD: 4,
TmpDir: ctr.runtime.config.Engine.TmpDir, TmpDir: ctr.runtime.config.Engine.TmpDir,
ChildIP: "10.0.2.100", ChildIP: slirp4netnsIP,
} }
cfgJSON, err := json.Marshal(cfg) cfgJSON, err := json.Marshal(cfg)
if err != nil { if err != nil {