#!/usr/bin/env lua
--- Prosody IM v0.1
+-- Prosody IM v0.2
-- Copyright (C) 2008 Matthew Wild
-- Copyright (C) 2008 Waqas Hussain
--
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--
-
-
-- Config here --
CFG_SOURCEDIR=nil;
config = require "core.configmanager"
log = require "util.logger".init("general");
+-- Disable log output, needs to read from config
+-- require "util.logger".setwriter(function () end);
+
do
-- TODO: Check for other formats when we add support for them
-- Use lfs? Make a new conf/ dir?
end
end
-require "util.datamanager".set_data_path(data_path);
-
local server = require "net.server"
require "util.dependencies"
sessions = {};
hosts = {};
-
-- Load and initialise core modules --
require "util.import"
------------------------------------------------------------------------
+
------------- Begin code without a home ---------------------
local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
+require "util.datamanager".set_data_path(data_path);
+
+
local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
local _mkdir = {}
function mkdir(path)
path = path:gsub("/", path_separator);
- --print("mkdir",path);
local x = io.popen("mkdir \""..path.."\" 2>&1"):read("*a");
end
-function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end
+function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end
function mkdirs(host)
if not _mkdir[host] then
local host_dir = string.format("%s/%s", data_path, encode(host));
-- setup error handling
-setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][];
-
-local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end;
-local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end;
-
+setmetatable(_G, { __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 });
local global_ssl_ctx = config.get("*", "core", "ssl");
if global_ssl_ctx then
end
-- start listening on sockets
-cl.start("xmppclient", { ssl = global_ssl_ctx })
-cl.start("xmppserver", { ssl = global_ssl_ctx })
+local function do_ports(option, listener, default, key)
+ local ports = config.get("*", "core", option) or default;
+ --if type(ports) == "number" then ports = {ports} end;
+ if type(ports) ~= "table" then
+ log("error", "core."..option.." is not a table");
+ else
+ for _, port in ipairs(ports) do
+ if type(port) ~= "number" then
+ log("error", "Non-numeric "..option..": "..tostring(port));
+ else
+ cl.start(listener, { ssl = global_ssl_ctx, [key] = port });
+ end
+ end
+ end
+end
+
+do_ports("c2s_ports", "xmppclient", {5222}, "port");
+do_ports("s2s_ports", "xmppserver", {5269}, "port");
+do_ports("legacy_ssl_ports", "xmppclient", {}, "legacy_ssl_port");
if config.get("*", "core", "console_enabled") then
if cl.get("console") then