Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* src/ejabberd_c2s.erl: Bugfix in processing of connection 

replacement

SVN Revision: 180
This commit is contained in:
Alexey Shchepin 2003-12-02 20:20:53 +00:00
parent 48e8a0c0c6
commit 83a0be1009
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-02 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: Bugfix in processing of connection
replacement
2003-11-28 Alexey Shchepin <alexey@sevcom.net> 2003-11-28 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: Added workaround for some Java clients * src/ejabberd_c2s.erl: Added workaround for some Java clients

45
src/ejabberd_c2s.erl
View File

@ -676,7 +676,7 @@ handle_info({send_text, Text}, StateName, StateData) ->
handle_info(replaced, StateName, StateData) -> handle_info(replaced, StateName, StateData) ->
% TODO % TODO
%send_text(StateData#state.sender, Text), %send_text(StateData#state.sender, Text),
{stop, normal, StateData#state{user = ""}}; {stop, normal, StateData#state{authentificated = replaced}};
handle_info({route, From, To, Packet}, StateName, StateData) -> handle_info({route, From, To, Packet}, StateName, StateData) ->
{xmlelement, Name, Attrs, Els} = Packet, {xmlelement, Name, Attrs, Els} = Packet,
{Pass, NewAttrs, NewState} = {Pass, NewAttrs, NewState} =
@ -811,17 +811,38 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
terminate(Reason, StateName, StateData) -> terminate(Reason, StateName, StateData) ->
case StateName of case StateName of
session_established -> session_established ->
?INFO_MSG("(~w) Close session for ~s", case StateData#state.authentificated of
[StateData#state.socket, replaced ->
jlib:jid_to_string(StateData#state.jid)]), ?INFO_MSG("(~w) Replaced session for ~s",
ejabberd_sm:close_session(StateData#state.user, [StateData#state.socket,
StateData#state.resource), jlib:jid_to_string(StateData#state.jid)]),
From = StateData#state.jid, From = StateData#state.jid,
Packet = {xmlelement, "presence", [{"type", "unavailable"}], []}, Packet = {xmlelement, "presence",
ejabberd_sm:unset_presence(StateData#state.user, [{"type", "unavailable"}],
StateData#state.resource), [{xmlelement, "status", [],
presence_broadcast(StateData, From, StateData#state.pres_a, Packet), [{xmlcdata, "Replaced by new connection"}]}]},
presence_broadcast(StateData, From, StateData#state.pres_i, Packet); ejabberd_sm:unset_presence(StateData#state.user,
StateData#state.resource),
presence_broadcast(
StateData, From, StateData#state.pres_a, Packet),
presence_broadcast(
StateData, From, StateData#state.pres_i, Packet);
_ ->
?INFO_MSG("(~w) Close session for ~s",
[StateData#state.socket,
jlib:jid_to_string(StateData#state.jid)]),
ejabberd_sm:close_session(StateData#state.user,
StateData#state.resource),
From = StateData#state.jid,
Packet = {xmlelement, "presence",
[{"type", "unavailable"}], []},
ejabberd_sm:unset_presence(StateData#state.user,
StateData#state.resource),
presence_broadcast(
StateData, From, StateData#state.pres_a, Packet),
presence_broadcast(
StateData, From, StateData#state.pres_i, Packet)
end;
_ -> _ ->
ok ok
end, end,