router: implement reviewers suggestions.

.buildkite/pipeline_lib.sh

@@ -13,12 +13,6 @@ gen_bazel_test_steps() {
         cache=""
         args=""
 
-	# Tell the test that it is being used for CI testing. That may trigger additional checks.
-	# only one test understands this at this point and most tests reject unknown flags.
-        if [[ "$test" =~ router_benchmark ]]; then
-            args="--test_arg=--ci"
-	fi
-
         if [[ "$test" =~ "go" ]]; then
           args="$args --test_arg=-test.v"
         fi

acceptance/router_benchmark/test.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2020 Anapaya Systems
+# Copyright 2023 SCION Association
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ class Test(base.TestTopogen):
     ci = cli.Flag(
         "ci",
         help="Do extra checks for CI",
+        envname="CI"
     )
 
     def setup_prepare(self):

pkg/snet/dispatcher.go

@@ -58,17 +58,6 @@ func (s *DefaultPacketDispatcherService) Register(
 	registration *net.UDPAddr,
 	svc addr.SVC) (PacketConn, uint16, error) {
 
-	// If now flowID is specified, use the backward compatible value of 1.
-	return s.RegisterWithFlowID(ctx, ia, registration, svc, 1)
-}
-
-func (s *DefaultPacketDispatcherService) RegisterWithFlowID(
-	ctx context.Context,
-	ia addr.IA,
-	registration *net.UDPAddr,
-	svc addr.SVC,
-	flowID uint32) (PacketConn, uint16, error) {
-
 	rconn, port, err := s.Dispatcher.Register(ctx, ia, registration, svc)
 	if err != nil {
 		return nil, 0, err
@@ -77,7 +66,6 @@ func (s *DefaultPacketDispatcherService) RegisterWithFlowID(
 		Conn:        rconn,
 		SCMPHandler: s.SCMPHandler,
 		Metrics:     s.SCIONPacketConnMetrics,
-		FlowID:      flowID,
 	}, port, nil
 }
 

pkg/snet/packet.go

@@ -519,12 +519,6 @@ func (p *Packet) Decode() error {
 
 // Serialize serializes the PacketInfo into the raw buffer of the packet.
 func (p *Packet) Serialize() error {
-	// Use the bw compatible default value.
-	return p.SerializeWithFlowID(1)
-}
-
-// Serialize serializes the PacketInfo into the raw buffer of the packet.
-func (p *Packet) SerializeWithFlowID(flowID uint32) error {
 	p.Prepare()
 	if p.Payload == nil {
 		return serrors.New("no payload set")

pkg/snet/packet_conn.go

@@ -113,9 +113,6 @@ type SCIONPacketConn struct {
 	SCMPHandler SCMPHandler
 	// Metrics are the metrics exported by the conn.
 	Metrics SCIONPacketConnMetrics
-	// FlowID: arbitrary value to distribute connections over router CPUs.
-	// Initialize to 1 if backward compatible (no-distribution) behavior is desired.
-	FlowID uint32
 }
 
 func (c *SCIONPacketConn) SetDeadline(d time.Time) error {
@@ -128,7 +125,7 @@ func (c *SCIONPacketConn) Close() error {
 }
 
 func (c *SCIONPacketConn) WriteTo(pkt *Packet, ov *net.UDPAddr) error {
-	if err := pkt.SerializeWithFlowID(c.FlowID); err != nil {
+	if err := pkt.Serialize(); err != nil {
 		return serrors.WrapStr("serialize SCION packet", err)
 	}
 	// Send message

tools/end2end/main.go

@@ -35,7 +35,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"math/rand"
 	"net"
 	"net/netip"
 	"os"
@@ -314,8 +313,8 @@ func (c *client) run() int {
 	}
 
 	var err error
-	c.conn, c.port, err = connFactory.RegisterWithFlowID(context.Background(), integration.Local.IA,
-		integration.Local.Host, addr.SvcNone, rand.Uint32())
+	c.conn, c.port, err = connFactory.Register(context.Background(), integration.Local.IA,
+		integration.Local.Host, addr.SvcNone)
 	if err != nil {
 		integration.LogFatal("Unable to listen", "err", err)
 	}
@@ -486,7 +485,7 @@ func (c *client) drainPong(n int) bool {
 	return false // Don't stop; keep consuming pongs
 }
 
-func (c *client) ping(ctx context.Context, n int, path snet.Path, log_ok bool) error {
+func (c *client) ping(ctx context.Context, n int, path snet.Path, logIfOk bool) error {
 	rawPing, err := json.Marshal(Ping{
 		Server:  remote.IA,
 		Message: ping,
@@ -531,7 +530,7 @@ func (c *client) ping(ctx context.Context, n int, path snet.Path, log_ok bool) e
 			},
 		},
 	}
-	if log_ok {
+	if logIfOk {
 		log.Info("sending ping", "attempt", n, "path", path)
 	}
 	if err := c.conn.WriteTo(pkt, remote.NextHop); err != nil {

tools/integration/integrationlib/common.go

@@ -143,11 +143,13 @@ type AttemptFunc func(n int) bool
 // Returns 0 on success, 1 on failure.
 func AttemptRepeatedly(name string, attempt AttemptFunc) int {
 	for attempts := 0; attempts < Attempts; attempts++ {
+		if attempts != 0 {
+			log.Info("Retrying...")
+			time.Sleep(integration.RetryTimeout)
+		}
 		if attempt(attempts) {
 			return 0
 		}
-		log.Info("Retrying...")
-		time.Sleep(integration.RetryTimeout)
 	}
 	log.Error(fmt.Sprintf("%s failed. No more attempts...", name))
 	return 1