f-21: code: use ebtable parse

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>

internal/subnet/create.go

@@ -3,11 +3,11 @@ package subnet
 import (
 	"fmt"
 	"net"
-	"os/exec"
 	"strconv"
 	"strings"
 
 	"git.g3e.fr/syonad/two/internal/dhcp"
+	"git.g3e.fr/syonad/two/internal/ebtables"
 	"git.g3e.fr/syonad/two/internal/netif"
 	"git.g3e.fr/syonad/two/internal/netns"
 	"git.g3e.fr/syonad/two/pkg/db/kv"
@@ -136,25 +136,11 @@ func CreateSubnet(db *badger.DB, subnetName string) error {
 		return fmt.Errorf("add route in netns: %w", err)
 	}
 
-	// ebtables : drop ARP Request vers la gateway sur ce bridge
+	if err := ebtables.DropARPToGateway(bridge, gatewayIP.String()); err != nil {
-	if err := exec.Command("ebtables", "-A", "FORWARD",
+		return err
-		"--out-interface", bridge,
-		"-p", "arp",
-		"--arp-op", "Request",
-		"--arp-ip-dst", gatewayIP.String(),
-		"-j", "DROP").Run(); err != nil {
-		return fmt.Errorf("ebtables arp rule: %w", err)
 	}
-
+	if err := ebtables.DropDHCP(bridge); err != nil {
-	// ebtables : drop trafic DHCP sur ce bridge
+		return err
-	if err := exec.Command("ebtables", "-A", "FORWARD",
-		"--out-interface", bridge,
-		"-p", "IPv4",
-		"--ip-protocol", "udp",
-		"--ip-source-port", "67:68",
-		"--ip-destination-port", "67:68",
-		"-j", "DROP").Run(); err != nil {
-		return fmt.Errorf("ebtables dhcp rule: %w", err)
 	}
 
 	// génération de la config dnsmasq et démarrage du service

internal/subnet/delete.go

@@ -3,9 +3,9 @@ package subnet
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
 
+	"git.g3e.fr/syonad/two/internal/ebtables"
 	"git.g3e.fr/syonad/two/internal/netif"
 	"git.g3e.fr/syonad/two/internal/netns"
 	"git.g3e.fr/syonad/two/pkg/db/kv"
@@ -33,6 +33,11 @@ func DeleteSubnet(db *badger.DB, subnetName string) error {
 		return fmt.Errorf("get vxlan_id: %w", err)
 	}
 
+	gatewayIP, err := kv.GetFromDB(db, "subnet/"+subnetName+"/gateway_ip")
+	if err != nil {
+		return fmt.Errorf("get gateway_ip: %w", err)
+	}
+
 	subnetID := strings.SplitN(subnetName, "-", 2)[1]
 	bridge := "br-" + subnetID
 	vxlanIface := "vxlan-" + vxlanIDStr
@@ -55,19 +60,12 @@ func DeleteSubnet(db *badger.DB, subnetName string) error {
 	}
 
 	// suppression des règles ebtables
-	exec.Command("ebtables", "-D", "FORWARD",
+	if err := ebtables.DeleteARPToGateway(bridge, gatewayIP); err != nil {
-		"--out-interface", bridge,
+		return fmt.Errorf("delete ebtables arp rule: %w", err)
-		"-p", "arp",
+	}
-		"--arp-op", "Request",
+	if err := ebtables.DeleteDHCP(bridge); err != nil {
-		"-j", "DROP").Run()
+		return fmt.Errorf("delete ebtables dhcp rule: %w", err)
-
+	}
-	exec.Command("ebtables", "-D", "FORWARD",
-		"--out-interface", bridge,
-		"-p", "IPv4",
-		"--ip-protocol", "udp",
-		"--ip-source-port", "67:68",
-		"--ip-destination-port", "67:68",
-		"-j", "DROP").Run()
 
 	// suppression du bridge dans le netns VPC
 	if err := netns.Call(vpcName, func() error {