add Init for Driver interface

Author: lunny

conn.go

@@ -52,35 +52,33 @@ func newSessionId() string {
 // message when the connection closes. This loop will be running inside a
 // goroutine, so use this channel to be notified when the connection can be
 // cleaned up.
-func (Conn *Conn) Serve() {
-	Conn.logger.Print("Connection Established")
+func (conn *Conn) Serve() {
+	conn.logger.Print("Connection Established")
 	// send welcome
-	Conn.writeMessage(220, Conn.server.WelcomeMessage)
+	conn.writeMessage(220, conn.server.WelcomeMessage)
 	// read commands
 	for {
-		/*if Conn.dataConn == nil {
-			break
-		}*/
-		line, err := Conn.controlReader.ReadString('\n')
+		line, err := conn.controlReader.ReadString('\n')
 		if err != nil {
 			if err == io.EOF {
 				continue
 			}
 
-			Conn.logger.Print(fmt.Sprintln("read error:", err))
+			conn.logger.Print(fmt.Sprintln("read error:", err))
 			break
 		}
-		Conn.receiveLine(line)
+		conn.receiveLine(line)
 	}
-	Conn.logger.Print("Connection Terminated")
+	conn.Close()
+	conn.logger.Print("Connection Terminated")
 }
 
 // Close will manually close this connection, even if the client isn't ready.
-func (Conn *Conn) Close() {
-	Conn.conn.Close()
-	if Conn.dataConn != nil {
-		Conn.dataConn.Close()
-		Conn.dataConn = nil
+func (conn *Conn) Close() {
+	conn.conn.Close()
+	if conn.dataConn != nil {
+		conn.dataConn.Close()
+		conn.dataConn = nil
 	}
 }
 

driver.go

@@ -12,6 +12,9 @@ type DriverFactory interface {
 // chosen persistence layer. graval will create a new instance of your
 // driver for each client that connects and delegate to it as required.
 type Driver interface {
+	// Init init
+	Init(*Conn)
+
 	// params  - a file path
 	// returns - a time indicating when the requested path was last modified
 	//         - an error if the file doesn't exist or the user lacks

server.go

@@ -139,6 +139,7 @@ func (server *Server) newConn(tcpConn net.Conn, driver Driver, auth Auth) *Conn
 	c.server = server
 	c.sessionId = newSessionId()
 	c.logger = newLogger(c.sessionId)
+	driver.Init(c)
 	return c
 }
 
@@ -166,16 +167,10 @@ func simpleTLSConfig(certFile, keyFile string) (*tls.Config, error) {
 // listening on the same port.
 //
 func (Server *Server) ListenAndServe() error {
-	/*laddr, err := net.ResolveTCPAddr("tcp", Server.listenTo)
-	if err != nil {
-		return err
-	}*/
-
 	var listener net.Listener
 	var err error
-	//fmt.Println("-------", *Server.ServerOpts)
+
 	if Server.ServerOpts.TLS {
-		//fmt.Println("use tls")
 		config, err := simpleTLSConfig(Server.CertFile, Server.KeyFile)
 		if err != nil {
 			return err
@@ -200,10 +195,10 @@ func (Server *Server) ListenAndServe() error {
 		driver, err := Server.driverFactory.NewDriver()
 		if err != nil {
 			Server.logger.Print("Error creating driver, aborting client connection")
-		} else {
-			ftpConn := Server.newConn(tcpConn, driver, Server.Auth)
-			go ftpConn.Serve()
+			break
 		}
+		ftpConn := Server.newConn(tcpConn, driver, Server.Auth)
+		go ftpConn.Serve()
 	}
 	return nil
 }