summaryrefslogtreecommitdiff
path: root/tda.erl
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-10-28 20:10:53 +0100
committerDimitri Sokolyuk <demon@dim13.org>2015-10-28 20:10:53 +0100
commit5ab97ed6bef0406b68f01b79a702ca9aa88c1912 (patch)
tree60fc45dd857b94f64e45f65afe69700f88c8b502 /tda.erl
parentbc998d4dd2f030f5ed6c3e65d222a70f9edd15f2 (diff)
Unify
Diffstat (limited to 'tda.erl')
-rw-r--r--tda.erl26
1 files changed, 8 insertions, 18 deletions
diff --git a/tda.erl b/tda.erl
index 8096f92..3008b5e 100644
--- a/tda.erl
+++ b/tda.erl
@@ -39,22 +39,20 @@ loop(Sock) ->
inet:setopts(Sock, [{active, once}]),
receive
{ok, Reply} ->
- io:format("Send ~p~n", [Reply]),
+ %io:format("Send ~p~n", [Reply]),
gen_tcp:send(Sock, Reply);
{tcp, Sock, Data} ->
- io:format("Got ~p~n", [Data]),
+ %io:format("Got ~p~n", [Data]),
case decode(Data) of
- ok ->
- ok;
- {ok, Reply} ->
- tdaPid ! {ok, Reply};
- error ->
- exit(error)
+ {ok, Reply} -> tdaPid ! {ok, Reply};
+ ok -> ok;
+ error -> exit(error)
end;
{tcp_closed, _} ->
io:format("Connection closed~n", []),
exit(closed)
after ?TIMEOUT ->
+ io:format("Connection timed out~n", []),
exit(timeout)
end,
loop(Sock).
@@ -64,19 +62,11 @@ decode(Data) ->
rose ->
{ok, Rose} = rose:decode(Data),
io:format("ROSE> ~p~n", [Rose]),
- case rose:dispatch(Rose) of
- {ok, Result} ->
- {ok, Result};
- {result, Data} ->
- io:format("Result: ~p~n", [Data]),
- ok;
- {ok} ->
- ok
- end;
+ rose:dispatch(Rose);
acse ->
{ok, Acse} = acse:decode(Data),
io:format("ACSE> ~p~n", [Acse]),
- acse:check(Acse)
+ acse:dispatch(Acse)
end.
dispatch(<<Head:8,_/binary>>) ->