From 16bd626fc9ddd8e30cc451da858c36b0e3281077 Mon Sep 17 00:00:00 2001 From: Badlop Date: Sun, 17 Jan 2010 19:28:35 +0000 Subject: [PATCH] Close sessions that were half connected (thanks to Alexey Shchepin)(EJAB-1165) SVN Revision: 2911 --- src/ejabberd_c2s.erl | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index ff3c5f6e4..dbc7dad3e 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -825,14 +825,6 @@ wait_for_session({xmlstreamelement, El}, StateData) -> ?INFO_MSG("(~w) Opened session for ~s", [StateData#state.socket, jlib:jid_to_string(JID)]), - %%send_element(StateData, {xmlelement, "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, U, StateData#state.server, R, Info), Res = jlib:make_result_iq_reply(El), send_element(StateData, Res), change_shaper(StateData, JID), @@ -849,6 +841,12 @@ wait_for_session({xmlstreamelement, El}, StateData) -> privacy_get_user_list, StateData#state.server, #userlist{}, [U, 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, U, StateData#state.server, R, Info), NewStateData = StateData#state{ sid = SID,