mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-22 17:28:25 +01:00
* src/ejabberd_sm.erl: Updated missed message passing from
previous patch SVN Revision: 293
This commit is contained in:
parent
8c8e3469bc
commit
7c900deff9
@ -1,3 +1,8 @@
|
|||||||
|
2004-12-14 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
* src/ejabberd_sm.erl: Updated missed message passing from
|
||||||
|
previous patch
|
||||||
|
|
||||||
2004-12-13 Alexey Shchepin <alexey@sevcom.net>
|
2004-12-13 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
* src/odbc/pg.sql: DB creation script for postgres
|
* src/odbc/pg.sql: DB creation script for postgres
|
||||||
|
@ -197,11 +197,10 @@ do_route(From, To, Packet) ->
|
|||||||
fun({_, R}) ->
|
fun({_, R}) ->
|
||||||
if LFrom /=
|
if LFrom /=
|
||||||
{LUser, LServer, R} ->
|
{LUser, LServer, R} ->
|
||||||
ejabberd_sm !
|
do_route(
|
||||||
{route,
|
From,
|
||||||
From,
|
jlib:jid_replace_resource(To, R),
|
||||||
jlib:jid_replace_resource(To, R),
|
Packet);
|
||||||
Packet};
|
|
||||||
true ->
|
true ->
|
||||||
ok
|
ok
|
||||||
end
|
end
|
||||||
@ -233,10 +232,9 @@ do_route(From, To, Packet) ->
|
|||||||
"broadcast" ->
|
"broadcast" ->
|
||||||
lists:foreach(
|
lists:foreach(
|
||||||
fun(R) ->
|
fun(R) ->
|
||||||
ejabberd_sm ! {route,
|
do_route(From,
|
||||||
From,
|
jlib:jid_replace_resource(To, R),
|
||||||
jlib:jid_replace_resource(To, R),
|
Packet)
|
||||||
Packet}
|
|
||||||
end, get_user_resources(User));
|
end, get_user_resources(User));
|
||||||
_ ->
|
_ ->
|
||||||
ok
|
ok
|
||||||
@ -370,10 +368,8 @@ process_iq(From, To, Packet) ->
|
|||||||
ResIQ = Module:Function(From, To, IQ),
|
ResIQ = Module:Function(From, To, IQ),
|
||||||
if
|
if
|
||||||
ResIQ /= ignore ->
|
ResIQ /= ignore ->
|
||||||
ejabberd_router ! {route,
|
ejabberd_router:route(To, From,
|
||||||
To,
|
jlib:iq_to_xml(ResIQ));
|
||||||
From,
|
|
||||||
jlib:iq_to_xml(ResIQ)};
|
|
||||||
true ->
|
true ->
|
||||||
ok
|
ok
|
||||||
end;
|
end;
|
||||||
@ -383,7 +379,7 @@ process_iq(From, To, Packet) ->
|
|||||||
[] ->
|
[] ->
|
||||||
Err = jlib:make_error_reply(
|
Err = jlib:make_error_reply(
|
||||||
Packet, ?ERR_FEATURE_NOT_IMPLEMENTED),
|
Packet, ?ERR_FEATURE_NOT_IMPLEMENTED),
|
||||||
ejabberd_router ! {route, To, From, Err}
|
ejabberd_router:route(To, From, Err)
|
||||||
end;
|
end;
|
||||||
reply ->
|
reply ->
|
||||||
ok;
|
ok;
|
||||||
|
Loading…
Reference in New Issue
Block a user