diff options
Diffstat (limited to 'p11p-daemon/src/p11p_server.erl')
| -rw-r--r-- | p11p-daemon/src/p11p_server.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/p11p-daemon/src/p11p_server.erl b/p11p-daemon/src/p11p_server.erl index b3ffa5c..cbc00df 100644 --- a/p11p-daemon/src/p11p_server.erl +++ b/p11p-daemon/src/p11p_server.erl @@ -20,7 +20,7 @@ %% Records and types. -record(state, { tokname :: string(), - remote :: pid() | undefined, + client :: pid() | undefined, socket :: gen_tcp:socket(), msg :: p11rpc_msg() | undefined, recv_count = 0 :: non_neg_integer(), @@ -83,14 +83,14 @@ handle_cast(Cast, State) -> %% First packet from P11 client. handle_info({tcp, Port, DataIn}, #state{tokname = TokName} = S) - when S#state.remote == undefined -> + when S#state.client == undefined -> %%lager:debug("~p: received ~B octets from client on socket ~p, from new client", [self(), size(Data), Port]), <<RPCVersion:8, Data/binary>> = DataIn, case RPCVersion of ?RPC_VERSION -> {noreply, p11_client_data( - S#state{remote = p11p_remote_manager:remote_for_token(TokName)}, + S#state{client = p11p_manager:client_for_token(TokName)}, p11p_rpc:new(), Data)}; BadVersion -> @@ -112,9 +112,9 @@ handle_info(Info, S) -> lager:debug("~p: Unhandled info: ~p~n", [self(), Info]), {noreply, S}. -terminate(Reason, #state{socket = Sock, tokname = TokName, remote = Remote}) -> +terminate(Reason, #state{socket = Sock, tokname = TokName, client = Client}) -> gen_tcp:close(Sock), - p11p_remote_manager:client_event(client_gone, [TokName, Remote]), + p11p_manager:client_event(client_gone, [TokName, Client]), lager:debug("~p: terminated with reason ~p", [self(), Reason]), ignored. @@ -122,13 +122,13 @@ code_change(_OldVersion, State, _Extra) -> {ok, State}. %% Private functions. -p11_client_data(#state{remote = Remote, recv_count = Recv} = S, MsgIn, +p11_client_data(#state{client = Client, recv_count = Recv} = S, MsgIn, DataIn) -> case p11p_rpc:parse(MsgIn, DataIn) of {needmore, Msg} -> S#state{msg = Msg}; {done, Msg} -> - {ok, _BytesSent} = p11p_remote:request(Remote, Msg), + {ok, _BytesSent} = p11p_client:request(Client, Msg), S#state{msg = p11p_rpc:new(Msg#p11rpc_msg.buffer), recv_count = Recv + 1} end. |