added data_connection module for handling data connection-ports to cl…

…ients, also added some other stuff, still in heavy development

src/commands/list_files.erl

@@ -1,23 +1,137 @@
 -module(list_files).
 -export([start/3]).
 -include("../state.hrl").
+-include_lib("kernel/include/file.hrl").
 -author({"Christopher Bertels", "bakkdoor@flasht.de"}).
 
-start(FtpConnPid, State, _Arg) ->
+
+start(FtpConnPid, State, Arg) ->
     user:assert_logged_in(FtpConnPid, State,
 			  fun() ->
-				  list_files(FtpConnPid, State)
+				  list_files(FtpConnPid, State, Arg)
 			  end).
 
+%% list_files(FtpConnPid, State = #state{current_dir = CurrentDir}, _Arg) ->
+%%     case file:list_dir(CurrentDir) of
+%% 	{ok, FileList} ->
+%% 	    FtpConnPid ! {reply, {dir_listing, CurrentDir, FileList}};
+
+%% 	{error,Err} ->
+%% 	    FtpConnPid ! {reply, 
+%% 			  550, 
+%% 			  ["\"" ++ CurrentDir ++ "\" " ++ file:format_error(Err)],
+%% 			  State}
+%%     end.
+
+
+
+%% TODO: need to open a data port/socket somehow
+%% and send files over that port to client.
+%% maybe somehow like this:
+
+list_files(FtpConnPid, State, Arg) ->
+    % we need to start a data_connection, so send a request
+    FtpConnPid ! {request, data_connection, self(), State},
+    {ok, DataConnPid, NewState} = wait_for_data_connection(),
+
+
+    DirR = utils:rel_name(Arg, State#state.current_dir),
+    Dir = filename:join(State#state.home_dir, DirR),
+
+
+    dir_list(FtpConnPid, DataConnPid, NewState, Dir, DirR),
+
+    % when done, close the data_connection process.
+    DataConnPid ! {close, NewState},
+    % and report to ftp_connection process.
+    FtpConnPid ! {reply, command_ok, [], NewState}.
 
-list_files(FtpConnPid, State = #state{current_dir = CurrentDir}) ->
-    case file:list_dir(CurrentDir) of
-	{ok, FileList} ->
-	    FtpConnPid ! {reply, {dir_listing, CurrentDir, FileList}};
+
+dir_list(FtpConnPid, DataConnPid, State, Dir1, Dir) ->
+    case file:list_dir(Dir1) of
+	{ok, List} ->
+	    lists:foreach(
+	      fun(E) ->
+		      DataConnPid ! {data_reply, list_info(Dir1, E) ++ "\r\n"}
+	      end, 
+	      List),
+
+	    FtpConnPid ! {reply, closing_data_connection, [], State};
 
 	{error,Err} ->
 	    FtpConnPid ! {reply, 
 			  550, 
-			  ["\"" ++ CurrentDir ++ "\" " ++ file:format_error(Err)],
+			  ["\"" ++ Dir ++ "\" " ++ file:format_error(Err)],
 			  State}
     end.
+
+
+wait_for_data_connection() ->
+    receive
+	{request_reply, data_connection, DataConnPid, NewState} ->
+	    {ok, DataConnPid, NewState};
+
+	_Other ->
+	    wait_for_data_connection()
+
+	%after 5000 ->
+%		{error, timeout}
+	end.
+
+
+
+list_info(Dir, File) ->
+    case file:read_file_info(filename:join(Dir,File)) of
+	{ok, Info} ->
+	    finfo(Info) ++ " " ++ File;
+	{error,_} ->
+	    "???"
+    end.
+
+
+%%
+%% format as access(10) + size(8)+ mdate(8)+ mtime(5)+ filename(n)
+%%
+finfo(Info) ->
+    fmt_type(Info#file_info.type) ++ 
+	fmt_access(Info#file_info.mode) ++ " " ++
+	fmt_number(Info#file_info.size,8,$ ) ++ " " ++
+	fmt_date(Info#file_info.mtime) ++ " " ++ 
+	fmt_time(Info#file_info.mtime).
+
+
+fmt_type(regular) -> "-";
+fmt_type(directory) -> "d";
+fmt_type(_) -> "?".
+
+
+fmt_access(Mode) ->
+    fmt_rwx(Mode) ++ fmt_rwx(Mode bsr 3) ++ fmt_rwx(Mode bsr 6).
+
+
+
+fmt_rwx(Mode) ->
+    [if Mode band 4 == 0 -> $-; true -> $r end,
+     if Mode band 2 == 0 -> $-; true -> $w end,
+     if Mode band 1 == 0 -> $-; true -> $x end].
+
+
+
+fmt_date({{Y,M,D},_}) ->
+    fmt_number(Y rem 100,2,$0) ++ "-" ++ 
+	fmt_number(M,2,$0) ++ "-" ++
+	fmt_number(D,2,$0).
+
+fmt_time({_,{H,M,_S}}) ->
+    fmt_number(H,2,$0) ++ ":" ++ 
+	fmt_number(M,2,$0).
+
+fmt_number(X, N, LeftPad) when X >= 0 ->
+    Ls = integer_to_list(X),
+    Len = length(Ls),
+    if Len >= N -> Ls;
+       true ->
+	    lists:duplicate(N - Len, LeftPad) ++ Ls
+    end.
+
+

src/commands/print_work_dir.erl

@@ -12,11 +12,4 @@ start(FtpConnPid, State, _Arg) ->
 
 send_reply(FtpConnPid, State) ->
     WorkDir = State#state.current_dir,
-    FtpConnPid ! {reply, pathname_created, ["\"" ++ abs_name(WorkDir) ++ "\""], State}.
-
-
-%%
-%% We sometime need a simulated root, then call abs_name
-%%
-abs_name(Name) ->
-    filename:join("/", Name).
+    FtpConnPid ! {reply, pathname_created, ["\"" ++ utils:abs_name(WorkDir) ++ "\""], State}.				  

src/data_connection.erl

@@ -0,0 +1,25 @@
+%% data_connection-module.
+%% represents a data_connection process.
+
+-module(data_connection).
+-export([start/2]).
+-include("state.hrl").
+-author({"Christopher Bertels", "bakkdoor@flasht.de"}).
+
+start(DataSocket, State) ->
+    loop(DataSocket, State).
+
+
+loop(DataSocket, State) ->
+    receive
+	{data_reply, Message} ->
+	    gen_tcp:send(DataSocket, Message),
+	    loop(DataSocket, State);
+
+	{close, _NewState} ->
+	    gen_tcp:close(DataSocket),
+	    data_connection_done;
+
+	_Other ->
+	    loop(DataSocket, State)
+    end.

src/ftp_connection.erl

@@ -94,6 +94,10 @@ send_loop(DriverSendLoop) ->
 	    DriverSendLoop ! Reply,
 	    send_loop(DriverSendLoop);
 
+	Request = {request, data_connection, _FromPid, _State} ->
+	    debug:info("ftp_connection/send_loop: requesting data_connection process"),
+	    DriverSendLoop ! Request;
+
 	Unknown ->
 	    debug:error("ftp_connection/send_loop: unkown message in send_loop (# ~p): ~p~n", [self(), Unknown]),
 	    send_loop(DriverSendLoop)