diff --git a/internal/netif/fdb_linux.go b/internal/netif/fdb_linux.go index 462cab2..6c7c42f 100644 --- a/internal/netif/fdb_linux.go +++ b/internal/netif/fdb_linux.go @@ -4,6 +4,7 @@ package netif import ( "bytes" + "errors" "net" "syscall" @@ -49,3 +50,14 @@ func BridgeHasLocalMAC(bridge string, mac net.HardwareAddr) (bool, error) { } return hasBridgeLocalMAC(entries, link.Attrs().Index, mac), nil } + +func BridgeDelLocalMACIfExists(bridge string, mac net.HardwareAddr) error { + link, err := netlink.LinkByName(bridge) + if err != nil { + return err + } + if err := netlink.NeighDel(bridgeLocalEntry(link.Attrs().Index, mac)); err != nil && !errors.Is(err, syscall.ENOENT) { + return err + } + return nil +} diff --git a/internal/netif/fdb_other.go b/internal/netif/fdb_other.go index 8c861ee..43fc698 100644 --- a/internal/netif/fdb_other.go +++ b/internal/netif/fdb_other.go @@ -14,3 +14,7 @@ func BridgeAddLocalMAC(_ string, _ net.HardwareAddr) error { func BridgeHasLocalMAC(_ string, _ net.HardwareAddr) (bool, error) { return false, errors.New("not supported on this platform") } + +func BridgeDelLocalMACIfExists(_ string, _ net.HardwareAddr) error { + return errors.New("not supported on this platform") +} diff --git a/internal/netif/mac.go b/internal/netif/mac.go index 3b1ae23..7dd4559 100644 --- a/internal/netif/mac.go +++ b/internal/netif/mac.go @@ -11,6 +11,7 @@ const ( RoleAnycastGateway byte = 0x01 RoleRouter byte = 0x02 RoleHostGateway byte = 0x03 + RoleNATGateway byte = 0x04 MaxVNI = 1<<24 - 1 ) @@ -24,8 +25,16 @@ func HostMAC(role byte, vtep net.IP) (net.HardwareAddr, error) { } func AnycastMAC(vni int) (net.HardwareAddr, error) { + return vniMAC(RoleAnycastGateway, vni) +} + +func NATGatewayMAC(l3vni int) (net.HardwareAddr, error) { + return vniMAC(RoleNATGateway, l3vni) +} + +func vniMAC(role byte, vni int) (net.HardwareAddr, error) { if vni < 1 || vni > MaxVNI { return nil, fmt.Errorf("vni %d out of range 1-%d", vni, MaxVNI) } - return net.HardwareAddr{locallyAdministered, RoleAnycastGateway, 0x00, byte(vni >> 16), byte(vni >> 8), byte(vni)}, nil + return net.HardwareAddr{locallyAdministered, role, 0x00, byte(vni >> 16), byte(vni >> 8), byte(vni)}, nil } diff --git a/internal/netif/mac_test.go b/internal/netif/mac_test.go index 55f6350..b302bff 100644 --- a/internal/netif/mac_test.go +++ b/internal/netif/mac_test.go @@ -98,3 +98,46 @@ func TestAnycastMACDiffersFromHostMACs(t *testing.T) { } } } + +func TestNATGatewayMAC(t *testing.T) { + cases := map[int]string{ + 1: "02:04:00:00:00:01", + 2911: "02:04:00:00:0b:5f", + 65535: "02:04:00:00:ff:ff", + MaxVNI: "02:04:00:ff:ff:ff", + } + for l3vni, want := range cases { + got, err := NATGatewayMAC(l3vni) + if err != nil { + t.Fatalf("l3vni %d : erreur inattendue %v", l3vni, err) + } + if got.String() != want { + t.Errorf("l3vni %d : %s, %s attendu", l3vni, got, want) + } + if got[0]&0x02 == 0 || got[0]&0x01 != 0 { + t.Errorf("l3vni %d : %s n'est pas une MAC unicast administrée localement", l3vni, got) + } + } +} + +func TestNATGatewayMACRefusesOutOfRangeVNI(t *testing.T) { + for _, l3vni := range []int{0, -1, MaxVNI + 1} { + if _, err := NATGatewayMAC(l3vni); err == nil { + t.Errorf("l3vni %d : une erreur était attendue", l3vni) + } + } +} + +func TestNATGatewayMACDiffersFromOtherRoles(t *testing.T) { + nat, _ := NATGatewayMAC(2911) + anycast, _ := AnycastMAC(2911) + if nat.String() == anycast.String() { + t.Errorf("même MAC que la gateway anycast de même VNI : %s", nat) + } + for _, role := range []byte{RoleRouter, RoleHostGateway} { + host, _ := HostMAC(role, net.ParseIP("192.168.14.11")) + if host[1] == nat[1] { + t.Errorf("rôle %#x : même octet de rôle que la passerelle NAT (%s, %s)", role, host, nat) + } + } +}