From 1e7575bc7dd6bf87702fc15694ca56bc2797913d Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Tue, 31 Mar 2026 22:04:12 +0200 Subject: [PATCH 1/6] f-15: fix: fix variable Signed-off-by: GnomeZworc --- internal/netns/call_other.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/netns/call_other.go b/internal/netns/call_other.go index 14a8924..1b5794e 100644 --- a/internal/netns/call_other.go +++ b/internal/netns/call_other.go @@ -2,6 +2,6 @@ package netns -func call(name string, fn func() error) error { +func call(_ string, fn func() error) error { return fn() } From 049cabc4899156a03fcec14fabafae9f38ff78ac Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Tue, 31 Mar 2026 22:04:37 +0200 Subject: [PATCH 2/6] f-15: fix: error in thread Signed-off-by: GnomeZworc --- internal/netns/create_linux.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/netns/create_linux.go b/internal/netns/create_linux.go index 8ee0afa..8eb9b65 100644 --- a/internal/netns/create_linux.go +++ b/internal/netns/create_linux.go @@ -4,11 +4,15 @@ package netns import ( "os" + "runtime" "golang.org/x/sys/unix" ) func create(name string) error { + runtime.LockOSThread() + defer runtime.UnlockOSThread() + base := "/var/run/netns" path := base + "/" + name From beed163b02a422012f83b7c8f931dfaa060b634f Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Tue, 31 Mar 2026 22:05:23 +0200 Subject: [PATCH 3/6] f-14: code: rename veth interface Signed-off-by: GnomeZworc --- internal/vpc/create.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/vpc/create.go b/internal/vpc/create.go index 3c3ad87..b0bf08a 100644 --- a/internal/vpc/create.go +++ b/internal/vpc/create.go @@ -22,7 +22,7 @@ func CreateVPC(db *badger.DB, name string) error { } // create veth public for this netns - if err := netif.CreateVethToNetns("veth"+name+"ext", "vethpublicint", "/var/run/netns/"+name, 9000); err != nil { + if err := netif.CreateVethToNetns("vp-"+name+"-e", "vp-public-i", "/var/run/netns/"+name, 9000); err != nil { return err } @@ -34,24 +34,24 @@ func CreateVPC(db *badger.DB, name string) error { } // set veth to ext public bridge - if err := netif.BridgeSetMaster("veth"+name+"ext", "br-public"); err != nil { + if err := netif.BridgeSetMaster("vp-"+name+"-e", "br-public"); err != nil { return err } // set veth to int public bridge if err := netns.Call(name, func() error { - return netif.BridgeSetMaster("vethpublicint", "br-public") + return netif.BridgeSetMaster("vp-public-i", "br-public") }); err != nil { return err } // set set ext veth up - if err := netif.LinkSetUp("veth" + name + "ext"); err != nil { + if err := netif.LinkSetUp("vp-" + name + "-e"); err != nil { return nil } // set set int veth up if err := netns.Call(name, func() error { - return netif.LinkSetUp("vethpublicint") + return netif.LinkSetUp("vp-public-i") }); err != nil { return err } From 74d7fc1425923b95c0b9142bc934a8590e48c074 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Thu, 2 Apr 2026 23:49:48 +0200 Subject: [PATCH 4/6] f-15: fix: error in netns creation Signed-off-by: GnomeZworc --- internal/netns/create_linux.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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, From d9f2ec4e67c48c08acae2f53b7e16e960bf7f21b Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Thu, 2 Apr 2026 23:50:22 +0200 Subject: [PATCH 5/6] f-14: type: fix return error Signed-off-by: GnomeZworc --- internal/vpc/create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { From ff17645c625526897dc83c6a38d4a8e718bdeadf Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Thu, 2 Apr 2026 23:50:46 +0200 Subject: [PATCH 6/6] f-14: fix: rename interface in delete vpc Signed-off-by: GnomeZworc --- internal/vpc/delete.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }