diff --git a/paradise/paradise.go b/paradise/paradise.go index a76100b..ed6d49c 100644 --- a/paradise/paradise.go +++ b/paradise/paradise.go @@ -12,7 +12,7 @@ type DefaultFileSystem struct { } func (dfs DefaultFileSystem) GetFiles() []string { - files := make([]string, 5) + files := make([]string, 6) return files } diff --git a/server/directory.go b/server/directory.go index 8bfc7ad..f451004 100644 --- a/server/directory.go +++ b/server/directory.go @@ -43,7 +43,7 @@ func (p *Paradise) HandleList() { func (p *Paradise) dirList() ([]byte, error) { var buf bytes.Buffer - files := []int{1, 2, 3, 4, 5} // change to real list of files + files := FileManager.GetFiles() for _, _ = range files { if false { // change to really test for isDir diff --git a/server/server.go b/server/server.go index 5b88692..1d50e28 100644 --- a/server/server.go +++ b/server/server.go @@ -1,20 +1,20 @@ package server -import ( - "bufio" - "fmt" - "io" - "net" - "strings" - "sync" - "time" -) +import "bufio" +import "fmt" +import "io" +import "net" +import "strings" +import "sync" +import "time" +import "github.com/andrewarrow/paradise_ftp/paradise" var Settings ParadiseSettings var CommandMap map[string]func(*Paradise) var ConnectionMap map[string]*Paradise var PassiveCount int var UpSince int64 +var FileManager *paradise.FileManager type Paradise struct { writer *bufio.Writer diff --git a/server/starter.go b/server/starter.go index 137fef7..d143cc3 100644 --- a/server/starter.go +++ b/server/starter.go @@ -11,12 +11,12 @@ func genClientID() string { b := make([]byte, 16) random.Read(b) random.Close() - return fmt.Sprintf("%x-%x-%x-%x-%x", - b[0:4], b[4:6], b[6:8], b[8:10], b[10:]) + return fmt.Sprintf("%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:]) } func Start(fm *paradise.FileManager) { fmt.Println("starting...") + FileManager = fm url := fmt.Sprintf("localhost:%d", 2121) // change to 21 in production var listener net.Listener listener, err := net.Listen("tcp", url)