syonad/two
2
0
Fork 0
Code Issues 6 Pull requests 1 Projects Releases 9 Packages Wiki Activity Actions

f-28: bridge: fix ebtables

Browse source 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-05-18 21:11:09 +02:00
commit 91a5d7ac78
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
2 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/subnet/create.go
View file

@ -93,21 +93,15 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData) error {
case "bridge": case "bridge":
} }
applyEbtables := func() error { switch d.mode {
case "vxlan":
if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil {
return err return err
} }
return ebtables.DropDHCP(d.bridge) if err := ebtables.DropDHCP(d.bridge); err != nil {
}
switch d.mode {
case "vxlan":
if err := applyEbtables(); err != nil {
return err return err
} }
case "bridge": case "bridge":
if err := netns.Call(d.vpc, applyEbtables); err != nil {
return fmt.Errorf("set ebtables in netns: %w", err)
}
} }
return startDHCP(db, subnetName, d) return startDHCP(db, subnetName, d)

9
internal/subnet/delete.go
View file

@ -99,15 +99,6 @@ func deleteSubnetVxlan(d subnetData) error {
} }
func deleteSubnetBridge(d subnetData) error { func deleteSubnetBridge(d subnetData) error {
if err := netns.Call(d.vpc, func() error {
if err := ebtables.DeleteARPToGateway(d.bridge, d.gatewayIP.String()); err != nil {
return fmt.Errorf("delete ebtables arp rule: %w", err)
}
return ebtables.DeleteDHCP(d.bridge)
}); err != nil {
return fmt.Errorf("delete ebtables in netns: %w", err)
}
if err := netns.Call(d.vpc, func() error { if err := netns.Call(d.vpc, func() error {
return netif.DeleteLink(d.bridge) return netif.DeleteLink(d.bridge)
}); err != nil { }); err != nil {