From 2ea3c6dd14ba65e99e902747356d608b422ef4e5 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 19 Jan 2026 22:41:39 +0100 Subject: [PATCH 1/2] f-14: fix: rename interface name Signed-off-by: GnomeZworc --- internal/vpc/create.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/internal/vpc/create.go b/internal/vpc/create.go index 55896ba..5ff5fa5 100644 --- a/internal/vpc/create.go +++ b/internal/vpc/create.go @@ -16,42 +16,36 @@ func CreateVPC(name string) error { } // create veth public for this netns - if err := netif.CreateVethToNetns(name+"-ext", "veth-"+name+"-int", "/var/run/netns/"+name, 9000); err != nil { + if err := netif.CreateVethToNetns("veth"+name+"ext", "vethpublicint", "/var/run/netns/"+name, 9000); err != nil { return err } // create public bridge in netns if err := netns.Call(name, func() error { - return netif.CreateBridge("br-public", 1500, false) + return netif.CreateBridge("br-public", 1500) }); err != nil { return err } // set veth to ext public bridge - if err := netif.BridgeSetMaster(name+"-ext", "br-public"); err != nil { + if err := netif.BridgeSetMaster("veth"+name+"ext", "br-public"); err != nil { return err } // set veth to int public bridge if err := netns.Call(name, func() error { - return netif.BridgeSetMaster("veth-"+name+"-int", "br-public") + return netif.BridgeSetMaster("vethpublicint", "br-public") }); err != nil { return err } // set set ext veth up - if err := netif.LinkSetUp(name + "-ext"); err != nil { + if err := netif.LinkSetUp("veth" + name + "ext"); err != nil { return nil } // set set int veth up if err := netns.Call(name, func() error { - return netif.LinkSetUp("veth-" + name + "-int") - }); err != nil { - return err - } - // set set int bridge up - if err := netns.Call(name, func() error { - return netif.LinkSetUp("br-public") + return netif.LinkSetUp("vethpublicint") }); err != nil { return err } From 44f01c23735da8c6e97e2f30072bd8ad6fbbd11e Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 19 Jan 2026 22:42:13 +0100 Subject: [PATCH 2/2] f-14: clean: remove not used setBridgeSTP Signed-off-by: GnomeZworc --- internal/netif/bridge.go | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/internal/netif/bridge.go b/internal/netif/bridge.go index daf21ec..a4754a3 100644 --- a/internal/netif/bridge.go +++ b/internal/netif/bridge.go @@ -1,24 +1,10 @@ package netif import ( - "fmt" - "os" - "github.com/vishvananda/netlink" ) -func setBridgeSTP(bridge string, enable bool) error { - path := fmt.Sprintf("/sys/class/net/%s/bridge/stp_state", bridge) - - val := "0" - if enable { - val = "1" - } - - return os.WriteFile(path, []byte(val), 0644) -} - -func CreateBridge(name string, mtu int, stp bool) error { +func CreateBridge(name string, mtu int) error { br := &netlink.Bridge{ LinkAttrs: netlink.LinkAttrs{ Name: name, @@ -34,7 +20,7 @@ func CreateBridge(name string, mtu int, stp bool) error { return err } - return setBridgeSTP(name, stp) + return nil } func BridgeSetMaster(iface, bridge string) error {