diff options
Diffstat (limited to 'p11p-daemon/src/p11p_server.erl')
| -rw-r--r-- | p11p-daemon/src/p11p_server.erl | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/p11p-daemon/src/p11p_server.erl b/p11p-daemon/src/p11p_server.erl index 3ae5e78..4009c72 100644 --- a/p11p-daemon/src/p11p_server.erl +++ b/p11p-daemon/src/p11p_server.erl @@ -6,6 +6,7 @@ %% API. -export([start_link/1]). +-export([reply/2]). %% Genserver callbacks. -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, @@ -13,6 +14,7 @@ %% Records and types. -record(state, { + tokname :: string(), sockpath :: string(), % FIXME: filename(3erl) socket :: gen_tcp:socket() }). @@ -20,28 +22,31 @@ %% API. -spec start_link(gen_tcp:socket()) -> {ok, pid()} | {error, term()}. start_link(Args) -> - lager:debug("~p: p11p_server:start_link enter", [self()]), gen_server:start_link(?MODULE, Args, []). +reply(Pid, Data) -> + gen_server:cast(Pid, {response, Data}). + %% Genserver callbacks. -init([SocketPath, Socket]) -> +init([Token, SocketPath, Socket]) -> lager:debug("~p: p11p_server:init: ~s", [self(), SocketPath]), process_flag(trap_exit, true), % We want terminate(). gen_server:cast(self(), accept), % Perform accept in gen-server loop. - {ok, #state{sockpath = SocketPath, socket = Socket}}. + {ok, #state{tokname = Token, sockpath = SocketPath, socket = Socket}}. handle_call(Request, _From, State) -> + lager:debug("Unhandled call: ~p~n", [Request]), {reply, unhandled, State}. -handle_cast(accept, State = #state{sockpath = SocketPath, socket = ListenSocket}) -> +handle_cast(accept, State = #state{tokname = TokName, sockpath = SocketPath, socket = ListenSocket}) -> %% Blocking until client connects or timeout fires. Without a %% timeout our supervisor cannot terminate us. case gen_tcp:accept(ListenSocket, 900) of {ok, Sock} -> %% TODO: authz lager:debug("~p: ~p: new connection accepted", [self(), Sock]), - p11p_server_sup:start_server([SocketPath, ListenSocket]), % Start a new acceptor. + p11p_server_sup:start_server([TokName, SocketPath, ListenSocket]), % Start a new acceptor. {noreply, State#state{socket = Sock}}; % Use the new socket. {error, timeout} -> gen_server:cast(self(), accept), % Try again. @@ -50,29 +55,31 @@ handle_cast(accept, State = #state{sockpath = SocketPath, socket = ListenSocket} lager:debug("~p: listening socket closed", [self()]), {stop, normal, State} end; +handle_cast({response, Data}, #state{socket = ClientPort} = State) -> + lager:debug("~p: received ~B octets from remote", [self(), length(Data)]), + ok = gen_tcp:send(ClientPort, Data), + {noreply, State}; handle_cast(Request, State) -> lager:debug("Unhandled cast: ~p~n", [Request]), {noreply, State}. -handle_info({tcp, Port, Data}, State) -> - lager:debug("~p: received: ~s", [self(), Data]), - case Data of - <<"q\n">> -> - gen_tcp:send(Port, "ok, bye\n"), %DEBUG - {stop, {shutdown, quit_by_client}, State}; - _ -> - gen_tcp:send(Port, "ok, thanks: " ++ Data), %DEBUG - {noreply, State} - end; +handle_info({tcp, Port, Data}, #state{tokname = TokName} = State) -> + lager:debug("~p: received ~B octets from client on socket ~p", + [self(), length(binary_to_list(Data)), Port]), + %% TODO: parse incoming data, start timer per p11 request and + %% cancel after full response + Remote = p11p_remote_manager:remote_for_token(TokName), + ok = p11p_remote:send(self(), Remote, Data), + {noreply, State}; handle_info({tcp_closed, Port}, State) -> - lager:debug("~p: ~p: closed", [self(), Port]), + lager:debug("~p: socket ~p closed", [self(), Port]), {stop, {shutdown, close_by_client}, State}; handle_info(Info, State) -> - lager:debug("Unhandled info: ~p~n", [Info]), + lager:debug("~p: Unhandled info: ~p~n", [self(), Info]), {noreply, State}. terminate(_Reason, #state{sockpath = _SocketPath, socket = Socket}) -> - lager:debug("~p: ~p: terminated", [self(), Socket]), + lager:debug("~p: terminated", [self()]), gen_tcp:close(Socket), ok. |