Disable IPv6 RA from VPP for tunnel ip.

Signed-off-by: Ed Warnicke <[email protected]>
networkservicemesh · Oct 19, 2022 · 829cf87 · 829cf87
1 parent a575fe0
commit 829cf87
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go
diff --git a/internal/vppinit/vppinit.go b/internal/vppinit/vppinit.go
@@ -31,6 +31,7 @@ import (
 	interfaces "github.com/edwarnicke/govpp/binapi/interface"
 	"github.com/edwarnicke/govpp/binapi/interface_types"
 	"github.com/edwarnicke/govpp/binapi/ip"
+	"github.com/edwarnicke/govpp/binapi/ip6_nd"
 	"github.com/edwarnicke/govpp/binapi/ip_neighbor"
 	"github.com/pkg/errors"
 	"github.com/vishvananda/netlink"
@@ -92,6 +93,22 @@ func LinkToAfPacket(ctx context.Context, vppConn api.Connection, tunnelIP net.IP
 		return nil, err
 	}
 
+	now := time.Now()
+	if tunnelIP.To4() == nil {
+		_, err := ip6_nd.NewServiceClient(vppConn).IP6ndSendRouterSolicitation(ctx, &ip6_nd.IP6ndSendRouterSolicitation{
+			SwIfIndex: swIfIndex,
+			Stop:      true,
+		})
+		if err != nil {
+			return nil, err
+		}
+		log.FromContext(ctx).
+			WithField("swIfIndex", swIfIndex).
+			WithField("stop", true).
+			WithField("duration", time.Since(now)).
+			WithField("vppapi", "IP6ndSendRouterSolicitation").Debug("completed")
+	}
+
 	if mtuErr := setMtu(ctx, vppConn, link, swIfIndex); err != nil {
 		return nil, mtuErr
 	}
@@ -100,7 +117,7 @@ func LinkToAfPacket(ctx context.Context, vppConn api.Connection, tunnelIP net.IP
 		return nil, aclErr
 	}
 
-	now := time.Now()
+	now = time.Now()
 	_, err = interfaces.NewServiceClient(vppConn).SwInterfaceSetFlags(ctx, &interfaces.SwInterfaceSetFlags{
 		SwIfIndex: swIfIndex,
 		Flags:     interface_types.IF_STATUS_API_FLAG_ADMIN_UP,