Pick first local multicast service, otherwise remote (ejabberd-contrib#105)

1 files changed, 11 insertions, 7 deletions

diff --git a/src/ejabberd_router_multicast.erl b/src/ejabberd_router_multicast.erl
index 9cd7dd3d..373d9227 100644
--- a/src/ejabberd_router_multicast.erl
+++ b/src/ejabberd_router_multicast.erl
@@ -202,14 +202,18 @@ do_route(From, Domain, Destinations, Packet) ->
 	%% If no multicast service is available in this server, send manually
 	[] -> do_route_normal(From, Destinations, Packet);
 
-	%% If available, send the packet using multicast service
-	[R] ->
-	    case R#route_multicast.pid of
-		Pid when is_pid(Pid) ->
-		    Pid ! {route_trusted, From, Destinations, Packet};
-		_ -> do_route_normal(From, Destinations, Packet)
-	    end
+	%% If some is available, send the packet using multicast service
+	Rs when is_list(Rs) ->
+	    Pid = pick_multicast_pid(Rs),
+	    Pid ! {route_trusted, From, Destinations, Packet}
     end.
 
+pick_multicast_pid(Rs) ->
+    List = case [R || R <- Rs, node(R#route_multicast.pid) == node()] of
+	[] -> Rs;
+	RLocals -> RLocals
+    end,
+    (hd(List))#route_multicast.pid.
+
 do_route_normal(From, Destinations, Packet) ->
     [ejabberd_router:route(From, To, Packet) || To <- Destinations].