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

* src/mod_muc/mod_muc_room.erl: Bugfix 

* src/ejabberd_sm.erl (route_message): Bugfix

SVN Revision: 172
This commit is contained in:
Alexey Shchepin 2003-11-10 14:32:19 +00:00
parent e18445a58e
commit 592d738114
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-11-10 Alexey Shchepin <alexey@sevcom.net>
* src/mod_muc/mod_muc_room.erl: Bugfix
* src/ejabberd_sm.erl (route_message): Bugfix
2003-11-09 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_sm.erl: Bugfix for previous resource handling

18
src/ejabberd_sm.erl
View File

@ -300,13 +300,19 @@ route_message(From, To, Packet) ->
{'EXIT', _} ->
case ejabberd_auth:is_user_exists(LUser) of
true ->
case catch mod_offline:store_packet(From, To, Packet) of
{'EXIT', _} ->
Err = jlib:make_error_reply(
Packet, ?ERR_SERVICE_UNAVAILABLE),
ejabberd_router:route(To, From, Err);
case xml:get_tag_attr_s("type", Packet) of
"error" ->
ok;
_ ->
ok
case catch mod_offline:store_packet(
From, To, Packet) of
{'EXIT', _} ->
Err = jlib:make_error_reply(
Packet, ?ERR_SERVICE_UNAVAILABLE),
ejabberd_router:route(To, From, Err);
_ ->
ok
end
end;
_ ->
Err = jlib:make_error_reply(

11
src/mod_muc/mod_muc_room.erl
View File

@ -256,9 +256,14 @@ normal_state({route, From, "",
{next_state, normal_state, StateData}
end;
_ ->
Err = jlib:make_error_reply(
Packet, ?ERR_NOT_ALLOWED),
ejabberd_router:route(StateData#state.jid, From, Err),
case xml:get_attr_s("type", Attrs) of
"error" ->
ok;
_ ->
Err = jlib:make_error_reply(
Packet, ?ERR_NOT_ALLOWED),
ejabberd_router:route(StateData#state.jid, From, Err)
end,
{next_state, normal_state, StateData}
end;