summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2005-04-09 21:03:42 +0000
committerAlexey Shchepin <alexey@process-one.net>2005-04-09 21:03:42 +0000
commite23e473012033a8efdbdec2a203c1314b3b0dc7d (patch)
treec4fa5a07d4052da53c752e7700be921cf4bca539 /src
parent* examples/transport-configs/configs/msn-transport.xml: Fixed typo (diff)
* src/ejabberd_c2s.erl: Send new id for each new stream inside one
session (thanks to Maxim Ryazanov) * src/tls/tls_drv.c: Now reads all certificates from certificate file instead of reading only first one (thanks to Karl-Johan Karlsson) * examples/transport-configs/init-scripts/jabber-gg-transport: Fixed typo (thanks to Sander Devrieze) SVN Revision: 304
Diffstat (limited to '')
-rw-r--r--src/ejabberd_c2s.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index c46e77ca..09b98af3 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -414,7 +414,8 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
?INFO_MSG("(~w) Accepted authentication for ~s",
[StateData#state.socket, U]),
{next_state, wait_for_stream,
- StateData#state{authentificated = true,
+ StateData#state{streamid = new_id(),
+ authentificated = true,
user = U
}};
{continue, ServerOut, NewSASLState} ->
@@ -444,6 +445,7 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
{next_state, wait_for_stream,
StateData#state{sockmod = tls,
socket = TLSSocket,
+ streamid = new_id(),
tls_enabled = true
}};
_ ->
@@ -500,7 +502,8 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
?INFO_MSG("(~w) Accepted authentication for ~s",
[StateData#state.socket, U]),
{next_state, wait_for_stream,
- StateData#state{authentificated = true,
+ StateData#state{streamid = new_id(),
+ authentificated = true,
user = U
}};
{continue, ServerOut, NewSASLState} ->