spath: drop old header code (#3909)

Drops all code supporting the legacy header format. Also since the Path struct is now that simple it is passed by value instead of pointer.
scionproto · Oct 21, 2020 · c312887 · c312887
1 parent 7b6582f
commit c312887
Show file tree

Hide file tree

Showing 70 changed files with 251 additions and 1,246 deletions.
diff --git a/go/cs/beacon/BUILD.bazel b/go/cs/beacon/BUILD.bazel
@@ -23,7 +23,6 @@ go_library(
         "//go/lib/log:go_default_library",
         "//go/lib/prom:go_default_library",
         "//go/lib/serrors:go_default_library",
-        "//go/lib/spath:go_default_library",
         "//go/lib/tracing:go_default_library",
         "//go/lib/util:go_default_library",
         "//go/pkg/proto/control_plane:go_default_library",
@@ -55,7 +54,6 @@ go_test(
         "//go/lib/ctrl/seg:go_default_library",
         "//go/lib/hiddenpath:go_default_library",
         "//go/lib/hiddenpath/hiddenpathtest:go_default_library",
-        "//go/lib/spath:go_default_library",
         "//go/lib/util:go_default_library",
         "//go/lib/xtest:go_default_library",
         "//go/lib/xtest/graph:go_default_library",

diff --git a/go/cs/beacon/beacondbtest/BUILD.bazel b/go/cs/beacon/beacondbtest/BUILD.bazel
@@ -12,7 +12,7 @@ go_library(
         "//go/lib/ctrl/path_mgmt:go_default_library",
         "//go/lib/ctrl/seg:go_default_library",
         "//go/lib/infra:go_default_library",
-        "//go/lib/spath:go_default_library",
+        "//go/lib/slayers/path:go_default_library",
         "//go/lib/util:go_default_library",
         "//go/lib/xtest/graph:go_default_library",
         "//go/proto:go_default_library",

diff --git a/go/cs/beacon/beacondbtest/beacondbtest.go b/go/cs/beacon/beacondbtest/beacondbtest.go
@@ -31,7 +31,7 @@ import (
 	"github.com/scionproto/scion/go/lib/ctrl/path_mgmt"
 	"github.com/scionproto/scion/go/lib/ctrl/seg"
 	"github.com/scionproto/scion/go/lib/infra"
-	"github.com/scionproto/scion/go/lib/spath"
+	"github.com/scionproto/scion/go/lib/slayers/path"
 	"github.com/scionproto/scion/go/lib/util"
 	"github.com/scionproto/scion/go/lib/xtest/graph"
 	"github.com/scionproto/scion/go/proto"
@@ -356,7 +356,7 @@ func testDeleteExpiredBeacons(t *testing.T, ctrl *gomock.Controller, db beacon.D
 	ts1 := uint32(10)
 	ts2 := uint32(20)
 	// defaultExp is the default expiry of the hopfields.
-	defaultExp := spath.DefaultHopFExpiry.ToDuration()
+	defaultExp := path.ExpTimeToDuration(63)
 	ctx, cancelF := context.WithTimeout(context.Background(), timeout)
 	defer cancelF()
 	InsertBeacon(t, ctrl, db, Info3, 12, ts1, beacon.UsageProp)
@@ -787,7 +787,7 @@ func AllocBeacon(t *testing.T, ctrl *gomock.Controller, ases []IfInfo, inIfId co
 				PeerInterface: 1337,
 				PeerMTU:       1500,
 				HopField: seg.HopField{
-					ExpTime:     uint8(spath.DefaultHopFExpiry),
+					ExpTime:     63,
 					ConsIngress: uint16(peer.Ingress),
 					ConsEgress:  uint16(as.Egress),
 					MAC:         bytes.Repeat([]byte{0xff}, 6),
@@ -801,7 +801,7 @@ func AllocBeacon(t *testing.T, ctrl *gomock.Controller, ases []IfInfo, inIfId co
 			HopEntry: seg.HopEntry{
 				IngressMTU: mtu,
 				HopField: seg.HopField{
-					ExpTime:     uint8(spath.DefaultHopFExpiry),
+					ExpTime:     63,
 					ConsIngress: uint16(as.Ingress),
 					ConsEgress:  uint16(as.Egress),
 					MAC:         bytes.Repeat([]byte{0xff}, 6),

diff --git a/go/cs/beacon/policy.go b/go/cs/beacon/policy.go
@@ -22,7 +22,6 @@ import (
 	"github.com/scionproto/scion/go/lib/addr"
 	"github.com/scionproto/scion/go/lib/common"
 	"github.com/scionproto/scion/go/lib/serrors"
-	"github.com/scionproto/scion/go/lib/spath"
 )
 
 // PolicyType is the policy type.
@@ -47,7 +46,7 @@ const (
 	// DefaultMaxHopsLength is the default MaxHopsLength value.
 	DefaultMaxHopsLength = 10
 	// DefaultMaxExpTime is the default MaxExpTime value.
-	DefaultMaxExpTime = spath.DefaultHopFExpiry
+	DefaultMaxExpTime = uint8(63)
 )
 
 // Policies keeps track of all policies for a non-core beacon store.
@@ -184,7 +183,7 @@ type Policy struct {
 	CandidateSetSize int `yaml:"CandidateSetSize"`
 	// MaxExpTime indicates the maximum value for the expiration time when
 	// extending the segment.
-	MaxExpTime *spath.ExpTimeType `yaml:"MaxExpTime"`
+	MaxExpTime *uint8 `yaml:"MaxExpTime"`
 	// Filter is the filter applied to segments.
 	Filter Filter `yaml:"Filter"`
 	// Type is the policy type.

diff --git a/go/cs/beacon/policy_test.go b/go/cs/beacon/policy_test.go
@@ -22,7 +22,6 @@ import (
 	"github.com/scionproto/scion/go/cs/beacon"
 	"github.com/scionproto/scion/go/lib/addr"
 	"github.com/scionproto/scion/go/lib/ctrl/seg"
-	"github.com/scionproto/scion/go/lib/spath"
 	"github.com/scionproto/scion/go/lib/xtest"
 )
 
@@ -71,7 +70,7 @@ func TestLoadPolicyFromYaml(t *testing.T) {
 			assert.Equal(t, 6, p.BestSetSize)
 			assert.Equal(t, 20, p.CandidateSetSize)
 			assert.Equal(t, test.Type, p.Type)
-			assert.Equal(t, spath.ExpTimeType(42), *p.MaxExpTime)
+			assert.Equal(t, uint8(42), *p.MaxExpTime)
 			assert.Equal(t, 8, p.Filter.MaxHopsLength)
 			assert.Equal(t, []addr.AS{ia110.A, ia111.A}, p.Filter.AsBlackList)
 			assert.Equal(t, []addr.ISD{1, 2, 3}, p.Filter.IsdBlackList)

diff --git a/go/cs/beacon/store.go b/go/cs/beacon/store.go
@@ -25,7 +25,6 @@ import (
 	"github.com/scionproto/scion/go/lib/ctrl/seg"
 	"github.com/scionproto/scion/go/lib/log"
 	"github.com/scionproto/scion/go/lib/serrors"
-	"github.com/scionproto/scion/go/lib/spath"
 )
 
 const maxResultChanSize = 32
@@ -102,7 +101,7 @@ func (s *Store) getBeacons(ctx context.Context, policy *Policy) (<-chan BeaconOr
 }
 
 // MaxExpTime returns the segment maximum expiration time for the given policy.
-func (s *Store) MaxExpTime(policyType PolicyType) spath.ExpTimeType {
+func (s *Store) MaxExpTime(policyType PolicyType) uint8 {
 	switch policyType {
 	case UpRegPolicy:
 		return *s.policies.UpReg.MaxExpTime
@@ -200,7 +199,7 @@ func (s *CoreStore) getBeacons(ctx context.Context, policy *Policy) (<-chan Beac
 }
 
 // MaxExpTime returns the segment maximum expiration time for the given policy.
-func (s *CoreStore) MaxExpTime(policyType PolicyType) spath.ExpTimeType {
+func (s *CoreStore) MaxExpTime(policyType PolicyType) uint8 {
 	switch policyType {
 	case CoreRegPolicy:
 		return *s.policies.CoreReg.MaxExpTime

diff --git a/go/cs/beaconing/BUILD.bazel b/go/cs/beaconing/BUILD.bazel
@@ -32,7 +32,6 @@ go_library(
         "//go/lib/serrors:go_default_library",
         "//go/lib/slayers/path:go_default_library",
         "//go/lib/snet:go_default_library",
-        "//go/lib/spath:go_default_library",
         "//go/lib/topology:go_default_library",
         "//go/lib/tracing:go_default_library",
         "//go/lib/util:go_default_library",

diff --git a/go/cs/beaconing/extender.go b/go/cs/beaconing/extender.go
@@ -27,7 +27,6 @@ import (
 	"github.com/scionproto/scion/go/lib/log"
 	"github.com/scionproto/scion/go/lib/serrors"
 	"github.com/scionproto/scion/go/lib/slayers/path"
-	"github.com/scionproto/scion/go/lib/spath"
 	"github.com/scionproto/scion/go/lib/topology"
 	"github.com/scionproto/scion/go/lib/util"
 )
@@ -258,7 +257,7 @@ func intfActive(intfs *ifstate.Interfaces, ifid common.IFIDType) bool {
 	return intf != nil && intf.State() == ifstate.Active
 }
 
-func min(a, b spath.ExpTimeType) spath.ExpTimeType {
+func min(a, b uint8) uint8 {
 	if a > b {
 		return b
 	}

diff --git a/go/cs/beaconing/extender_test.go b/go/cs/beaconing/extender_test.go
@@ -35,7 +35,6 @@ import (
 	"github.com/scionproto/scion/go/lib/ctrl/seg"
 	"github.com/scionproto/scion/go/lib/infra/modules/itopo/itopotest"
 	"github.com/scionproto/scion/go/lib/scrypto"
-	"github.com/scionproto/scion/go/lib/spath"
 	"github.com/scionproto/scion/go/lib/xtest/graph"
 	cryptopb "github.com/scionproto/scion/go/pkg/proto/crypto"
 )
@@ -276,8 +275,8 @@ func (f *failSigner) Sign(context.Context, []byte, ...[]byte) (*cryptopb.SignedM
 	return nil, errors.New("fail")
 }
 
-func maxExpTimeFactory(max spath.ExpTimeType) func() spath.ExpTimeType {
-	return func() spath.ExpTimeType {
+func maxExpTimeFactory(max uint8) func() uint8 {
+	return func() uint8 {
 		return max
 	}
 }

diff --git a/go/cs/beaconing/grpc/creation_server.go b/go/cs/beaconing/grpc/creation_server.go
@@ -81,21 +81,14 @@ func (s SegmentCreationServer) Beacon(ctx context.Context,
 }
 
 // extractIngressIfID extracts the ingress interface ID from a path.
-func extractIngressIfID(path *spath.Path) (common.IFIDType, error) {
-	if path.IsHeaderV2() {
-		var sp scion.Raw
-		if err := sp.DecodeFromBytes(path.Raw); err != nil {
-			return 0, serrors.WrapStr("decoding path (v2)", err)
-		}
-		hf, err := sp.GetCurrentHopField()
-		if err != nil {
-			return 0, serrors.WrapStr("getting current hop field", err)
-		}
-		return common.IFIDType(hf.ConsIngress), nil
+func extractIngressIfID(path spath.Path) (common.IFIDType, error) {
+	var sp scion.Raw
+	if err := sp.DecodeFromBytes(path.Raw); err != nil {
+		return 0, serrors.WrapStr("decoding path (v2)", err)
 	}
-	hopF, err := path.GetHopField(path.HopOff)
+	hf, err := sp.GetCurrentHopField()
 	if err != nil {
-		return 0, serrors.WrapStr("extracting hop field", err)
+		return 0, serrors.WrapStr("getting current hop field", err)
 	}
-	return hopF.ConsIngress, nil
+	return common.IFIDType(hf.ConsIngress), nil
 }
diff --git a/go/cs/beaconing/handler_test.go b/go/cs/beaconing/handler_test.go
@@ -86,7 +86,7 @@ func TestHandlerHandleBeacon(t *testing.T) {
 			Peer: func() *snet.UDPAddr {
 				return &snet.UDPAddr{
 					IA:   addr.IA{},
-					Path: testPath(localIF),
+					Path: spath.Path{},
 				}
 			},
 			Assertion: assert.NoError,
@@ -110,7 +110,7 @@ func TestHandlerHandleBeacon(t *testing.T) {
 			Peer: func() *snet.UDPAddr {
 				return &snet.UDPAddr{
 					IA:   addr.IA{},
-					Path: testPath(12),
+					Path: spath.Path{},
 				}
 			},
 			Assertion: assert.Error,
@@ -136,7 +136,7 @@ func TestHandlerHandleBeacon(t *testing.T) {
 			Peer: func() *snet.UDPAddr {
 				return &snet.UDPAddr{
 					IA:   addr.IA{},
-					Path: testPath(42),
+					Path: spath.Path{},
 				}
 			},
 			Assertion: assert.Error,
@@ -165,7 +165,7 @@ func TestHandlerHandleBeacon(t *testing.T) {
 			Peer: func() *snet.UDPAddr {
 				return &snet.UDPAddr{
 					IA:   addr.IA{},
-					Path: testPath(localIF),
+					Path: spath.Path{},
 				}
 			},
 			Assertion: assert.Error,
@@ -193,7 +193,7 @@ func TestHandlerHandleBeacon(t *testing.T) {
 			Peer: func() *snet.UDPAddr {
 				return &snet.UDPAddr{
 					IA:   addr.IA{},
-					Path: testPath(localIF),
+					Path: spath.Path{},
 				}
 			},
 			Assertion: assert.Error,
@@ -218,7 +218,7 @@ func TestHandlerHandleBeacon(t *testing.T) {
 			Peer: func() *snet.UDPAddr {
 				return &snet.UDPAddr{
 					IA:   addr.IA{},
-					Path: testPath(localIF),
+					Path: spath.Path{},
 				}
 			},
 			Assertion: assert.Error,
@@ -246,7 +246,7 @@ func TestHandlerHandleBeacon(t *testing.T) {
 			Peer: func() *snet.UDPAddr {
 				return &snet.UDPAddr{
 					IA:   addr.IA{},
-					Path: testPath(localIF),
+					Path: spath.Path{},
 				}
 			},
 			Assertion: assert.Error,
@@ -280,16 +280,6 @@ func testSegment(g *graph.Graph, ifids []common.IFIDType) *seg.PathSegment {
 	return pseg
 }
 
-func testPath(ingressIfid common.IFIDType) *spath.Path {
-	path := &spath.Path{
-		Raw:    make(common.RawBytes, spath.InfoFieldLength+spath.HopFieldLength),
-		HopOff: spath.InfoFieldLength,
-	}
-	(&spath.InfoField{Hops: 1}).Write(path.Raw[:spath.InfoFieldLength])
-	(&spath.HopField{ConsIngress: ingressIfid}).Write(path.Raw[spath.InfoFieldLength:])
-	return path
-}
-
 func testInterfaces(topo topology.Topology) *ifstate.Interfaces {
 	intfs := ifstate.NewInterfaces(topo.IFInfoMap(), ifstate.Config{})
 	intfs.Get(graph.If_110_X_120_A).Activate(graph.If_120_A_110_X)

diff --git a/go/cs/onehop/sender.go b/go/cs/onehop/sender.go
@@ -83,7 +83,7 @@ func (s *Sender) CreatePkt(msg *Msg) (*snet.Packet, error) {
 				IA:   s.IA,
 				Host: addr.HostFromIP(s.Addr.IP),
 			},
-			Path: (*spath.Path)(path),
+			Path: (spath.Path)(path),
 			Payload: snet.UDPPayload{
 				SrcPort: uint16(s.Addr.Port),
 				Payload: msg.Pld,
@@ -94,15 +94,15 @@ func (s *Sender) CreatePkt(msg *Msg) (*snet.Packet, error) {
 }
 
 // CreatePath creates the one-hop path and initializes it.
-func (s *Sender) CreatePath(ifid common.IFIDType, now time.Time) (*Path, error) {
+func (s *Sender) CreatePath(ifid common.IFIDType, now time.Time) (Path, error) {
 	s.macMtx.Lock()
 	defer s.macMtx.Unlock()
 
-	path, err := spath.NewOneHopV2(s.IA.I, ifid, now, spath.DefaultHopFExpiry, s.MAC)
+	path, err := spath.NewOneHop(s.IA.I, uint16(ifid), now, 63, s.MAC)
 	if err != nil {
-		return nil, err
+		return Path{}, err
 	}
-	return (*Path)(path), nil
+	return (Path)(path), nil
 }
 
 // RPC is used to send beacons.
@@ -130,7 +130,7 @@ func (s *BeaconSender) Send(ctx context.Context, bseg *seg.PathSegment, ia addr.
 
 	svc := &snet.SVCAddr{
 		IA:      ia,
-		Path:    (*spath.Path)(path),
+		Path:    (spath.Path)(path),
 		NextHop: ov,
 		SVC:     addr.SvcCS,
 	}

diff --git a/go/hidden_path_srv/internal/registration/handler_test.go b/go/hidden_path_srv/internal/registration/handler_test.go
@@ -110,7 +110,7 @@ func TestSegReg(t *testing.T) {
 					Recs:    []*seg.Meta{seg110_133},
 				},
 			}
-			peer := &snet.UDPAddr{IA: addr.IA{}, Path: &spath.Path{}}
+			peer := &snet.UDPAddr{IA: addr.IA{}, Path: spath.Path{}}
 			req := infra.NewRequest(ctx, msg, nil, peer, 0)
 			ack := ack.Ack{
 				Err:     proto.Ack_ErrCode_reject,

diff --git a/go/integration/end2end/main.go b/go/integration/end2end/main.go
@@ -144,11 +144,9 @@ func (s server) run() {
 		}
 		log.Debug(fmt.Sprintf("Ping received from %s, sending pong.", p.Source))
 		// reverse path
-		if p.Path != nil {
-			if err := p.Path.Reverse(); err != nil {
-				log.Debug(fmt.Sprintf("Error reversing path, err = %v", err))
-				continue
-			}
+		if err := p.Path.Reverse(); err != nil {
+			log.Debug(fmt.Sprintf("Error reversing path, err = %v", err))
+			continue
 		}
 		// Send pong
 		if err := conn.WriteTo(&p, &ov); err != nil {

diff --git a/go/lib/ctrl/seg/BUILD.bazel b/go/lib/ctrl/seg/BUILD.bazel
@@ -20,7 +20,7 @@ go_library(
         "//go/lib/common:go_default_library",
         "//go/lib/scrypto/signed:go_default_library",
         "//go/lib/serrors:go_default_library",
-        "//go/lib/spath:go_default_library",
+        "//go/lib/slayers/path:go_default_library",
         "//go/lib/util:go_default_library",
         "//go/pkg/proto/control_plane:go_default_library",
         "//go/pkg/proto/crypto:go_default_library",
@@ -38,10 +38,8 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//go/lib/addr:go_default_library",
-        "//go/lib/common:go_default_library",
         "//go/lib/scrypto/signed:go_default_library",
         "//go/lib/serrors:go_default_library",
-        "//go/lib/spath:go_default_library",
         "//go/lib/xtest:go_default_library",
         "//go/pkg/proto/crypto:go_default_library",
         "@com_github_golang_mock//gomock:go_default_library",

diff --git a/go/lib/ctrl/seg/seg.go b/go/lib/ctrl/seg/seg.go
@@ -30,7 +30,7 @@ import (
 	"github.com/scionproto/scion/go/lib/addr"
 	"github.com/scionproto/scion/go/lib/scrypto/signed"
 	"github.com/scionproto/scion/go/lib/serrors"
-	"github.com/scionproto/scion/go/lib/spath"
+	"github.com/scionproto/scion/go/lib/slayers/path"
 	"github.com/scionproto/scion/go/lib/util"
 	cppb "github.com/scionproto/scion/go/pkg/proto/control_plane"
 	cryptopb "github.com/scionproto/scion/go/pkg/proto/crypto"
@@ -213,7 +213,7 @@ func (ps *PathSegment) MaxExpiry() time.Time {
 // MinExpiry returns the minimum expiry of all hop fields.
 // Assumes segment is validated.
 func (ps *PathSegment) MinExpiry() time.Time {
-	return ps.expiry(spath.MaxTTL*time.Second, func(hfTtl time.Duration, ttl time.Duration) bool {
+	return ps.expiry(path.MaxTTL*time.Second, func(hfTtl time.Duration, ttl time.Duration) bool {
 		return hfTtl < ttl
 	})
 }
@@ -223,12 +223,12 @@ func (ps *PathSegment) expiry(initTTL time.Duration,
 
 	ttl := initTTL
 	for _, asEntry := range ps.ASEntries {
-		hfTTL := spath.ExpTimeType(asEntry.HopEntry.HopField.ExpTime).ToDuration()
+		hfTTL := path.ExpTimeToDuration(asEntry.HopEntry.HopField.ExpTime)
 		if compare(hfTTL, ttl) {
 			ttl = hfTTL
 		}
 		for _, peer := range asEntry.PeerEntries {
-			hfTTL := spath.ExpTimeType(peer.HopField.ExpTime).ToDuration()
+			hfTTL := path.ExpTimeToDuration(peer.HopField.ExpTime)
 			if compare(hfTTL, ttl) {
 				ttl = hfTTL
 			}