Remove netcat/utils, now in netcat/main.go

Author: N2D4

netcat/main.go

@@ -9,8 +9,11 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/netsec-ethz/scion-apps/netcat/utils"
+	quic "github.com/lucas-clemente/quic-go"
+	"github.com/netsec-ethz/scion-apps/lib/scionutil"
 	"github.com/scionproto/scion/go/lib/log"
+	"github.com/scionproto/scion/go/lib/snet"
+	"github.com/scionproto/scion/go/lib/snet/squic"
 )
 
 func printUsage() {
@@ -19,7 +22,7 @@ func printUsage() {
 	fmt.Println("Example SCION address: 17-ffaa:1:bfd,[127.0.0.1]:42002")
 	fmt.Println("Available flags:")
 	fmt.Println("  -h: Show help")
-	fmt.Println("  -local: Use IA when resolving SCIOND socket path")
+	fmt.Println("  -local: Local SCION address (default localhost)")
 	fmt.Println("  -b: Send an extra byte before sending the actual data")
 }
 
@@ -28,13 +31,13 @@ func main() {
 	log.Debug("Launching netcat")
 
 	var (
-		serverAddress   string
-		port            uint16
-		useIASCIONDPath bool
-		extraByte       bool
+		remoteAddressString string
+		port                uint16
+		localAddrString     string
+		extraByte           bool
 	)
 	flag.Usage = printUsage
-	flag.BoolVar(&useIASCIONDPath, "local", false, "Use IA SCIOND Path")
+	flag.StringVar(&remoteAddressString, "local", "", "Local address string")
 	flag.BoolVar(&extraByte, "b", false, "Send extra byte")
 	flag.Parse()
 
@@ -44,29 +47,51 @@ func main() {
 		golog.Panicf("Number of arguments is not two! Arguments: %v", tail)
 	}
 
-	serverAddress = tail[0]
+	remoteAddressString = tail[0]
 	port64, err := strconv.ParseUint(tail[1], 10, 16)
 	if err != nil {
 		printUsage()
 		golog.Panicf("Can't parse port string %v: %v", port64, err)
 	}
 	port = uint16(port64)
 
+	if localAddrString == "" {
+		localAddrString, err = scionutil.GetLocalhostString()
+		if err != nil {
+			golog.Panicf("Error getting localhost: %v", err)
+		}
+	}
+
+	localAddr, err := snet.AddrFromString(localAddrString)
+	if err != nil {
+		golog.Panicf("Error parsing local address: %v", err)
+	}
+
 	// Initialize SCION library
-	err = utils.InitSCION("", "", useIASCIONDPath)
+	err = scionutil.InitSCION(localAddr)
 	if err != nil {
 		golog.Panicf("Error initializing SCION connection: %v", err)
 	}
 
-	conn, err := utils.DialSCION(fmt.Sprintf("%s:%v", serverAddress, port))
+	remoteAddr, err := snet.AddrFromString(fmt.Sprintf("%s:%v", remoteAddressString, port))
 	if err != nil {
-		golog.Panicf("Error dialing remote: %v", err)
+		golog.Panicf("Can't parse remote address %s: %v", remoteAddressString)
+	}
+
+	sess, err := squic.DialSCION(nil, localAddr, remoteAddr, &quic.Config{KeepAlive: true})
+	if err != nil {
+		golog.Panicf("Can't dial remote address %s: %v", remoteAddressString, err)
+	}
+
+	stream, err := sess.OpenStreamSync()
+	if err != nil {
+		golog.Panicf("Can't open stream: %v", err)
 	}
 
 	log.Debug("Connected!")
 
 	if extraByte {
-		_, err := conn.Write([]byte{71})
+		_, err := stream.Write([]byte{71})
 		if err != nil {
 			golog.Panicf("Error writing extra byte: %v", err)
 		}
@@ -75,15 +100,22 @@ func main() {
 	}
 
 	close := func() {
-		conn.Close()
+		err := stream.Close()
+		if err != nil {
+			log.Warn("Error closing stream: %v", err)
+		}
+		err = sess.Close(nil)
+		if err != nil {
+			log.Warn("Error closing session: %v", err)
+		}
 	}
 
 	var once sync.Once
 	go func() {
-		io.Copy(os.Stdout, conn)
+		io.Copy(os.Stdout, stream)
 		once.Do(close)
 	}()
-	io.Copy(conn, os.Stdin)
+	io.Copy(stream, os.Stdin)
 	once.Do(close)
 
 	log.Debug("Exiting snetcat...")