diff options
Diffstat (limited to 'p11p-daemon/src/p11p_server.erl')
| -rw-r--r-- | p11p-daemon/src/p11p_server.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/p11p-daemon/src/p11p_server.erl b/p11p-daemon/src/p11p_server.erl index e32a439..55893de 100644 --- a/p11p-daemon/src/p11p_server.erl +++ b/p11p-daemon/src/p11p_server.erl @@ -81,8 +81,8 @@ handle_info({tcp, _Port, Data}, #state{tokname = TokName, remote = Remote} = Sta <<Version:8, NewData/binary>> = Data, NewRemote = p11p_remote_manager:remote_for_token(TokName), p11p_remote:add_to_outbuf(NewRemote, <<Version>>), - NewState = handle_client_data(State, p11p_rpc:new(), NewData), - {noreply, NewState#state{remote = NewRemote}}; + NewState = State#state{remote = NewRemote}, + {noreply, handle_client_data(NewState, p11p_rpc:new(), NewData)}; handle_info({tcp, _Port, Data}, #state{msg = Msg} = State) -> %%lager:debug("~p: received ~B octets from client on socket ~p, with ~B octets already in buffer", [self(), size(Data), Port, size(Msg#p11rpc_msg.buffer)]), {noreply, handle_client_data(State, Msg, Data)}; @@ -103,10 +103,9 @@ code_change(_OldVersion, State, _Extra) -> {ok, State}. %% Private functions. -handle_client_data(#state{tokname = TokName} = State, Msg, Data) -> +handle_client_data(#state{remote = Remote} = State, Msg, Data) -> case p11p_rpc:parse(Msg, Data) of {done, NewMsg} -> - Remote = p11p_remote_manager:remote_for_token(TokName), ok = p11p_remote:request(Remote, NewMsg), State#state{msg = p11p_rpc:new(NewMsg#p11rpc_msg.buffer)}; {needmore, NewMsg} -> |