X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=829ca4c41fc955f404c62a58e0cd968ec6424437;hb=de3565255c7f3f7bb08f2e247f0820f8aa763cb2;hp=90ac3adb47817b0ad90c5930e0a0480246e328c2;hpb=49d9be9b7a64eda7bb8b4a4f9684901de4620a0e;p=prosody.git

diff --git a/prosody b/prosody
index 90ac3adb..829ca4c4 100755
--- a/prosody
+++ b/prosody
@@ -64,8 +64,6 @@ config = require "core.configmanager"
 -- functions get called
 
 function read_config()
-	-- TODO: Check for other formats when we add support for them
-	-- Use lfs? Make a new conf/ dir?
 	local filenames = {};
 	
 	local filename;
@@ -75,7 +73,9 @@ function read_config()
 			table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
 		end
 	else
-		table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+		for _, format in ipairs(config.parsers()) do
+			table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
+		end
 	end
 	for _,_filename in ipairs(filenames) do
 		filename = _filename;
@@ -185,7 +185,7 @@ function init_global_state()
 	-- Load SSL settings from config, and create a ctx table
 	local global_ssl_ctx = rawget(_G, "ssl") and config.get("*", "core", "ssl");
 	if global_ssl_ctx then
-		local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2"; };
+		local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2" };
 		setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
 		prosody.global_ssl_ctx = global_ssl_ctx;
 	end
@@ -193,22 +193,24 @@ function init_global_state()
 	local cl = require "net.connlisteners";
 	function prosody.net_activate_ports(option, listener, default, conntype)
 		conntype = conntype or (global_ssl_ctx and "tls") or "tcp";
+		local ports_option = option and option.."_ports" or "ports";
 		if not cl.get(listener) then return; end
-		local ports = config.get("*", "core", option.."_ports") or default;
+		local ports = config.get("*", "core", ports_option) or default;
 		if type(ports) == "number" then ports = {ports} end;
 		
 		if type(ports) ~= "table" then
-			log("error", "core."..option.." is not a table");
+			log("error", "core."..ports_option.." is not a table");
 		else
 			for _, port in ipairs(ports) do
+				port = tonumber(port);
 				if type(port) ~= "number" then
-					log("error", "Non-numeric "..option.."_ports: "..tostring(port));
+					log("error", "Non-numeric "..ports_option..": "..tostring(port));
 				else
 					cl.start(listener, { 
 						ssl = conntype ~= "tcp" and global_ssl_ctx,
 						port = port,
-						interface = config.get("*", "core", option.."_interface") 
-							or cl.get(listener).default_interface 
+						interface = (option and config.get("*", "core", option.."_interface"))
+							or cl.get(listener).default_interface
 							or config.get("*", "core", "interface"),
 						type = conntype
 					});
@@ -285,17 +287,27 @@ function prepare_to_start()
 	prosody.events.fire_event("server-starting");
 
 	-- start listening on sockets
-	prosody.net_activate_ports("c2s", "xmppclient", {5222});
-	prosody.net_activate_ports("s2s", "xmppserver", {5269});
-	prosody.net_activate_ports("component", "xmppcomponent", {}, "tcp");
-	prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
+	if config.get("*", "core", "ports") then
+		prosody.net_activate_ports(nil, "multiplex", {5222, 5269});
+		if config.get("*", "core", "ssl_ports") then
+			prosody.net_activate_ports("ssl", "multiplex", {5223}, "ssl");
+		end
+	else
+		prosody.net_activate_ports("c2s", "xmppclient", {5222});
+		prosody.net_activate_ports("s2s", "xmppserver", {5269});
+		prosody.net_activate_ports("component", "xmppcomponent", {5347}, "tcp");
+		prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
+	end
 
 	prosody.start_time = os.time();
 end	
 
 function init_global_protection()
-	-- Catch global accesses --
-	local locked_globals_mt = { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }
+	-- Catch global accesses
+	local locked_globals_mt = {
+		__index = function (t, k) log("warn", "%s", debug.traceback("Attempt to read a non-existent global '"..tostring(k).."'", 2)); end;
+		__newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end;
+	};
 		
 	function prosody.unlock_globals()
 		setmetatable(_G, nil);