From 5ab97ed6bef0406b68f01b79a702ca9aa88c1912 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 28 Oct 2015 20:10:53 +0100 Subject: Unify --- tda.erl | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'tda.erl') 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(<>) -> -- cgit v1.2.3