Presence fixes (again)
[prosody.git] / main.lua
index 864a1ee4803228c6d2b2c1bbea9671e91c4f9c8e..e9e8fca2cf4483d52221be6aa28e729c7a80e3e9 100644 (file)
--- a/main.lua
+++ b/main.lua
@@ -1,14 +1,22 @@
-require "luarocks.require"
+pcall(require, "luarocks.require")
 
-server = require "net.server"
+local server = require "net.server"
+require "lxp"
 require "socket"
 require "ssl"
-require "lxp"
 
 function log(type, area, message)
        print(type, area, message);
 end
+
+dofile "lxmppd.cfg"
  
+-- Maps connections to sessions --
+sessions = {};
+-- Load and initialise core modules --
+require "util.import"
 require "core.stanza_dispatch"
 require "core.xmlhandlers"
 require "core.rostermanager"
@@ -17,151 +25,26 @@ require "core.modulemanager"
 require "core.usermanager"
 require "core.sessionmanager"
 require "core.stanza_router"
+
+local start = require "net.connlisteners".start;
 require "util.stanza"
 require "util.jid"
+
+------------------------------------------------------------------------
+
 -- Locals for faster access --
 local t_insert = table.insert;
 local t_concat = table.concat;
 local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
 local m_random = math.random;
 local format = string.format;
+local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session");
 local st = stanza;
-local init_xmlhandlers = xmlhandlers.init_xmlhandlers;
 ------------------------------
 
-sessions = {};
-hosts =        { 
-                       ["localhost"] =         {
-                                                       type = "local";
-                                                       connected = true;
-                                                       sessions = {};
-                                               };
-                       ["getjabber.ath.cx"] =  {
-                                                       type = "local";
-                                                       connected = true;
-                                                       sessions = {};
-                                               };
-               }
-
-local hosts, users = hosts, users;
-
-local ssl_ctx = { mode = "server", protocol = "sslv23", key = "/home/matthew/ssl_cert/server.key",
-    certificate = "/home/matthew/ssl_cert/server.crt", capath = "/etc/ssl/certs", verify = "none", }
-
-
-function connect_host(host)
-       hosts[host] = { type = "remote", sendbuffer = {} };
-end
-
-local function route_stanza(stanza)
-       if not stanza.attr.to then
-               -- Has no 'to' attribute, handle internally
-       end
-       local node, host, resource = jid.split(stanza.attr.to);
-       if host and hosts[host] and hosts[host].type == "local" then
-                       -- Is a local host, handle internally
-                       
-       else
-               -- Is not for us or a local user, route accordingly
-       end
-end
-
-local function send_to(session, to, stanza)
-       local node, host, resource = jid.split(to);
-       if not hosts[host] then
-               -- s2s
-       elseif hosts[host].type == "local" then
-               print("   ...is to a local user")
-               local destuser = hosts[host].sessions[node];
-               if destuser and destuser.sessions then
-                       if not destuser.sessions[resource] then
-                               local best_session;
-                               for resource, session in pairs(destuser.sessions) do
-                                       if not best_session then best_session = session;
-                                       elseif session.priority >= best_session.priority and session.priority >= 0 then
-                                               best_session = session;
-                                       end
-                               end
-                               if not best_session then
-                                       offlinemessage.new(node, host, stanza);
-                               else
-                                       print("resource '"..resource.."' was not online, have chosen to send to '"..best_session.username.."@"..best_session.host.."/"..best_session.resource.."'");
-                                       resource = best_session.resource;
-                               end
-                       end
-                       if destuser.sessions[resource] == session then
-                               log("warn", "core", "Attempt to send stanza to self, dropping...");
-                       else
-                               print("...sending...", tostring(stanza));
-                               --destuser.sessions[resource].conn.write(tostring(data));
-                               print("   to conn ", destuser.sessions[resource].conn);
-                               destuser.sessions[resource].conn.write(tostring(stanza));
-                               print("...sent")
-                       end
-               elseif stanza.name == "message" then
-                       print("   ...will be stored offline");
-                       offlinemessage.new(node, host, stanza);
-               elseif stanza.name == "iq" then
-                       print("   ...is an iq");
-                       session.send(st.reply(stanza)
-                               :tag("error", { type = "cancel" })
-                                       :tag("service-unavailable", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" }));
-               end
-               print("   ...done routing");
-       end
-end
-
-function handler(conn, data, err)
-       local session = sessions[conn];
-
-       if not session then
-               sessions[conn] = sessionmanager.new_session(conn);
-               session = sessions[conn];
-
-               -- Logging functions --
-
-               local mainlog, log = log;
-               do
-                       local conn_name = tostring(conn):match("%w+$");
-                       log = function (type, area, message) mainlog(type, conn_name, message); end
-                       --log = function () end
-               end
-               local print = function (...) log("info", "core", t_concatall({...}, "\t")); end
-               session.log = log;
-
-               print("Client connected");
-               
-               session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end
-               session.xml_handlers = init_xmlhandlers(session);
-               session.parser = lxp.new(session.xml_handlers, ":");
-                       
-               function session.disconnect(err)
-                       if session.last_presence and session.last_presence.attr.type ~= "unavailable" then
-                               local pres = st.presence{ type = "unavailable" };
-                               if err == "closed" then err = "connection closed"; end
-                               pres:tag("status"):text("Disconnected: "..err);
-                               session.stanza_dispatch(pres);
-                       end
-                       if session.username then
-                               hosts[session.host].sessions[session.username] = nil;
-                       end
-                       session = nil;
-                       print("Disconnected: "..err);
-                       collectgarbage("collect");
-               end
-       end
-       if data then
-               session.parser:parse(data);
-       end
-       
-       --log("info", "core", "Client disconnected, connection closed");
-end
-
-function disconnect(conn, err)
-       sessions[conn].disconnect(err);
-end
+local hosts, sessions = hosts, sessions;
 
+-- Initialise modules
 modulemanager.loadall();
 
 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 }) --]][][[]][];
@@ -170,7 +53,6 @@ setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A N
 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;
 
-server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5222, "*", 1, nil ) -- server.add will send a status message
-server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5223, "*", 1, ssl_ctx ) -- server.add will send a status message
+start("xmppclient", { ssl = ssl_ctx })
 
 server.loop();