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

feature-21, ajoute de la gestion des subnets #24

Manually merged
nicolas.boufideline merged 44 commits from feature-21 into main 2026-04-26 14:16:57 +00:00
Conversation 0 Commits 44 Files changed 43 +17 -33
2 changed files with 17 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 396f2842e5 - Show all commits

f-21: code: use ebtable parse

Prev Next 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
GnomeZworc 2026-04-26 15:04:45 +02:00
commit 396f2842e5
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632

24
internal/subnet/create.go
View file

@ -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 := exec.Command("ebtables", "-A", "FORWARD",
"--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.DropARPToGateway(bridge, gatewayIP.String()); err != nil {
return err
}
// ebtables : drop trafic DHCP sur ce bridge
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)
if err := ebtables.DropDHCP(bridge); err != nil {
return err
}
// génération de la config dnsmasq et démarrage du service

26
internal/subnet/delete.go
View file

@ -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",
"--out-interface", bridge,
"-p", "arp",
"--arp-op", "Request",
"-j", "DROP").Run()
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()
if err := ebtables.DeleteARPToGateway(bridge, gatewayIP); err != nil {
return fmt.Errorf("delete ebtables arp rule: %w", err)
}
if err := ebtables.DeleteDHCP(bridge); err != nil {
return fmt.Errorf("delete ebtables dhcp rule: %w", err)
}
// suppression du bridge dans le netns VPC
if err := netns.Call(vpcName, func() error {