Merge branch 'master' into tr_graph

Author: mwfarb

.gitignore

@@ -56,3 +56,6 @@ roughtime/timeserver/timeserver
 
 # vscode workspace
 *.code-workspace
+
+# IntelliJ IDEA workspace
+.idea/

Makefile

@@ -9,9 +9,14 @@ all: $(TARGETS)
 deps:
 	./deps.sh
 
+vendor: deps
+
 clean:
 	@$(foreach d,$(SRCDIRS),cd $(ROOT_DIR)/$(d) && go clean;)
 
+mrproper: clean
+	rm -rf vendor/*/
+
 install: all
 	@$(foreach d,$(SRCDIRS), cd $(ROOT_DIR)/$(d); cp $(shell basename $(d)) ~/go/bin;)
 

bat/bat.go

@@ -121,7 +121,7 @@ func init() {
 	}
 
 	// redirect SCION log to a log file
-	slog.SetupLogFile("scion", "log", "debug", 10, 10, 0)
+	slog.SetupLogFile("scion", "log", "debug", 10, 10, 0, 0)
 }
 
 func parsePrintOption(s string) {

bwtester/bwtestclient/bwtestclient.go

@@ -336,7 +336,7 @@ func main() {
 	}
 
 	var pathEntry *sciond.PathReplyEntry
-	if !serverCCAddr.IA.Eq(clientCCAddr.IA) {
+	if !serverCCAddr.IA.Equal(clientCCAddr.IA) {
 		if interactive {
 			pathEntry = scionutil.ChoosePathInteractive(clientCCAddr, serverCCAddr)
 		} else {
@@ -373,7 +373,7 @@ func main() {
 		L3: serverCCAddr.Host.L3, L4: addr.NewL4UDPInfo(uint16(serverPort) + 1)}}
 
 	// Set path on data connection
-	if !serverDCAddr.IA.Eq(clientDCAddr.IA) {
+	if !serverDCAddr.IA.Equal(clientDCAddr.IA) {
 		serverDCAddr.Path = spath.New(pathEntry.Path.FwdPath)
 		serverDCAddr.Path.InitOffsets()
 		serverDCAddr.NextHop, _ = pathEntry.HostInfo.Overlay()

bwtester/bwtestserver/bwtestserver.go

@@ -22,6 +22,7 @@ import (
 	"github.com/scionproto/scion/go/lib/addr"
 	"github.com/scionproto/scion/go/lib/sciond"
 	"github.com/scionproto/scion/go/lib/snet"
+	"github.com/scionproto/scion/go/lib/sock/reliable"
 )
 
 func printUsage() {
@@ -149,7 +150,7 @@ func runServer() {
 		*sciondPath = sciond.GetDefaultSCIONDPath(nil)
 	}
 	log.Info("Starting server")
-	snet.Init(serverCCAddr.IA, *sciondPath, *dispatcherPath)
+	snet.Init(serverCCAddr.IA, *sciondPath, reliable.NewDispatcherService(*dispatcherPath))
 
 	serverISDASIP := fmt.Sprintf("%s,[%s]", serverCCAddr.IA, serverCCAddr.Host.L3)
 

camerapp/imagefetcher/imagefetcher.go

@@ -15,6 +15,7 @@ import (
 	"github.com/netsec-ethz/scion-apps/lib/scionutil"
 	"github.com/scionproto/scion/go/lib/sciond"
 	"github.com/scionproto/scion/go/lib/snet"
+	"github.com/scionproto/scion/go/lib/sock/reliable"
 )
 
 const (
@@ -165,6 +166,7 @@ func main() {
 		sciondPath     string
 		sciondFromIA   bool
 		dispatcherPath string
+		outputFilePath string
 
 		err    error
 		local  *snet.Addr
@@ -179,6 +181,7 @@ func main() {
 	flag.BoolVar(&sciondFromIA, "sciondFromIA", false, "SCIOND socket path from IA address:ISD-AS")
 	flag.StringVar(&dispatcherPath, "dispatcher", "/run/shm/dispatcher/default.sock",
 		"Path to dispatcher socket")
+	flag.StringVar(&outputFilePath, "output", "", "Path to the output file")
 	flag.Parse()
 
 	// Create SCION UDP socket
@@ -205,7 +208,7 @@ func main() {
 	} else if sciondPath == "" {
 		sciondPath = sciond.GetDefaultSCIONDPath(nil)
 	}
-	snet.Init(local.IA, sciondPath, dispatcherPath)
+	snet.Init(local.IA, sciondPath, reliable.NewDispatcherService(dispatcherPath))
 	udpConnection, err = snet.DialSCION("udp4", local, remote)
 	check(err)
 
@@ -280,7 +283,10 @@ func main() {
 	}
 
 	// Write file to disk
-	err = ioutil.WriteFile(fileName, fileBuffer, 0600)
+	if outputFilePath == "" {
+		outputFilePath = fileName
+	}
+	err = ioutil.WriteFile(outputFilePath, fileBuffer, 0600)
 	check(err)
 	fmt.Println("\nDone, exiting. Total duration", time.Now().Sub(startTime))
 }

camerapp/imageserver/imageserver.go

@@ -19,6 +19,7 @@ import (
 	"github.com/scionproto/scion/go/lib/addr"
 	"github.com/scionproto/scion/go/lib/sciond"
 	"github.com/scionproto/scion/go/lib/snet"
+	"github.com/scionproto/scion/go/lib/sock/reliable"
 )
 
 const (
@@ -167,7 +168,7 @@ func main() {
 	} else if sciondPath == "" {
 		sciondPath = sciond.GetDefaultSCIONDPath(nil)
 	}
-	snet.Init(server.IA, sciondPath, dispatcherPath)
+	snet.Init(server.IA, sciondPath, reliable.NewDispatcherService(dispatcherPath))
 	udpConnection, err = snet.ListenSCION("udp4", server)
 	check(err)
 

deps.sh

@@ -1,6 +1,15 @@
 #!/bin/bash
-printf "\n### Getting dependencies ###\n"
+set -e
+
+# version less or equal. E.g. verleq 1.9 2.0.8  == true (1.9 <= 2.0.8)
+verleq() {
+    [ ! -z "$1" ] && [ ! -z "$2" ] && [ "$1" = `echo -e "$1\n$2" | sort -V | head -n1` ]
+}
+
+V=$(go version | sed 's/^go version go\(.*\) .*$/\1/')
+if ! verleq 1.11.0 "$V"; then
+    echo "Go version 1.11 or newer required"
+    exit 1
+fi
+command -v govendor >/dev/null || go get github.com/kardianos/govendor
 govendor sync -v
-printf "\n### Compiling capnp ###\n"
-cp vendor/zombiezen.com/go/capnproto2/std/go.capnp vendor/github.com/scionproto/scion/proto/go.capnp
-cd vendor/github.com/scionproto/scion/go/proto && make

helloworld/helloworld.go

@@ -59,30 +59,33 @@ func main() {
 	// initialize SCION
 	err = snet.Init(clientCCAddr.IA, sciondPath, dispatcherPath)
 	Check(err)
-	// query paths from here to there:
-	pathMgr := snet.DefNetwork.PathResolver()
-	pathSet := pathMgr.Query(context.Background(), clientCCAddr.IA, serverCCAddr.IA)
-	if len(pathSet) == 0 {
-		Check(fmt.Errorf("No paths"))
-	}
-	// print all paths. Also pick one path. Here we chose the path with least hops:
-	i := 0
-	minLength, argMinPath := 999, (*sciond.PathReplyEntry)(nil)
-	fmt.Println("Available paths:")
-	for _, path := range pathSet {
-		fmt.Printf("[%2d] %d %s\n", i, len(path.Entry.Path.Interfaces)/2, path.Entry.Path.String())
-		if len(path.Entry.Path.Interfaces) < minLength {
-			minLength = len(path.Entry.Path.Interfaces)
-			argMinPath = path.Entry
+
+	if !serverCCAddr.IA.Equal(clientCCAddr.IA) {
+		// query paths from here to there:
+		pathMgr := snet.DefNetwork.PathResolver()
+		pathSet := pathMgr.Query(context.Background(), clientCCAddr.IA, serverCCAddr.IA, sciond.PathReqFlags{})
+		if len(pathSet) == 0 {
+			Check(fmt.Errorf("No paths"))
+		}
+		// print all paths. Also pick one path. Here we chose the path with least hops:
+		i := 0
+		minLength, argMinPath := 999, (*sciond.PathReplyEntry)(nil)
+		fmt.Println("Available paths:")
+		for _, path := range pathSet {
+			fmt.Printf("[%2d] %d %s\n", i, len(path.Entry.Path.Interfaces)/2, path.Entry.Path.String())
+			if len(path.Entry.Path.Interfaces) < minLength {
+				minLength = len(path.Entry.Path.Interfaces)
+				argMinPath = path.Entry
+			}
+			i++
 		}
-		i++
+		fmt.Println("Chosen path:", argMinPath.Path.String())
+		// we need to copy the path to the destination (destination is the whole selected path)
+		serverCCAddr.Path = spath.New(argMinPath.Path.FwdPath)
+		serverCCAddr.Path.InitOffsets()
+		serverCCAddr.NextHop, _ = argMinPath.HostInfo.Overlay()
+		// get a connection object using that path:
 	}
-	fmt.Println("Chosen path:", argMinPath.Path.String())
-	// we need to copy the path to the destination (destination is the whole selected path)
-	serverCCAddr.Path = spath.New(argMinPath.Path.FwdPath)
-	serverCCAddr.Path.InitOffsets()
-	serverCCAddr.NextHop, _ = argMinPath.HostInfo.Overlay()
-	// get a connection object using that path:
 	conn, err := snet.DialSCION("udp4", clientCCAddr, serverCCAddr)
 	Check(err)
 	defer conn.Close()

lib/scionutil/initialization.go

@@ -23,6 +23,7 @@ import (
 	"github.com/scionproto/scion/go/lib/addr"
 	"github.com/scionproto/scion/go/lib/sciond"
 	"github.com/scionproto/scion/go/lib/snet"
+	"github.com/scionproto/scion/go/lib/sock/reliable"
 )
 
 const localhost = "localhost"
@@ -60,8 +61,8 @@ func GetSCIONDPath(ia *addr.IA) string {
 }
 
 // GetDefaultDispatcher returns the path to the default SCION dispatcher
-func GetDefaultDispatcher() string {
-	return "/run/shm/dispatcher/default.sock"
+func GetDefaultDispatcher() reliable.DispatcherService {
+	return reliable.NewDispatcherService("")
 }
 
 // GetLocalhost returns a local SCION address an application can bind to