X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fhostmanager.lua;h=26a396912b1efc07a568ffa09499cb1c70fb5300;hb=dc8ec173dae57af8b36462383757b02009bb122e;hp=0dd2c9d879a40f18485fc139eaf50f76d85c02ba;hpb=d1f8a1a9eb85c87794145d4f269373569e4eaa1e;p=prosody.git

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 0dd2c9d8..26a39691 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -1,12 +1,27 @@
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
 
-local hosts = hosts;
 local configmanager = require "core.configmanager";
-local eventmanager = require "core.eventmanager";
+local modulemanager = require "core.modulemanager";
 local events_new = require "util.events".new;
 
+local uuid_gen = require "util.uuid".generate;
+
 local log = require "util.logger".init("hostmanager");
 
-local pairs = pairs;
+local hosts = hosts;
+local prosody_events = prosody.events;
+if not _G.prosody.incoming_s2s then
+	require "core.s2smanager";
+end
+local incoming_s2s = _G.prosody.incoming_s2s;
+
+local pairs, setmetatable = pairs, setmetatable;
 
 module "hostmanager"
 
@@ -14,47 +29,87 @@ local hosts_loaded_once;
 
 local function load_enabled_hosts(config)
 	local defined_hosts = config or configmanager.getconfig();
+	local activated_any_host;
 	
 	for host, host_config in pairs(defined_hosts) do
-		if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) then
+		if host ~= "*" and host_config.core.enabled ~= false and not host_config.core.component_module then
+			activated_any_host = true;
 			activate(host, host_config);
 		end
 	end
-	eventmanager.fire_event("hosts-activated", defined_hosts);
+	
+	if not activated_any_host then
+		log("error", "No active VirtualHost entries in the config file. This may cause unexpected behaviour as no modules will be loaded.");
+	end
+	
+	prosody_events.fire_event("hosts-activated", defined_hosts);
 	hosts_loaded_once = true;
 end
 
-eventmanager.add_event_hook("server-starting", load_enabled_hosts);
+prosody_events.add_handler("server-starting", load_enabled_hosts);
 
 function activate(host, host_config)
-	hosts[host] = {type = "local", connected = true, sessions = {}, 
-	               host = host, s2sout = {}, events = events_new(), 
-	               disallow_s2s = configmanager.get(host, "core", "disallow_s2s") 
-	                 or (configmanager.get(host, "core", "anonymous_login") 
-	                     and (configmanager.get(host, "core", "disallow_s2s") ~= false))
+	hosts[host] = {type = "local", connected = true, sessions = {},
+			host = host, s2sout = {}, events = events_new(),
+			disallow_s2s = configmanager.get(host, "core", "disallow_s2s")
+				or (configmanager.get(host, "core", "anonymous_login")
+				and (configmanager.get(host, "core", "disallow_s2s") ~= false));
+			dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen();
 	              };
+	for option_name in pairs(host_config.core) do
+		if option_name:match("_ports$") or option_name:match("_interface$") then
+			log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name);
+		end
+	end
+	
 	log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host);
-	eventmanager.fire_event("host-activated", host, host_config);
+	prosody_events.fire_event("host-activated", host, host_config);
 end
 
-function deactivate(host)
+function deactivate(host, reason)
 	local host_session = hosts[host];
 	log("info", "Deactivating host: %s", host);
-	eventmanager.fire_event("host-deactivating", host, host_session);
+	prosody_events.fire_event("host-deactivating", host, host_session);
+	
+	reason = reason or { condition = "host-gone", text = "This server has stopped serving "..host };
 	
 	-- Disconnect local users, s2s connections
-	for user, session_list in pairs(host_session.sessions) do
-		for resource, session in pairs(session_list) do
-			session:close("host-gone");
+	if host_session.sessions then
+		for username, user in pairs(host_session.sessions) do
+			for resource, session in pairs(user.sessions) do
+				log("debug", "Closing connection for %s@%s/%s", username, host, resource);
+				session:close(reason);
+			end
 		end
 	end
-	-- Components?
-	
+	if host_session.s2sout then
+		for remotehost, session in pairs(host_session.s2sout) do
+			if session.close then
+				log("debug", "Closing outgoing connection to %s", remotehost);
+				if session.srv_hosts then session.srv_hosts = nil; end
+				session:close(reason);
+			end
+		end
+	end
+	for remote_session in pairs(incoming_s2s) do
+		if remote_session.to_host == host then
+			log("debug", "Closing incoming connection from %s", remote_session.from_host or "<unknown>");
+			remote_session:close(reason);
+		end
+	end
+
+	if host_session.modules then
+		for module in pairs(host_session.modules) do
+			modulemanager.unload(host, module);
+		end
+	end
+
 	hosts[host] = nil;
-	eventmanager.fire_event("host-deactivated", host);
+	prosody_events.fire_event("host-deactivated", host);
 	log("info", "Deactivated host: %s", host);
 end
 
 function getconfig(name)
 end
 
+return _M;