router: afpacket udp underlay

.buildkite/pipeline.yml

@@ -125,6 +125,7 @@ steps:
         - ./scion.sh topology -c topology/default.topo
         - ./scion.sh run
         - tools/await-connectivity
+        - sleep 5
         - ./bin/scion_integration || ( echo "^^^ +++" && false )
         - ./bin/end2end_integration || ( echo "^^^ +++" && false )
       plugins: &scion-run-hooks
@@ -141,7 +142,7 @@ steps:
             pre-exit: .buildkite/cleanup-leftovers.sh
       artifact_paths: &scion-run-artifact-paths
         - test-out.tar.gz
-      timeout_in_minutes: 15
+      timeout_in_minutes: 20
       key: e2e_integration_tests_v2
       retry: *automatic-retry
     - label: "E2E: failing links :man_in_business_suit_levitating:"
@@ -152,6 +153,7 @@ steps:
         - ./scion.sh topology -c topology/default-no-peers.topo
         - ./scion.sh run
         - tools/await-connectivity
+        - sleep 5
         - ./bin/end2end_integration || ( echo "^^^ +++" && false )
         - ./tools/integration/revocation_test.sh
       plugins: *scion-run-hooks
@@ -167,6 +169,7 @@ steps:
         - ./scion.sh topology -d
         - ./scion.sh run
         - tools/await-connectivity
+        - sleep 5
         - echo "--- run tests"
         - ./bin/end2end_integration -d || ( echo "^^^ +++" && false )
       plugins: *scion-run-hooks

.golangci.yml

@@ -41,24 +41,29 @@ linters:
           msg: spell trust root certificate as trc / TRC
     goheader:
       values:
-        regexp:
-          copyright-lines: |-
-            (Copyright 20[0-9][0-9] .*)(
-            Copyright 20[0-9][0-9] .*)*
-      template: |-
-        {{copyright-lines}}
-
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
+        const:
+          LICENSE_TEXT: |-
+            Licensed under the Apache License, Version 2.0 \(the "License"\);
+            you may not use this file except in compliance with the License.
+            You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+              http://www.apache.org/licenses/LICENSE-2.0
 
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
+            Unless required by applicable law or agreed to in writing, software
+            distributed under the License is distributed on an "AS IS" BASIS,
+            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+            See the License for the specific language governing permissions and
+            limitations under the License.
+          SPDX_LINE: |-
+            SPDX-License-Identifier: Apache-2.0
+        regexp:
+          copyright_lines: |-
+            (Copyright 20[0-9][0-9] .*)
+            (Copyright 20[0-9][0-9] .*)*
+          license: |-
+            ({{SPDX_LINE}})|({{LICENSE_TEXT}})
+      template: |-
+        {{copyright_lines}}{{license}}
     lll:
       line-length: 100
       tab-width: 4

Makefile

@@ -6,11 +6,13 @@ build-dev:
 	tar -kxf bazel-bin/scion.tar -C bin
 	tar -kxf bazel-bin/scion-ci.tar -C bin
 	tar -kxf bazel-bin/scion-topo.tar -C bin
+	sudo setcap "cap_bpf=ep cap_net_admin=ep cap_net_raw=ep" bin/router
 
 build:
 	rm -f bin/*
 	bazel build //:scion
 	tar -kxf bazel-bin/scion.tar -C bin
+	sudo setcap "cap_bpf=ep cap_net_admin=ep cap_net_raw=ep" bin/router
 
 # BFLAGS is optional. It may contain additional command line flags for CI builds. Currently this is:
 # "--file_name_version=$(tools/git-version)" to include the git version in the artifacts names.

acceptance/common/raw.bzl

@@ -51,7 +51,7 @@ def raw_test(
     py_binary(
         name = "%s_teardown" % name,
         srcs = [src],
-        args = ["teardown"],
+        args = ["teardown"] + args,
         main = src,
         deps = [":%s_lib" % name],
         imports = imports,

acceptance/common/topogen.bzl

@@ -108,7 +108,7 @@ def topogen_test(
 
     py_test(
         name = name,
-        size = "large",
+        size = "medium",
         srcs = [src],
         main = src,
         args = args + common_args,

acceptance/hidden_paths/test.py

@@ -4,6 +4,7 @@
 
 import http.server
 import threading
+import time
 
 from acceptance.common import base
 from acceptance.common import scion
@@ -110,11 +111,11 @@ def setup_start(self):
         server_thread = threading.Thread(target=configuration_server, args=[server])
         server_thread.start()
         self._server = server
-
         super().setup_start()
 
-        self.await_connectivity()
-        self._server.shutdown()  # by now configuration must have been downloaded everywhere
+        self.await_connectivity()  # <- not very reliable
+        time.sleep(10)             # <- ...so
+        self._server.shutdown()    # by now configuration must have been downloaded everywhere
 
     def _run(self):
         # Group 3
@@ -141,7 +142,7 @@ def _showpaths_bidirectional(self, source: str, destination: str):
 
     def _showpaths_run(self, source_as: str, destination_as: str):
         print(self.execute_tester(ISD_AS(self._ases[source_as]),
-                                  "scion", "sp", self._ases[destination_as], "--timeout", "2s"))
+                                  "scion", "sp", self._ases[destination_as], "--timeout", "3s"))
 
 
 def configuration_server(server):

acceptance/router_benchmark/BUILD.bazel

@@ -48,18 +48,14 @@ py_library(
     srcs = ["benchmarklib.py"],
 )
 
-# To ensure that the linter runs over this. Cannot actually be run with
-# bazel run; it is meant to be executed from the command line.
 py_binary(
     name = "benchmark",
     srcs = ["benchmark.py"],
     args = [
         "--brload",
         "$(location //acceptance/router_benchmark/brload:brload)",
     ],
-    data = [
-        "//acceptance/router_benchmark/brload",
-    ],
+    data = data,
     imports = ["."],
     visibility = ["//visibility:public"],
     deps = [