hummingbird: bidirectional reservations

acceptance/squic_hummingbird/BUILD.bazel

@@ -8,8 +8,7 @@ go_library(
     importpath = "github.com/scionproto/scion/acceptance/squic_hummingbird",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/addr:go_default_library",
-        "//pkg/snet/squic/hummingbirdtest:go_default_library",
+        "//pkg/hummingbird/hummingbirdtest:go_default_library",
     ],
 )
 

acceptance/squic_hummingbird/main.go

@@ -22,8 +22,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/scionproto/scion/pkg/addr"
-	"github.com/scionproto/scion/pkg/snet/squic/hummingbirdtest"
+	"github.com/scionproto/scion/pkg/hummingbird/hummingbirdtest"
 )
 
 func main() {
@@ -51,31 +50,25 @@ func runServer(args []string) error {
 	fs := flag.NewFlagSet("server", flag.ContinueOnError)
 	var daemonAddr string
 	var localAddr string
-	var peerIARaw string
 	var timeout time.Duration
 	fs.StringVar(&daemonAddr, "daemon", "", "SCION daemon address")
 	fs.StringVar(&localAddr, "local", "", "Local SCION UDP address")
-	fs.StringVar(&peerIARaw, "peer-ia", "", "Remote IA used to derive the reply path")
 	fs.DurationVar(&timeout, "timeout", 15*time.Second, "Server timeout")
 	if err := fs.Parse(args); err != nil {
 		return err
 	}
-	if daemonAddr == "" || localAddr == "" || peerIARaw == "" {
-		return fmt.Errorf("server requires --daemon, --local, and --peer-ia")
+	if daemonAddr == "" || localAddr == "" {
+		return fmt.Errorf("server requires --daemon and --local")
 	}
 
 	local, err := hummingbirdtest.MustParseUDPAddr(localAddr)
 	if err != nil {
 		return err
 	}
-	peerIA, err := addr.ParseIA(peerIARaw)
-	if err != nil {
-		return err
-	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
-	return hummingbirdtest.RunServer(ctx, daemonAddr, local, peerIA, log.Printf)
+	return hummingbirdtest.RunQuicServer(ctx, daemonAddr, local)
 }
 
 func runClient(args []string) error {

acceptance/squic_hummingbird/test.py

@@ -56,7 +56,7 @@ def _run(self):
             "bash",
             "-lc",
             f"squic-hummingbird server --daemon '{server_daemon}' --local '{server_local}' "
-            "--peer-ia '1-ff00:0:112' --timeout 15s",
+            "--timeout 15s",
         )
         time.sleep(3)
 

pkg/snet/squic/hummingbirdtest/BUILD.bazel → pkg/hummingbird/hummingbirdtest/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@rules_go//go:def.bzl", "go_library")
+load("//tools:go.bzl", "go_test")
 
 go_library(
     name = "go_default_library",
@@ -7,17 +8,32 @@ go_library(
         "tls.key",
         "tls.pem",
     ],
-    importpath = "github.com/scionproto/scion/pkg/snet/squic/hummingbirdtest",
+    importpath = "github.com/scionproto/scion/pkg/hummingbird/hummingbirdtest",
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/addr:go_default_library",
         "//pkg/daemon:go_default_library",
         "//pkg/daemon/types:go_default_library",
         "//pkg/private/serrors:go_default_library",
+        "//pkg/slayers:go_default_library",
         "//pkg/slayers/path/hummingbird:go_default_library",
+        "//pkg/slayers/path/scion:go_default_library",
         "//pkg/snet:go_default_library",
         "//pkg/snet/path:go_default_library",
         "//private/keyconf:go_default_library",
         "@com_github_quic_go_quic_go//:go_default_library",
     ],
 )
+
+go_test(
+    name = "go_default_test",
+    srcs = ["helpers_test.go"],
+    embed = [":go_default_library"],
+    deps = [
+        "//pkg/addr:go_default_library",
+        "//pkg/slayers/path:go_default_library",
+        "//pkg/slayers/path/scion:go_default_library",
+        "//pkg/snet/path:go_default_library",
+        "@com_github_stretchr_testify//require:go_default_library",
+    ],
+)