scott/mycelium-cni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update route handling

Browse Source
This commit is contained in:
Scott Yeager 2025-06-20 18:23:37 -07:00
parent 88ad00ae93
commit 098a6ff9c1
1 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
main.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"net"
"time"
"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/types"
@ -60,9 +61,15 @@ func cmdAdd(args *skel.CmdArgs) error {
return fmt.Errorf("failed to move veth to container netns: %v", err)
}
// Get host veth link-local address with retry
hostLinkLocal, err := getHostVethLinkLocalWithRetry(hostVeth)
if err != nil {
return fmt.Errorf("failed to get host veth link-local address: %v", err)
}
// Configure container interface
containerIP := generateContainerIP(myceliumIP, args.ContainerID)
if err := configureContainerInterface(containerNS, containerVethName, containerIP, hostVethName); err != nil {
if err := configureContainerInterface(containerNS, containerVethName, containerIP, hostLinkLocal); err != nil {
return fmt.Errorf("failed to configure container interface: %v", err)
}
@ -182,7 +189,7 @@ func createVethPair(hostName, containerName string) (netlink.Link, netlink.Link,
return hostVeth, containerVeth, nil
}
func configureContainerInterface(containerNS netns.NsHandle, ifName string, containerIP net.IP, hostVethName string) error {
func configureContainerInterface(containerNS netns.NsHandle, ifName string, containerIP net.IP, hostLinkLocal net.IP) error {
// Switch to container namespace
originalNS, err := netns.Get()
if err != nil {
@ -216,27 +223,17 @@ func configureContainerInterface(containerNS netns.NsHandle, ifName string, cont
return err
}
// Get host veth link-local address for routing
hostVeth, err := netlink.LinkByName(hostVethName)
if err == nil {
hostAddrs, err := netlink.AddrList(hostVeth, netlink.FAMILY_V6)
if err == nil {
for _, addr := range hostAddrs {
if addr.IP.IsLinkLocalUnicast() {
// Add route to Mycelium network via host veth
// Add route to Mycelium network via host veth link-local address
route := &netlink.Route{
Dst: &net.IPNet{
IP: net.ParseIP("400::"),
Mask: net.CIDRMask(7, 128),
},
Gw: addr.IP,
Gw: hostLinkLocal,
LinkIndex: link.Attrs().Index,
}
netlink.RouteAdd(route)
break
}
}
}
if err := netlink.RouteAdd(route); err != nil {
return fmt.Errorf("failed to add route to 400::/7: %v", err)
}
return nil
@ -254,3 +251,30 @@ func configureHostInterface(hostVeth netlink.Link, containerIP net.IP) error {
return netlink.RouteAdd(route)
}
func getHostVethLinkLocal(hostVeth netlink.Link) (net.IP, error) {
addrs, err := netlink.AddrList(hostVeth, netlink.FAMILY_V6)
if err != nil {
return nil, fmt.Errorf("failed to get addresses for host veth: %v", err)
}
for _, addr := range addrs {
if addr.IP.IsLinkLocalUnicast() {
return addr.IP, nil
}
}
return nil, fmt.Errorf("no link-local address found on host veth")
}
func getHostVethLinkLocalWithRetry(hostVeth netlink.Link) (net.IP, error) {
// Retry for up to 5 seconds, checking every 100ms
for i := 0; i < 50; i++ {
ip, err := getHostVethLinkLocal(hostVeth)
if err == nil {
return ip, nil
}
time.Sleep(100 * time.Millisecond)
}
return nil, fmt.Errorf("timeout waiting for host veth link-local address")
}