mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-24 16:23:40 +01:00
Close sessions that were half connected (thanks to Alexey Shchepin)(EJAB-1165)
SVN Revision: 2912
This commit is contained in:
parent
f3483529a7
commit
0495112aab
@ -772,12 +772,6 @@ wait_for_session({xmlstreamelement, El}, StateData) ->
|
|||||||
[StateData#state.socket,
|
[StateData#state.socket,
|
||||||
exmpp_jid:to_binary(JID)]),
|
exmpp_jid:to_binary(JID)]),
|
||||||
%%send_element(StateData, exmpp_stream:features([])),
|
%%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),
|
Res = exmpp_server_session:establish(El),
|
||||||
send_element(StateData, Res),
|
send_element(StateData, Res),
|
||||||
change_shaper(StateData, JID),
|
change_shaper(StateData, JID),
|
||||||
@ -794,6 +788,12 @@ wait_for_session({xmlstreamelement, El}, StateData) ->
|
|||||||
privacy_get_user_list, StateData#state.server,
|
privacy_get_user_list, StateData#state.server,
|
||||||
#userlist{},
|
#userlist{},
|
||||||
[StateData#state.user, StateData#state.server]),
|
[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,
|
fsm_next_state(session_established,
|
||||||
StateData#state{
|
StateData#state{
|
||||||
sasl_state = 'undefined',
|
sasl_state = 'undefined',
|
||||||
|
Loading…
Reference in New Issue
Block a user