Compare commits
3 commits
beed163b02
...
ff17645c62
| Author | SHA1 | Date | |
|---|---|---|---|
|
ff17645c62 |
|||
|
d9f2ec4e67 |
|||
|
74d7fc1425 |
3 changed files with 14 additions and 4 deletions
|
|
@ -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/<name>
|
||||
// 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())
|
||||
if err := unix.Mount(
|
||||
"/proc/self/ns/net",
|
||||
threadNsPath,
|
||||
path,
|
||||
"",
|
||||
unix.MS_BIND,
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue