Compare commits

..

3 commits

Author SHA1 Message Date
beed163b02
f-14: code: rename veth interface
All checks were successful
Pre Release Workflow / set-release-target (push) Successful in 1s
Pre Release Workflow / build (agent, amd64, linux) (push) Successful in 1m27s
Pre Release Workflow / build (db, amd64, linux) (push) Successful in 1m28s
Pre Release Workflow / build (dhcp, amd64, linux) (push) Successful in 1m25s
Pre Release Workflow / build (metacli, amd64, linux) (push) Successful in 1m28s
Pre Release Workflow / build (metadata, amd64, linux) (push) Successful in 1m29s
Pre Release Workflow / build (vpc, amd64, linux) (push) Successful in 1m29s
Pre Release Workflow / upload-scripts (run-dnsmasq-in-netns.sh) (push) Successful in 5s
Pre Release Workflow / prerelease (push) Successful in 12s
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
2026-03-31 22:06:37 +02:00
049cabc489
f-15: fix: error in thread
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
2026-03-31 22:05:53 +02:00
1e7575bc7d
f-15: fix: fix variable
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
2026-03-31 22:04:12 +02:00
3 changed files with 10 additions and 6 deletions

View file

@ -2,6 +2,6 @@
package netns
func call(name string, fn func() error) error {
func call(_ string, fn func() error) error {
return fn()
}

View file

@ -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

View file

@ -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
}