Compare commits
No commits in common. "ff17645c625526897dc83c6a38d4a8e718bdeadf" and "beed163b02a422012f83b7c8f931dfaa060b634f" have entirely different histories.
ff17645c62
...
beed163b02
3 changed files with 4 additions and 14 deletions
|
|
@ -3,7 +3,6 @@
|
||||||
package netns
|
package netns
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"os"
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
|
|
@ -21,12 +20,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 +39,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,
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ func CreateVPC(db *badger.DB, name string) error {
|
||||||
|
|
||||||
// set set ext veth up
|
// set set ext veth up
|
||||||
if err := netif.LinkSetUp("vp-" + name + "-e"); err != nil {
|
if err := netif.LinkSetUp("vp-" + name + "-e"); 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 {
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue