Skip to content

Support IPv6 in address assignment and gateway #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support IPv6 in address assignment and gateway #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions pkg/child/child.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,18 @@ func activateLoopback() error {
return nil
}

func activateDev(dev, ip string, netmask int, gateway string, mtu int) error {
func activateDev(dev string, ips []messages.NetworkDriverIP, gateway []string, mtu int) error {
cmds := [][]string{
{"ip", "link", "set", dev, "up"},
{"ip", "link", "set", "dev", dev, "mtu", strconv.Itoa(mtu)},
{"ip", "addr", "add", ip + "/" + strconv.Itoa(netmask), "dev", dev},
{"ip", "route", "add", "default", "via", gateway, "dev", dev},
}

for _, ip := range ips {
cmds = append(cmds, []string{"ip", "addr", "add", ip.IP + "/" + strconv.Itoa(ip.PrefixLen), "dev", dev})
}

for _, gw := range gateway {
cmds = append(cmds, []string{"ip", "route", "add", "default", "via", gw, "dev", dev})
}
if err := common.Execs(os.Stderr, os.Environ(), cmds); err != nil {
return fmt.Errorf("executing %v: %w", cmds, err)
Expand Down Expand Up @@ -216,7 +222,7 @@ func setupNet(stateDir string, msg *messages.ParentInitNetworkDriverCompleted, e
}
Info, _ := driver.ChildDriverInfo()
if !Info.ConfiguresInterface {
if err := activateDev(dev, msg.IP, msg.Netmask, msg.Gateway, msg.MTU); err != nil {
if err := activateDev(dev, msg.IPs, msg.Gateways, msg.MTU); err != nil {
return err
}
}
Expand Down Expand Up @@ -259,7 +265,7 @@ func setupNet(stateDir string, msg *messages.ParentInitNetworkDriverCompleted, e
if err := ns.WithNetNSPath(detachedNetNSPath, func(_ ns.NetNS) error {
Info, _ := driver.ChildDriverInfo()
if !Info.ConfiguresInterface {
return activateDev(dev, msg.IP, msg.Netmask, msg.Gateway, msg.MTU)
return activateDev(dev, msg.IPs, msg.Gateways, msg.MTU)
}
return nil
}); err != nil {
Expand Down
16 changes: 10 additions & 6 deletions pkg/messages/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,18 @@ type ParentInitIdmapCompleted struct {
type ChildInitUserNSCompleted struct {
}

type NetworkDriverIP struct {
IP string
PrefixLen int
}

type ParentInitNetworkDriverCompleted struct {
// Fields are empty for HostNetwork.
Dev string
IP string
Netmask int
Gateway string
DNS []string
MTU int
Dev string
IPs []NetworkDriverIP
Gateways []string
DNS []string
MTU int
// NetworkDriverOpaque strings are specific to driver
NetworkDriverOpaque map[string]string
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/network/lxcusernic/lxcusernic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,10 @@ func (d *childDriver) ConfigureNetworkChild(netmsg *messages.ParentInitNetworkDr
if len(p.DNS()) == 0 {
return "", errors.New("got no DNS")
}
netmsg.IP = p.YourIPAddr.To4().String()

netmask, _ := p.SubnetMask().Size()
netmsg.Netmask = netmask
netmsg.Gateway = p.Router()[0].To4().String()
netmsg.IPs = []messages.NetworkDriverIP{messages.NetworkDriverIP{IP: p.YourIPAddr.To4().String(), PrefixLen: netmask}}
netmsg.Gateways = []string{p.Router()[0].To4().String()}
netmsg.DNS = []string{p.DNS()[0].To4().String()}
go dhcpRenewRoutine(c, dev, p.YourIPAddr.To4(), p.IPAddressLeaseTime(time.Hour), detachedNetNSPath)
return dev, nil
Expand Down
2 changes: 2 additions & 0 deletions pkg/network/parentutils/parentutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ import (
"strconv"

"github.com/rootless-containers/rootlesskit/v2/pkg/common"
"github.com/sirupsen/logrus"
)

func PrepareTap(childPID int, childNetNsPath string, tap string) error {
logrus.Debugf("PrepareTap")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This debug message doesn't seem meaningful?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yes. I'll remove this debug leftover.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping

cmds := [][]string{
nsenter(childPID, childNetNsPath, []string{"ip", "tuntap", "add", "name", tap, "mode", "tap"}),
nsenter(childPID, childNetNsPath, []string{"ip", "link", "set", tap, "up"}),
Expand Down
12 changes: 8 additions & 4 deletions pkg/network/pasta/pasta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,17 +208,21 @@ func (d *parentDriver) ConfigureNetwork(childPID int, stateDir, detachedNetNSPat
Dev: tap,
MTU: d.mtu,
}
netmsg.IP = address.String()
netmsg.Netmask = netmask
netmsg.Gateway = gateway.String()
netmsg.IPs = []messages.NetworkDriverIP{
messages.NetworkDriverIP{
IP: address.String(),
PrefixLen: netmask,
},
}
netmsg.Gateways = []string{gateway.String()}
netmsg.DNS = []string{dns.String()}

d.infoMu.Lock()
d.info = func() *api.NetworkDriverInfo {
return &api.NetworkDriverInfo{
Driver: DriverName,
DNS: []net.IP{net.ParseIP(netmsg.DNS[0])},
ChildIP: net.ParseIP(netmsg.IP),
ChildIP: net.ParseIP(netmsg.IPs[0].IP),
DynamicChildIP: false,
}
}
Expand Down
30 changes: 20 additions & 10 deletions pkg/network/slirp4netns/slirp4netns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ func (d *parentDriver) ConfigureNetwork(childPID int, stateDir, detachedNetNSPat
detachedNetNSPath)
}
opts = append(opts, tap)

logrus.Debugf("start %v with args: %v", d.binary, opts)
cmd := exec.Command(d.binary, opts...)
// FIXME: Stdout doen't seem captured
cmd.Stdout = d.logWriter
Expand All @@ -242,39 +244,47 @@ func (d *parentDriver) ConfigureNetwork(childPID int, stateDir, detachedNetNSPat
return nil, common.Seq(cleanups), fmt.Errorf("waiting for ready fd (%v): %w", cmd, err)
}
netmsg := messages.ParentInitNetworkDriverCompleted{
Dev: tap,
DNS: make([]string, 0, 2),
MTU: d.mtu,
Dev: tap,
IPs: make([]messages.NetworkDriverIP, 0, 2),
DNS: make([]string, 0, 2),
Gateways: make([]string, 0, 2),
MTU: d.mtu,
}
if d.ipnet != nil {
// TODO: get the actual configuration via slirp4netns API?
x, err := iputils.AddIPInt(d.ipnet.IP, 100)
if err != nil {
return nil, common.Seq(cleanups), err
}
netmsg.IP = x.String()
netmsg.Netmask, _ = d.ipnet.Mask.Size()

netmask, _ := d.ipnet.Mask.Size()

netmsg.IPs = append(netmsg.IPs, messages.NetworkDriverIP{IP: x.String(), PrefixLen: netmask})
x, err = iputils.AddIPInt(d.ipnet.IP, 2)
if err != nil {
return nil, common.Seq(cleanups), err
}
netmsg.Gateway = x.String()
netmsg.Gateways = append(netmsg.Gateways, x.String())
x, err = iputils.AddIPInt(d.ipnet.IP, 3)
if err != nil {
return nil, common.Seq(cleanups), err
}
netmsg.DNS = append(netmsg.DNS, x.String())
} else {
netmsg.IP = "10.0.2.100"
netmsg.Netmask = 24
netmsg.Gateway = "10.0.2.2"
netmsg.IPs = append(netmsg.IPs, messages.NetworkDriverIP{IP: "10.0.2.100", PrefixLen: 24})
netmsg.Gateways = append(netmsg.Gateways, "10.0.2.2")
netmsg.DNS = append(netmsg.DNS, "10.0.2.3")
}

if d.enableIPv6 {
// for now slirp4netns only supports fd00::3 as v6 nameserver
// https://github.com/rootless-containers/slirp4netns/blob/ee1542e1532e6a7f266b8b6118973ab3b10a8bb5/slirp4netns.c#L272
netmsg.DNS = append(netmsg.DNS, "fd00::3")

// TODO(aperevalov --cidr option of slirp4netns now supports only ipv4 address
// add ipv6 gateway
netmsg.Gateways = append(netmsg.Gateways, "fd00::2")
netmsg.IPs = append(netmsg.IPs, messages.NetworkDriverIP{IP: "fd00::1", PrefixLen: 64})
}

apiDNS := make([]net.IP, 0, cap(netmsg.DNS))
Expand All @@ -287,7 +297,7 @@ func (d *parentDriver) ConfigureNetwork(childPID int, stateDir, detachedNetNSPat
return &api.NetworkDriverInfo{
Driver: DriverName,
DNS: apiDNS,
ChildIP: net.ParseIP(netmsg.IP),
ChildIP: net.ParseIP(netmsg.IPs[0].IP),
DynamicChildIP: false,
}
}
Expand Down
15 changes: 8 additions & 7 deletions pkg/network/vpnkit/vpnkit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,13 @@ func (d *parentDriver) ConfigureNetwork(childPID int, stateDir, detachedNetNSPat
logrus.Debugf("connected to VPNKit vmnet")
// TODO: support configuration
netmsg := messages.ParentInitNetworkDriverCompleted{
Dev: d.ifname,
IP: vif.IP.String(),
Netmask: 24,
Gateway: "192.168.65.1",
DNS: []string{"192.168.65.1"},
MTU: d.mtu,
Dev: d.ifname,
IPs: []messages.NetworkDriverIP{
messages.NetworkDriverIP{IP: vif.IP.String(), PrefixLen: 24},
},
Gateways: []string{"192.168.65.1"},
DNS: []string{"192.168.65.1"},
MTU: d.mtu,
NetworkDriverOpaque: map[string]string{
opaqueMAC: vif.ClientMAC.String(),
opaqueSocket: vpnkitSocket,
Expand All @@ -140,7 +141,7 @@ func (d *parentDriver) ConfigureNetwork(childPID int, stateDir, detachedNetNSPat
return &api.NetworkDriverInfo{
Driver: DriverName,
DNS: []net.IP{net.ParseIP(netmsg.DNS[0])},
ChildIP: net.ParseIP(netmsg.IP),
ChildIP: net.ParseIP(netmsg.IPs[0].IP),
DynamicChildIP: false,
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/parent/parent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ func Parent(opt Opt) error {
if opt.PortDriver != nil {
msgParentInitPortDriverCompleted.U.ParentInitPortDriverCompleted.PortDriverOpaque = opt.PortDriver.OpaqueForChild()
cctx := &port.ChildContext{
IP: net.ParseIP(msgParentInitNetworkDriverCompleted.U.ParentInitNetworkDriverCompleted.IP).To4(),
IP: net.ParseIP(msgParentInitNetworkDriverCompleted.U.ParentInitNetworkDriverCompleted.IPs[0].IP).To4(),
}
go func() {
portDriverErr <- opt.PortDriver.RunParentDriver(portDriverInitComplete,
Expand Down