r1

scionproto · Oct 21, 2020 · 3b2ed55 · 3b2ed55
1 parent 8ae367c
commit 3b2ed55
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 26 deletions.
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,10 +280,6 @@ func testSegment(g *graph.Graph, ifids []common.IFIDType) *seg.PathSegment {
 	return pseg
 }
 
-func testPath(ingressIfid common.IFIDType) spath.Path {
-	return spath.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/lib/snet/path.go b/go/lib/snet/path.go
@@ -119,10 +119,7 @@ func (p *partialPath) UnderlayNextHop() *net.UDPAddr {
 }
 
 func (p *partialPath) Path() spath.Path {
-	return spath.Path{
-		Raw:  append(p.spath.Raw[:0:0], p.spath.Raw...),
-		Type: p.spath.Type,
-	}
+	return p.spath.Copy()
 }
 
 func (p *partialPath) Interfaces() []PathInterface {

diff --git a/go/lib/snet/path/path.go b/go/lib/snet/path/path.go
@@ -57,10 +57,7 @@ func (p Path) UnderlayNextHop() *net.UDPAddr {
 }
 
 func (p Path) Path() spath.Path {
-	return spath.Path{
-		Raw:  append(p.SPath.Raw[:0:0], p.SPath.Raw...),
-		Type: p.SPath.Type,
-	}
+	return p.SPath.Copy()
 }
 
 func (p Path) Interfaces() []snet.PathInterface {

diff --git a/go/lib/svc/svc.go b/go/lib/svc/svc.go
@@ -202,10 +202,7 @@ func (h *BaseHandler) Handle(request *Request) (Result, error) {
 
 func (h *BaseHandler) reversePath(path spath.Path) (spath.Path, error) {
 	// Reverse copy to not modify input packet
-	path = spath.Path{
-		Raw:  append(path.Raw[:0:0], path.Raw...),
-		Type: path.Type,
-	}
+	path = path.Copy()
 	if err := path.Reverse(); err != nil {
 		return path, err
 	}

diff --git a/go/pkg/traceroute/BUILD.bazel b/go/pkg/traceroute/BUILD.bazel
@@ -14,6 +14,5 @@ go_library(
         "//go/lib/slayers/path/scion:go_default_library",
         "//go/lib/snet:go_default_library",
         "//go/lib/sock/reliable:go_default_library",
-        "//go/lib/spath:go_default_library",
     ],
 )
diff --git a/go/pkg/traceroute/traceroute.go b/go/pkg/traceroute/traceroute.go
@@ -29,7 +29,6 @@ import (
 	"github.com/scionproto/scion/go/lib/slayers/path/scion"
 	"github.com/scionproto/scion/go/lib/snet"
 	"github.com/scionproto/scion/go/lib/sock/reliable"
-	"github.com/scionproto/scion/go/lib/spath"
 )
 
 // Update contains the information for a single hop.
@@ -291,7 +290,7 @@ func (h scmpHandler) Handle(pkt *snet.Packet) error {
 		Remote: &snet.UDPAddr{
 			IA:   pkt.Source.IA,
 			Host: &net.UDPAddr{IP: pkt.Destination.Host.IP()},
-			Path: spath.Path{Raw: append(pkt.Path.Raw[:0:0], pkt.Path.Raw...), Type: pkt.Path.Type},
+			Path: pkt.Path.Copy(),
 		},
 		Error: err,
 	}