Compare commits

..

No commits in common. "0.1.0rc14" and "main" have entirely different histories.

4 changed files with 10 additions and 24 deletions

View file

@ -2,6 +2,6 @@
package netns package netns
func call(_ string, fn func() error) error { func call(name string, fn func() error) error {
return fn() return fn()
} }

View file

@ -3,17 +3,12 @@
package netns package netns
import ( import (
"fmt"
"os" "os"
"runtime"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
func create(name string) error { func create(name string) error {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
base := "/var/run/netns" base := "/var/run/netns"
path := base + "/" + name path := base + "/" + name
@ -21,12 +16,6 @@ func create(name string) error {
return err return err
} }
// si le fichier existe déjà, le démonter d'abord
if _, err := os.Stat(path); err == nil {
unix.Unmount(path, unix.MNT_DETACH)
os.Remove(path)
}
// fichier cible // fichier cible
f, err := os.Create(path) f, err := os.Create(path)
if err != nil { if err != nil {
@ -46,12 +35,9 @@ func create(name string) error {
return err return err
} }
// bind mount du netns du thread courant vers /var/run/netns/<name> // bind mount du netns courant vers /var/run/netns/<name>
// /proc/self/ns/net pointe vers le ns du processus (thread principal),
// pas du thread courant — il faut utiliser le tid explicitement
threadNsPath := fmt.Sprintf("/proc/self/task/%d/ns/net", unix.Gettid())
if err := unix.Mount( if err := unix.Mount(
threadNsPath, "/proc/self/ns/net",
path, path,
"", "",
unix.MS_BIND, unix.MS_BIND,

View file

@ -22,7 +22,7 @@ func CreateVPC(db *badger.DB, name string) error {
} }
// create veth public for this netns // create veth public for this netns
if err := netif.CreateVethToNetns("vp-"+name+"-e", "vp-public-i", "/var/run/netns/"+name, 9000); err != nil { if err := netif.CreateVethToNetns("veth"+name+"ext", "vethpublicint", "/var/run/netns/"+name, 9000); err != nil {
return err return err
} }
@ -34,24 +34,24 @@ func CreateVPC(db *badger.DB, name string) error {
} }
// set veth to ext public bridge // set veth to ext public bridge
if err := netif.BridgeSetMaster("vp-"+name+"-e", "br-public"); err != nil { if err := netif.BridgeSetMaster("veth"+name+"ext", "br-public"); err != nil {
return err return err
} }
// set veth to int public bridge // set veth to int public bridge
if err := netns.Call(name, func() error { if err := netns.Call(name, func() error {
return netif.BridgeSetMaster("vp-public-i", "br-public") return netif.BridgeSetMaster("vethpublicint", "br-public")
}); err != nil { }); err != nil {
return err return err
} }
// set set ext veth up // set set ext veth up
if err := netif.LinkSetUp("vp-" + name + "-e"); err != nil { if err := netif.LinkSetUp("veth" + name + "ext"); err != nil {
return err return nil
} }
// set set int veth up // set set int veth up
if err := netns.Call(name, func() error { if err := netns.Call(name, func() error {
return netif.LinkSetUp("vp-public-i") return netif.LinkSetUp("vethpublicint")
}); err != nil { }); err != nil {
return err return err
} }

View file

@ -12,7 +12,7 @@ func DeleteVPC(db *badger.DB, name string) error {
if state, err := kv.GetFromDB(db, "vpc/"+name+"/state"); err != nil { if state, err := kv.GetFromDB(db, "vpc/"+name+"/state"); err != nil {
return err return err
} else if state == "deleting" { } else if state == "deleting" {
if err := netif.DeleteLink("vp-" + name + "-e"); err != nil { if err := netif.DeleteLink(name + "-ext"); err != nil {
return err return err
} }