Can start now from everywhere

Author: elwin

client/cmd.go

@@ -381,15 +381,11 @@ func (c *ServerConn) Stor(path string, r io.Reader) error {
 // Hint: io.Pipe() can be used if an io.Writer is required.
 func (c *ServerConn) StorFrom(path string, r io.Reader, offset uint64) error {
 
-	fmt.Println("Getting new data conn")
-
 	conn, err := c.cmdDataConnFrom(offset, "STOR %s", path)
 	if err != nil {
 		return err
 	}
 
-	fmt.Println("Attempting to copy")
-
 	n, err := io.Copy(conn, r)
 
 	if err != nil {

client/scionftp/scionftp.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"github.com/elwin/scionFTP/scion"
 	"io"
 	"log"
 	"os"
@@ -30,6 +31,7 @@ func main() {
 		"mode":    app.mode,
 		"get":     app.retr,
 		"put":     app.stor,
+		"mkdir":   app.mkdir,
 		"quit":    app.quit,
 	}
 
@@ -110,6 +112,8 @@ func (app *App) connect(args []string) {
 
 	app.conn = conn
 
+	app.conn.SetPathSelector(scion.NewRotator(10).PathSelector)
+
 	ctx, cancel := context.WithCancel(app.ctx)
 	app.cancel = cancel
 
@@ -176,6 +180,19 @@ func (app *App) cd(args []string) {
 	}
 }
 
+func (app *App) mkdir(args []string) {
+	if len(args) != 1 {
+		app.print("Must supply one argument for directory name")
+		return
+	}
+
+	err := app.conn.MakeDir(args[0])
+	if err != nil {
+		app.print(err)
+		return
+	}
+}
+
 func (app *App) pwd(args []string) {
 	cur, err := app.conn.CurrentDir()
 	if err != nil {

scion/init.go

@@ -2,6 +2,8 @@ package scion
 
 import (
 	"fmt"
+	"github.com/scionproto/scion/go/lib/log"
+	"os/user"
 	"sync"
 
 	"github.com/scionproto/scion/go/lib/snet/squic"
@@ -12,7 +14,14 @@ import (
 
 var initialize sync.Once
 
+const (
+	KEYPATH = "/go/src/github.com/scionproto/scion/gen-certs/tls.key"
+	PEMPATH = "/go/src/github.com/scionproto/scion/gen-certs/tls.pem"
+)
+
 func initNetwork(local Address) error {
+	log.SetupLogConsole("info")
+
 	var err error
 	initialize.Do(func() {
 		if snet.DefNetwork == nil {
@@ -24,7 +33,12 @@ func initNetwork(local Address) error {
 			}
 		}
 
-		err := squic.Init("", "")
+		user, err := user.Current()
+		if err != nil {
+			return
+		}
+
+		err = squic.Init(user.HomeDir + KEYPATH, user.HomeDir + PEMPATH)
 		if err != nil {
 			err = fmt.Errorf("failed to initilaze SQUIC: %s", err)
 			return