diff options
| author | Linus Nordberg <linus@sunet.se> | 2019-06-28 16:18:41 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@sunet.se> | 2019-06-28 16:18:41 +0200 |
| commit | db9fa57d1c8858661e85e3ce40cf94de4931e4f9 (patch) | |
| tree | 95add51271312640952a6972073b628679687b1d /p11p-daemon/src/p11p_server.erl | |
| parent | f829ef06f81d5a8642ebaff7b6bb01c1483a86a7 (diff) | |
don't send that version octet by itself
Instead, add it to new remote outbuf.
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 ea49219..accc86a 100644 --- a/p11p-daemon/src/p11p_server.erl +++ b/p11p-daemon/src/p11p_server.erl @@ -4,7 +4,7 @@ -module(p11p_server). -behaviour(gen_server). --include("p11p-rpc.hrl"). +-include("p11p_rpc.hrl"). %% API. -export([start_link/1]). @@ -69,8 +69,7 @@ handle_info({tcp, Port, Data}, #state{tokname = TokName, msg = Msg} = State) whe lager:debug("~p: received ~B octets from client on socket ~p, from new client", [self(), size(Data), Port]), <<Version:8, NewData/binary>> = Data, - %% FIXME: don't send, just add to outbuf - ok = p11p_remote:send(self(), p11p_remote_manager:remote_for_token(TokName), <<Version>>), + p11p_remote:add_to_outbuf(p11p_remote_manager:remote_for_token(TokName), <<Version>>), NewState = handle_client_data(State, p11p_rpc:new(), NewData), {noreply, NewState}; handle_info({tcp, Port, Data}, #state{msg = Msg} = State) -> @@ -98,7 +97,7 @@ handle_client_data(#state{tokname = TokName} = State, Msg, Data) -> case p11p_rpc:parse(Msg, Data) of {done, NewMsg} -> Remote = p11p_remote_manager:remote_for_token(TokName), - ok = p11p_remote:send(self(), Remote, p11p_rpc:serialise(NewMsg)), + ok = p11p_remote:request(self(), Remote, NewMsg), State#state{msg = p11p_rpc:new(NewMsg#p11rpc_msg.buffer)}; {needmore, NewMsg} -> State#state{msg = NewMsg} |