diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2006-01-13 04:55:20 +0300 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2006-01-13 04:55:20 +0300 |
| commit | 6bb510d99e4ad29dbf85b4ffec9d1d8c6516b4ba (patch) | |
| tree | 1fe149f5ee097f2770c8e4693bd833a0e2724b46 /src/ejabberd_service.erl | |
| parent | 8401a5ac55e756f7a4e74afd7916b38e0d65e02a (diff) | |
* src/ejabberd_service.erl: Bugfix
* src/ejabberd_receiver.erl: Rewritten to use {active, once} mode
for socket
* src/ejabberd_c2s.erl: Update
* src/ejabberd_listener.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/shaper.erl: Likewise
* src/tls/tls.erl: Likewise
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 483
Diffstat (limited to 'src/ejabberd_service.erl')
| -rw-r--r-- | src/ejabberd_service.erl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl index d1003295b..a8c1989b4 100644 --- a/src/ejabberd_service.erl +++ b/src/ejabberd_service.erl @@ -13,7 +13,12 @@ -behaviour(gen_fsm). %% External exports --export([start/2, start_link/2, receiver/3, send_text/2, send_element/2]). +-export([start/2, + start_link/2, + receiver/3, + send_text/2, + send_element/2, + become_controller/1]). %% gen_fsm callbacks -export([init/1, @@ -75,6 +80,9 @@ start(SockData, Opts) -> start_link(SockData, Opts) -> gen_fsm:start_link(ejabberd_service, [SockData, Opts], ?FSMOPTS). +become_controller(_Pid) -> + ok. + %%%---------------------------------------------------------------------- %%% Callback functions from gen_fsm %%%---------------------------------------------------------------------- @@ -175,7 +183,7 @@ wait_for_handshake({xmlstreamelement, El}, StateData) -> {stop, normal, StateData} end; _ -> - {next_state, wait_for_key, StateData} + {next_state, wait_for_handshake, StateData} end; wait_for_handshake({xmlstreamend, _Name}, StateData) -> |