Compare commits

..

No commits in common. "ff17645c625526897dc83c6a38d4a8e718bdeadf" and "beed163b02a422012f83b7c8f931dfaa060b634f" have entirely different histories.

3 changed files with 4 additions and 14 deletions

View file

@ -3,7 +3,6 @@
package netns
import (
"fmt"
"os"
"runtime"
@ -21,12 +20,6 @@ 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 {
@ -46,12 +39,9 @@ func create(name string) error {
return err
}
// bind mount du netns du thread 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())
// bind mount du netns courant vers /var/run/netns/<name>
if err := unix.Mount(
threadNsPath,
"/proc/self/ns/net",
path,
"",
unix.MS_BIND,

View file

@ -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 err
return nil
}
// set set int veth up
if err := netns.Call(name, func() error {

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 {
return err
} else if state == "deleting" {
if err := netif.DeleteLink("vp-" + name + "-e"); err != nil {
if err := netif.DeleteLink(name + "-ext"); err != nil {
return err
}