diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2003-07-14 18:06:03 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2003-07-14 18:06:03 +0000 |
| commit | 1834fb3a724365d804f5c863a27b720ac9bf45b9 (patch) | |
| tree | d92dc73da4838b5bd2bd6e22fe4f21ca423f4874 /src/ejabberd_s2s_in.erl | |
| parent | * doc/guide.tex: Updated (thanks to Sergei Golovan) (diff) | |
* src/ejabberd_s2s_out.erl: Close connection after key
verification
* src/ejabberd_c2s.erl: start replaced with start_link
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/ejabberd_listener.erl: Now uses proc_lib to spawn listeners,
removed 3rd parameter in listener configuration (assumed to equal
start_link)
* src/ejabberd.rel: Updated
* doc/guide.tex: Small changes
* doc/Makefile: Added implicit charset specification to hevea
SVN Revision: 124
Diffstat (limited to 'src/ejabberd_s2s_in.erl')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 345fafae1..0cc200f58 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -13,7 +13,7 @@ -behaviour(gen_fsm). %% External exports --export([start/2, receiver/2, send_text/2, send_element/2]). +-export([start_link/2, receiver/2, send_text/2, send_element/2]). %% gen_fsm callbacks -export([init/1, @@ -63,8 +63,8 @@ %%%---------------------------------------------------------------------- %%% API %%%---------------------------------------------------------------------- -start(SockData, Opts) -> - gen_fsm:start(ejabberd_s2s_in, [SockData], ?FSMOPTS). +start_link(SockData, Opts) -> + gen_fsm:start_link(ejabberd_s2s_in, [SockData], ?FSMOPTS). %%%---------------------------------------------------------------------- %%% Callback functions from gen_fsm @@ -134,8 +134,8 @@ wait_for_key({xmlstreamelement, El}, StateData) -> ?INFO_MSG("GET KEY: ~p", [{To, From, Id, Key}]), case lists:member(To, ejabberd_router:dirty_get_all_domains()) of true -> - ejabberd_s2s_out:start(To, From, - {verify, self(), Key}), + ejabberd_s2s_out:start_link(To, From, + {verify, self(), Key}), {next_state, wait_for_verification, StateData#state{myname = To, |