Merge branch 'scionproto-master' into upstream

Author: aaronbojarski

acceptance/router_benchmark/brload/BUILD.bazel

@@ -16,9 +16,9 @@ go_library(
         "//pkg/scrypto:go_default_library",
         "//pkg/slayers:go_default_library",
         "//private/keyconf:go_default_library",
-        "@com_github_google_gopacket//:go_default_library",
-        "@com_github_google_gopacket//afpacket:go_default_library",
-        "@com_github_google_gopacket//layers:go_default_library",
+        "@com_github_gopacket_gopacket//:go_default_library",
+        "@com_github_gopacket_gopacket//afpacket:go_default_library",
+        "@com_github_gopacket_gopacket//layers:go_default_library",
         "@com_github_spf13_cobra//:go_default_library",
         "@org_golang_x_sys//unix:go_default_library",
     ],

acceptance/router_benchmark/brload/main.go

@@ -25,9 +25,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/google/gopacket"
-	"github.com/google/gopacket/afpacket"
-	"github.com/google/gopacket/layers"
+	"github.com/gopacket/gopacket"
+	"github.com/gopacket/gopacket/afpacket"
+	"github.com/gopacket/gopacket/layers"
 	"github.com/spf13/cobra"
 
 	"github.com/scionproto/scion/acceptance/router_benchmark/cases"

acceptance/router_benchmark/brload/mmsg.go

@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"unsafe"
 
-	"github.com/google/gopacket/afpacket"
+	"github.com/gopacket/gopacket/afpacket"
 	"golang.org/x/sys/unix"
 )
 

acceptance/router_benchmark/cases/BUILD.bazel

@@ -23,8 +23,8 @@ go_library(
         "//pkg/slayers:go_default_library",
         "//pkg/slayers/path:go_default_library",
         "//pkg/slayers/path/scion:go_default_library",
-        "@com_github_google_gopacket//:go_default_library",
-        "@com_github_google_gopacket//layers:go_default_library",
+        "@com_github_gopacket_gopacket//:go_default_library",
+        "@com_github_gopacket_gopacket//layers:go_default_library",
         "@com_github_mdlayher_arp//:go_default_library",
         "@com_github_mdlayher_ethernet//:go_default_library",
     ],

acceptance/router_benchmark/cases/helpers.go

@@ -15,7 +15,7 @@
 package cases
 
 import (
-	"github.com/google/gopacket"
+	"github.com/gopacket/gopacket"
 )
 
 // We make the assumption os protocol sanity: the length and checksum fields are of fixed size

acceptance/router_benchmark/cases/topo.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/gopacket/layers"
+	"github.com/gopacket/gopacket/layers"
 	"github.com/mdlayher/arp"
 	"github.com/mdlayher/ethernet"
 

control/beaconing/extender_test.go

@@ -21,7 +21,7 @@ import (
 	"crypto/rand"
 	"errors"
 	"hash"
-	mrand "math/rand"
+	mrand "math/rand/v2"
 	"testing"
 	"time"
 

control/beaconing/propagator_test.go

@@ -83,7 +83,7 @@ func TestPropagatorRunNonCore(t *testing.T) {
 	}
 	g := graph.NewDefaultGraph(mctrl)
 	provider.EXPECT().BeaconsToPropagate(gomock.Any()).Times(1).DoAndReturn(
-		func(_ interface{}) ([]beacon.Beacon, error) {
+		func(_ any) ([]beacon.Beacon, error) {
 			res := make([]beacon.Beacon, 0, len(beacons))
 			for _, desc := range beacons {
 				res = append(res, testBeacon(g, desc))
@@ -157,7 +157,7 @@ func TestPropagatorRunCore(t *testing.T) {
 	}
 	g := graph.NewDefaultGraph(mctrl)
 	provider.EXPECT().BeaconsToPropagate(gomock.Any()).Times(2).DoAndReturn(
-		func(_ interface{}) ([]beacon.Beacon, error) {
+		func(_ any) ([]beacon.Beacon, error) {
 			res := make([]beacon.Beacon, 0, len(beacons))
 			for _, desc := range beacons {
 				res = append(res, testBeacon(g, desc))
@@ -248,7 +248,7 @@ func TestPropagatorFastRecovery(t *testing.T) {
 	// We call run 4 times in this test, since the interface to 1-ff00:0:120
 	// will never be beaconed on, because the beacons are filtered for loops.
 	provider.EXPECT().BeaconsToPropagate(gomock.Any()).Times(4).DoAndReturn(
-		func(_ interface{}) ([]beacon.Beacon, error) {
+		func(_ any) ([]beacon.Beacon, error) {
 			return []beacon.Beacon{testBeacon(g, beacons[0])}, nil
 		},
 	)

control/beaconing/util.go

@@ -122,9 +122,9 @@ type silentLogger struct {
 	log.Logger
 }
 
-func (s silentLogger) Info(msg string, ctx ...interface{}) {
+func (s silentLogger) Info(msg string, ctx ...any) {
 	s.Logger.Debug(msg, ctx...)
 }
-func (s silentLogger) Error(msg string, ctx ...interface{}) {
+func (s silentLogger) Error(msg string, ctx ...any) {
 	s.Logger.Debug(msg, ctx...)
 }

control/beaconing/writer_test.go

@@ -119,7 +119,7 @@ func TestRegistrarRun(t *testing.T) {
 
 			g := graph.NewDefaultGraph(mctrl)
 			segProvider.EXPECT().SegmentsToRegister(gomock.Any(), test.segType).DoAndReturn(
-				func(_, _ interface{}) ([]beacon.Beacon, error) {
+				func(_, _ any) ([]beacon.Beacon, error) {
 					res := make([]beacon.Beacon, 0, len(test.beacons))
 					for _, desc := range test.beacons {
 						res = append(res, testBeacon(g, desc))
@@ -210,7 +210,7 @@ func TestRegistrarRun(t *testing.T) {
 
 			g := graph.NewDefaultGraph(mctrl)
 			segProvider.EXPECT().SegmentsToRegister(gomock.Any(), test.segType).DoAndReturn(
-				func(_, _ interface{}) ([]beacon.Beacon, error) {
+				func(_, _ any) ([]beacon.Beacon, error) {
 					res := make([]beacon.Beacon, len(test.beacons))
 					for _, desc := range test.beacons {
 						res = append(res, testBeacon(g, desc))
@@ -313,7 +313,7 @@ func TestRegistrarRun(t *testing.T) {
 		require.NoError(t, err)
 		segProvider.EXPECT().SegmentsToRegister(gomock.Any(),
 			seg.TypeDown).DoAndReturn(
-			func(_, _ interface{}) (<-chan beacon.Beacon, error) {
+			func(_, _ any) (<-chan beacon.Beacon, error) {
 				res := make(chan beacon.Beacon, 1)
 				b := testBeacon(g, []uint16{graph.If_120_X_111_B})
 				b.InIfID = 10