From 0495112aab02058d4a9e58712c144f2f1f8e29c3 Mon Sep 17 00:00:00 2001 From: Badlop Date: Sun, 17 Jan 2010 19:29:35 +0000 Subject: [PATCH] Close sessions that were half connected (thanks to Alexey Shchepin)(EJAB-1165) SVN Revision: 2912 --- src/ejabberd_c2s.erl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index e11873cab..663cfd150 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -772,12 +772,6 @@ wait_for_session({xmlstreamelement, El}, StateData) -> [StateData#state.socket, exmpp_jid:to_binary(JID)]), %%send_element(StateData, exmpp_stream:features([])), - SID = {now(), self()}, - Conn = get_conn_type(StateData), - Info = [{ip, StateData#state.ip}, {conn, Conn}, - {auth_module, StateData#state.auth_module}], - ejabberd_sm:open_session( - SID, JID, Info), Res = exmpp_server_session:establish(El), send_element(StateData, Res), change_shaper(StateData, JID), @@ -794,6 +788,12 @@ wait_for_session({xmlstreamelement, El}, StateData) -> privacy_get_user_list, StateData#state.server, #userlist{}, [StateData#state.user, StateData#state.server]), + SID = {now(), self()}, + Conn = get_conn_type(StateData), + Info = [{ip, StateData#state.ip}, {conn, Conn}, + {auth_module, StateData#state.auth_module}], + ejabberd_sm:open_session( + SID, JID, Info), fsm_next_state(session_established, StateData#state{ sasl_state = 'undefined',