diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-03-29 13:38:01 +0400 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-03-29 13:38:01 +0400 |
| commit | 0d80e7e68af12e30deea479aa6cd74d8128c3038 (patch) | |
| tree | 3ffd189f0a52d7fe9e4b526730af397e30122089 /src | |
| parent | 299a0f823aa7e239fcd32c6d1ba5a061d21e01a4 (diff) | |
Get rid of references to non-existent module
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 23 | ||||
| -rw-r--r-- | src/ejabberd_sup.erl | 8 |
2 files changed, 14 insertions, 17 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 28c2901f6..1784f022f 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1942,16 +1942,14 @@ is_privacy_allow(StateData, From, To, Packet, Dir) -> presence_broadcast(StateData, From, JIDSet, Packet) -> JIDs = ?SETS:to_list(JIDSet), JIDs2 = format_and_check_privacy(From, StateData, Packet, JIDs, out), - Server = StateData#state.server, - send_multiple(From, Server, JIDs2, Packet). + send_multiple(StateData, From, JIDs2, Packet). %% Send presence when updating presence presence_broadcast_to_trusted(StateData, From, Trusted, JIDSet, Packet) -> JIDs = ?SETS:to_list(JIDSet), JIDs_trusted = [JID || JID <- JIDs, ?SETS:is_element(JID, Trusted)], JIDs2 = format_and_check_privacy(From, StateData, Packet, JIDs_trusted, out), - Server = StateData#state.server, - send_multiple(From, Server, JIDs2, Packet). + send_multiple(StateData, From, JIDs2, Packet). %% Send presence when connecting presence_broadcast_first(From, StateData, Packet) -> @@ -1963,7 +1961,7 @@ presence_broadcast_first(From, StateData, Packet) -> PacketProbe = #xmlel{name = <<"presence">>, attrs = [{<<"type">>,<<"probe">>}], children = []}, JIDs2Probe = format_and_check_privacy(From, StateData, Packet, JIDsProbe, out), Server = StateData#state.server, - send_multiple(From, Server, JIDs2Probe, PacketProbe), + send_multiple(StateData, From, JIDs2Probe, PacketProbe), {As, JIDs} = ?SETS:fold( fun(JID, {A, JID_list}) -> @@ -1973,7 +1971,7 @@ presence_broadcast_first(From, StateData, Packet) -> StateData#state.pres_f), JIDs2 = format_and_check_privacy(From, StateData, Packet, JIDs, out), Server = StateData#state.server, - send_multiple(From, Server, JIDs2, Packet), + send_multiple(StateData, From, JIDs2, Packet), StateData#state{pres_a = As}. format_and_check_privacy(From, StateData, Packet, JIDs, Dir) -> @@ -1994,9 +1992,16 @@ format_and_check_privacy(From, StateData, Packet, JIDs, Dir) -> end, FJIDs). -send_multiple(From, Server, JIDs, Packet) -> - ejabberd_router_multicast:route_multicast(From, Server, JIDs, Packet). - +send_multiple(StateData, From, JIDs, Packet) -> + lists:foreach( + fun(JID) -> + case privacy_check_packet(StateData, From, JID, Packet, out) of + deny -> + ok; + allow -> + ejabberd_router:route(From, JID, Packet) + end + end, JIDs). remove_element(E, Set) -> case (?SETS):is_element(E, Set) of diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl index 80d845fcb..7dcd29232 100644 --- a/src/ejabberd_sup.erl +++ b/src/ejabberd_sup.erl @@ -63,13 +63,6 @@ init([]) -> brutal_kill, worker, [ejabberd_router]}, - Router_multicast = - {ejabberd_router_multicast, - {ejabberd_router_multicast, start_link, []}, - permanent, - brutal_kill, - worker, - [ejabberd_router_multicast]}, SM = {ejabberd_sm, {ejabberd_sm, start_link, []}, @@ -196,7 +189,6 @@ init([]) -> NodeGroups, SystemMonitor, Router, - Router_multicast, SM, S2S, Local, |