* src/ejabberd_c2s.erl: Removed stream restarting

SVN Revision: 115
This commit is contained in:
Alexey Shchepin 2003-06-10 07:07:00 +00:00
parent bc73337214
commit 1a8ed857dc
2 changed files with 8 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2003-06-10 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: Removed stream restarting
2003-06-07 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: SASL support updated to xmpp-core-13

View File

@ -258,13 +258,13 @@ wait_for_sasl_auth({xmlstreamelement, El}, StateData) ->
Mech,
ClientIn) of
{ok, Props} ->
StateData#state.receiver ! reset_stream,
%StateData#state.receiver ! reset_stream,
send_element(StateData,
{xmlelement, "success",
[{"xmlns", ?NS_SASL}], []}),
{U, _, R} = jlib:string_to_jid(
xml:get_attr_s(authzid, Props)),
{next_state, wait_for_stream,
{next_state, wait_for_session,
StateData#state{authentificated = true,
user = U,
resource = R
@ -321,13 +321,13 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
case cyrsasl:server_step(StateData#state.sasl_state,
ClientIn) of
{ok, Props} ->
StateData#state.receiver ! reset_stream,
%StateData#state.receiver ! reset_stream,
send_element(StateData,
{xmlelement, "success",
[{"xmlns", ?NS_SASL}], []}),
{U, _, R} = jlib:string_to_jid(
xml:get_attr_s(authzid, Props)),
{next_state, wait_for_stream,
{next_state, wait_for_session,
StateData#state{authentificated = true,
user = U,
resource = R