f-41: subnet: MAC de gateway propre à l'hôte, dérivée du VTEP (retour sur l'anycast) #41

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-12 01:01:05 +02:00
commit 9b2c2409eb
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
6 changed files with 60 additions and 54 deletions

View file

@ -2,6 +2,7 @@ package subnet
import (
"fmt"
"net"
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/internal/dhcp"
@ -73,17 +74,24 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
return fmt.Errorf("unknown subnet mode %q", d.mode)
}
var gatewayMAC net.HardwareAddr
if d.mode == ModeVxlan {
vtep, err := netif.VTEPAddress(d.localIface)
if err != nil {
return fmt.Errorf("vtep of %s: %w", d.localIface, err)
}
if gatewayMAC, err = hostGatewayMAC(vtep); err != nil {
return err
}
}
if err := netns.Call(d.vpc, func() error {
if err := netif.CreateBridge(d.bridge, 1500); err != nil {
return fmt.Errorf("create bridge: %w", err)
}
if d.mode == ModeVxlan {
mac, err := anycastGatewayMAC(d.vxlanID)
if err != nil {
return err
}
if err := netif.LinkSetHardwareAddr(d.bridge, mac); err != nil {
return fmt.Errorf("set anycast gateway mac %s: %w", mac, err)
if gatewayMAC != nil {
if err := netif.LinkSetHardwareAddr(d.bridge, gatewayMAC); err != nil {
return fmt.Errorf("set gateway mac %s: %w", gatewayMAC, err)
}
}
return netif.BridgeSetMaster(vethI, d.bridge)

View file

@ -6,14 +6,14 @@ import (
)
const (
maxVNI = 1<<24 - 1
roleAnycastGateway = 0x01
roleHostGateway = 0x03
locallyAdministered = 0x02
)
func anycastGatewayMAC(vni int) (net.HardwareAddr, error) {
if vni < 0 || vni > maxVNI {
return nil, fmt.Errorf("vxlan_id %d does not fit in 24 bits", vni)
func hostGatewayMAC(vtep net.IP) (net.HardwareAddr, error) {
ip := vtep.To4()
if ip == nil {
return nil, fmt.Errorf("vtep %v is not an IPv4 address", vtep)
}
return net.HardwareAddr{locallyAdministered, roleAnycastGateway, 0x00, byte(vni >> 16), byte(vni >> 8), byte(vni)}, nil
return net.HardwareAddr{locallyAdministered, roleHostGateway, ip[0], ip[1], ip[2], ip[3]}, nil
}

View file

@ -1,31 +1,29 @@
package subnet
import "testing"
import (
"net"
"testing"
)
func TestAnycastGatewayMAC(t *testing.T) {
cases := []struct {
vni int
want string
}{
{2811, "02:01:00:00:0a:fb"},
{0, "02:01:00:00:00:00"},
{1, "02:01:00:00:00:01"},
{0x123456, "02:01:00:12:34:56"},
{maxVNI, "02:01:00:ff:ff:ff"},
func TestHostGatewayMAC(t *testing.T) {
cases := map[string]string{
"192.168.14.11": "02:03:c0:a8:0e:0b",
"192.168.14.12": "02:03:c0:a8:0e:0c",
"10.0.0.1": "02:03:0a:00:00:01",
}
for _, c := range cases {
got, err := anycastGatewayMAC(c.vni)
for vtep, want := range cases {
got, err := hostGatewayMAC(net.ParseIP(vtep))
if err != nil {
t.Fatalf("VNI %d : erreur inattendue %v", c.vni, err)
t.Fatalf("VTEP %s : erreur inattendue %v", vtep, err)
}
if got.String() != c.want {
t.Errorf("VNI %d : %s, %s attendu", c.vni, got, c.want)
if got.String() != want {
t.Errorf("VTEP %s : %s, %s attendu", vtep, got, want)
}
}
}
func TestAnycastGatewayMACIsLocalUnicast(t *testing.T) {
got, err := anycastGatewayMAC(2811)
func TestHostGatewayMACIsLocalUnicast(t *testing.T) {
got, err := hostGatewayMAC(net.ParseIP("192.168.14.11"))
if err != nil {
t.Fatal(err)
}
@ -37,22 +35,17 @@ func TestAnycastGatewayMACIsLocalUnicast(t *testing.T) {
}
}
func TestAnycastGatewayMACIsIdenticalForTheSameVNIAndDistinctOtherwise(t *testing.T) {
a, _ := anycastGatewayMAC(2811)
b, _ := anycastGatewayMAC(2811)
c, _ := anycastGatewayMAC(2812)
if a.String() != b.String() {
t.Errorf("même VNI, MAC différentes : %s et %s", a, b)
}
if a.String() == c.String() {
t.Errorf("VNI différentes, même MAC : %s", a)
func TestHostGatewayMACDiffersFromTheRouterMACOfTheSameHost(t *testing.T) {
got, _ := hostGatewayMAC(net.ParseIP("192.168.14.11"))
if got.String() == "02:02:c0:a8:0e:0b" {
t.Errorf("%s : même MAC que la RMAC du L3VNI de cet hôte", got)
}
}
func TestAnycastGatewayMACRejectsVNIOutside24Bits(t *testing.T) {
for _, vni := range []int{-1, maxVNI + 1} {
if mac, err := anycastGatewayMAC(vni); err == nil {
t.Errorf("VNI %d accepté : %s", vni, mac)
func TestHostGatewayMACRejectsANonIPv4VTEP(t *testing.T) {
for _, vtep := range []net.IP{nil, net.ParseIP("fd00::1")} {
if mac, err := hostGatewayMAC(vtep); err == nil {
t.Errorf("VTEP %v accepté : %s", vtep, mac)
}
}
}