From 69f4ca58acdfa43cca931e4ad167b9b69b673b4b Mon Sep 17 00:00:00 2001
From: Christopher Dziomba <christopher.dziomba@telekom.de>
Date: Fri, 22 Nov 2024 16:43:34 +0100
Subject: [PATCH] Set accept_untracked_na to 2 for IPv6 NA in EVPN

---
 pkg/nl/layer2.go  | 9 +++++++++
 pkg/nl/nl_test.go | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkg/nl/layer2.go b/pkg/nl/layer2.go
index 40d61b95..6f56f3f2 100644
--- a/pkg/nl/layer2.go
+++ b/pkg/nl/layer2.go
@@ -456,6 +456,15 @@ func (*Manager) configureBridge(intfName string) error {
 		return fmt.Errorf("error setting arp_accept = 1 for interface: %w", err)
 	}
 
+	// Ensure we can receive unsolicited and solicited but untracked NA
+	if _, err := os.Stat(fmt.Sprintf("%s/ipv6/conf/%s/accept_untracked_na", procSysNetPath, intfName)); err == nil {
+		if err := os.WriteFile(fmt.Sprintf("%s/ipv6/conf/%s/accept_untracked_na", procSysNetPath, intfName), []byte("2"), neighFilePermissions); err != nil {
+			return fmt.Errorf("error setting accept_untracked_na = 2 for interface: %w", err)
+		}
+	} else if !os.IsNotExist(err) {
+		return fmt.Errorf("error checking if accept_untracked_na exists: %w", err)
+	}
+
 	baseTimer := os.Getenv("NWOP_NEIGH_BASE_REACHABLE_TIME")
 	if baseTimer == "" {
 		baseTimer = "30000"
diff --git a/pkg/nl/nl_test.go b/pkg/nl/nl_test.go
index 491aa54d..bb7bbb3a 100644
--- a/pkg/nl/nl_test.go
+++ b/pkg/nl/nl_test.go
@@ -19,6 +19,7 @@ import (
 
 const (
 	arpAccept           = "arp_accept"
+	acceptUntrackedNA   = "accept_untracked_na"
 	baseReachableTimeMs = "base_reachable_time"
 	addrGenMode         = "addr_gen_mode"
 )
@@ -1086,8 +1087,8 @@ var _ = Describe("ReconcileL2()", func() {
 		arpAcceptIPv4 := fmt.Sprintf("%s/ipv4/conf/%s", procSysNetPath, vlanName)
 		createInterfaceFile(arpAcceptIPv4 + "/" + arpAccept)
 
-		arpAcceptIPv6 := fmt.Sprintf("%s/ipv6/conf/%s", procSysNetPath, vlanName)
-		createInterfaceFile(arpAcceptIPv6 + "/" + arpAccept)
+		acceptUntrackedNAIPv6 := fmt.Sprintf("%s/ipv6/conf/%s", procSysNetPath, vlanName)
+		createInterfaceFile(acceptUntrackedNAIPv6 + "/" + acceptUntrackedNA)
 
 		err := nm.ReconcileL2(current, desired)
 		Expect(err).To(HaveOccurred())