diff --git a/internal/netns/create_linux.go b/internal/netns/create_linux.go index 8eb9b65..51c739a 100644 --- a/internal/netns/create_linux.go +++ b/internal/netns/create_linux.go @@ -3,6 +3,7 @@ package netns import ( + "fmt" "os" "runtime" @@ -20,6 +21,12 @@ func create(name string) error { 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 f, err := os.Create(path) if err != nil { @@ -39,9 +46,12 @@ func create(name string) error { return err } - // bind mount du netns courant vers /var/run/netns/ + // bind mount du netns du thread courant vers /var/run/netns/ + // /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( - "/proc/self/ns/net", + threadNsPath, path, "", unix.MS_BIND, diff --git a/internal/vpc/create.go b/internal/vpc/create.go index b0bf08a..a6e6aaa 100644 --- a/internal/vpc/create.go +++ b/internal/vpc/create.go @@ -47,7 +47,7 @@ func CreateVPC(db *badger.DB, name string) error { // set set ext veth up if err := netif.LinkSetUp("vp-" + name + "-e"); err != nil { - return nil + return err } // set set int veth up if err := netns.Call(name, func() error { diff --git a/internal/vpc/delete.go b/internal/vpc/delete.go index a05e807..10c863d 100644 --- a/internal/vpc/delete.go +++ b/internal/vpc/delete.go @@ -12,7 +12,7 @@ func DeleteVPC(db *badger.DB, name string) error { if state, err := kv.GetFromDB(db, "vpc/"+name+"/state"); err != nil { return err } else if state == "deleting" { - if err := netif.DeleteLink(name + "-ext"); err != nil { + if err := netif.DeleteLink("vp-" + name + "-e"); err != nil { return err }