From 1df44a05bacf56bd6af09b69ce8af50258c767ad Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 3 Nov 2015 14:27:50 +0100 Subject: Auto login/logout --- src/tapi.erl | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/tapi.erl b/src/tapi.erl index 88f6f31..dc5acc3 100644 --- a/src/tapi.erl +++ b/src/tapi.erl @@ -6,7 +6,6 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --export([login/0, logout/0]). -export([send/1, ext/0, co/0, snapshot/1, monitor/1, button/1, dial/2]). -include("config.hrl"). @@ -16,9 +15,9 @@ start_link() -> gen_server:start_link({local, ?SERVER}, ?MODULE, [?HOST, ?PORT], []). init(Args) -> - io:format("INIT~n", []), + gen_server:cast(?SERVER, acse:associate()), [Host, Port] = Args, - gen_tcp:connect(Host, Port, [binary, {packet, 2}], ?TIMEOUT). + gen_tcp:connect(Host, Port, [binary, {packet, 2}]). handle_call(_Request, _From, State) -> {reply, ok, State}. @@ -41,6 +40,7 @@ handle_info({tcp_closed, _}, Socket) -> {stop, normal, Socket}. terminate(_Reason, State) -> + gen_server:cast(?SERVER, acse:release()), gen_tcp:close(State). code_change(_OldVsn, State, _Extra) -> @@ -49,28 +49,28 @@ code_change(_OldVsn, State, _Extra) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ext() -> - gen_server:cast(?SERVER, rose:invoke(?ESCAPE, escape:lines(station))). + gen_server:cast(?SERVER, rose:invoke(?ESCAPE, + escape:lines(station))). co() -> - gen_server:cast(?SERVER, rose:invoke(?ESCAPE, escape:lines(networkInterface))). + gen_server:cast(?SERVER, rose:invoke(?ESCAPE, + escape:lines(networkInterface))). send(Reply) -> gen_server:cast(?SERVER, Reply). snapshot(Device) -> - gen_server:cast(?SERVER, rose:invoke(?SNAPSHOT, snapshot:encode({dialingNumber, Device}))). + gen_server:cast(?SERVER, rose:invoke(?SNAPSHOT, + snapshot:encode({dialingNumber, Device}))). button(Device) -> - gen_server:cast(?SERVER, rose:invoke(?BUTTON, button:encode({deviceNumber, Device}))). + gen_server:cast(?SERVER, rose:invoke(?BUTTON, + button:encode({deviceNumber, Device}))). monitor(Device) -> - gen_server:cast(?SERVER, rose:invoke(?MONITOR, monitor:encode({dialingNumber, Device}))). + gen_server:cast(?SERVER, rose:invoke(?MONITOR, + monitor:encode({dialingNumber, Device}))). dial(From, To) -> - gen_server:cast(?SERVER, rose:invoke(?MAKECALL, dial:encode({dialingNumber, From}, {dialingNumber, To}))). - -login() -> - gen_server:cast(?SERVER, acse:associate()). - -logout() -> - gen_server:cast(?SERVER, acse:release()). + gen_server:cast(?SERVER, rose:invoke(?MAKECALL, + dial:encode({dialingNumber, From}, {dialingNumber, To}))). -- cgit v1.2.3