aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2005-11-22 18:00:56 +0000
committerAlexey Shchepin <alexey@process-one.net>2005-11-22 18:00:56 +0000
commitf765d7f61294e9cf9c5242152e34305d24fc9f60 (patch)
tree025f0773e3be84aac9fc7c1fdaaf22946bcd6f7c /src
parentAdded prepare-translation.sh wrapper to extract_translation.erl (Thanks to Ba... (diff)
* src/ejabberd_c2s.erl: Send stream error when connection is
replaced (thanks to Maxim Ryazanov) SVN Revision: 440
Diffstat (limited to 'src')
-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 abc0cf670..64ac65d81 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -832,8 +832,11 @@ handle_info({send_text, Text}, StateName, StateData) ->
send_text(StateData, Text),
{next_state, StateName, StateData};
handle_info(replaced, _StateName, StateData) ->
- % TODO
- %send_text(StateData#state.sender, Text),
+ Lang = StateData#state.lang,
+ send_text(StateData,
+ xml:element_to_string(
+ ?SERRT_CONFLICT(Lang, "Replaced by new connection"))
+ ++ ?STREAM_TRAILER),
{stop, normal, StateData#state{authenticated = replaced}};
handle_info({route, From, To, Packet}, StateName, StateData) ->
{xmlelement, Name, Attrs, Els} = Packet,