Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Thu, 29 Jan 2009 17:54:37 +0000 (17:54 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 29 Jan 2009 17:54:37 +0000 (17:54 +0000)
core/componentmanager.lua
core/configmanager.lua
core/hostmanager.lua
core/modulemanager.lua
core/s2smanager.lua
net/connlisteners.lua
net/http.lua
net/server.lua
plugins/mod_muc.lua
prosody
util/dependencies.lua

index f8db2d2c7c74172c3e9ff3bc364bbae6253c34ee..0c33e7f69b63f77d8ca799c74ccb406d40d66393 100644 (file)
 \r
 \r
 local log = require "util.logger".init("componentmanager");
-local module_load = require "core.modulemanager".load;
-local module_unload = require "core.modulemanager".unload;\r
+local configmanager = require "core.configmanager";
+local eventmanager = require "core.eventmanager";
+local modulemanager = require "core.modulemanager";\r
 local jid_split = require "util.jid".split;\r
-local hosts = hosts;\r
+local hosts = hosts;
+
+local pairs, type, tostring = pairs, type, tostring;\r
 \r
 local components = {};\r
 \r
 module "componentmanager"\r
+
+function load_enabled_components(config)
+       local defined_hosts = config or configmanager.getconfig();
+               
+       for host, host_config in pairs(defined_hosts) do
+               if host ~= "*" and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
+                       hosts[host] = { type = "component", host = host, connected = true, s2sout = {} };
+                       modulemanager.load(host, "dialback");
+                       local ok, err = modulemanager.load(host, host_config.core.component_module);
+                       if not ok then
+                               log("error", "Error loading %s component %s: %s", tostring(host_config.core.component_module), tostring(host), tostring(err));
+                       else
+                               log("info", "Activated %s component: %s", host_config.core.component_module, host);
+                       end
+                       
+                       local ok, component_handler = modulemanager.call_module_method(modulemanager.get_module(host, host_config.core.component_module), "load_component");
+                       if not ok then
+                               log("error", "Error loading %s component %s: %s", tostring(host_config.core.component_module), tostring(host), tostring(component_handler));
+                       else
+                               components[host] = component_handler;
+                       end
+               end
+       end
+end
+
+eventmanager.add_event_hook("server-starting", load_enabled_components);
 \r
 function handle_stanza(origin, stanza)\r
        local node, host = jid_split(stanza.attr.to);\r
@@ -50,7 +79,7 @@ function register_component(host, component)
                components[host] = component;\r
                hosts[host] = { type = "component", host = host, connected = true, s2sout = {} };
                -- FIXME only load for a.b.c if b.c has dialback, and/or check in config
-               module_load(host, "dialback");\r
+               modulemanager.load(host, "dialback");\r
                log("debug", "component added: "..host);\r
                return hosts[host];\r
        else\r
@@ -60,7 +89,7 @@ end
 
 function deregister_component(host)
        if components[host] then
-               module_unload(host, "dialback");
+               modulemanager.unload(host, "dialback");
                components[host] = nil;
                hosts[host] = nil;
                log("debug", "component removed: "..host);
index a6e86347d105caf2f3409d8643ab8e89b2000156..a50e7223c442de42aa3e42d4b9606a3d4bdef54d 100644 (file)
@@ -107,7 +107,8 @@ do
        parsers.lua = {};
        function parsers.lua.load(data)
                local env;
-               env = setmetatable({ Host = true; host = true; }, { __index = function (t, k)
+               -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
+               env = setmetatable({ Host = true; host = true; Component = true, component = true }, { __index = function (t, k)
                                                                                                return rawget(_G, k) or
                                                                                                                function (settings_table)
                                                                                                                        config[__currenthost or "*"][k] = settings_table;
@@ -119,10 +120,21 @@ do
                
                function env.Host(name)
                        rawset(env, "__currenthost", name);
+                       -- Needs at least one setting to logically exist :)
                        set(name or "*", "core", "defined", true);
                end
                env.host = env.Host;
                
+               function env.Component(name)
+                       return function (module)
+                                       set(name, "core", "component_module", module);
+                                       -- Don't load the global modules by default
+                                       set(name, "core", "modules_enable", false);
+                                       rawset(env, "__currenthost", name);
+                               end
+               end
+               env.component = env.Component;
+               
                local chunk, err = loadstring(data);
                
                if not chunk then
index 64bb13f70d658b0866f1d5c883e7a41d8e6a0443..1fec97999d1dcadb868558726d552bd61efd9737 100644 (file)
@@ -17,6 +17,7 @@ local function load_enabled_hosts(config)
                        activate(host, host_config);
                end
        end
+       eventmanager.fire_event("hosts-activated", defined_hosts);
 end
 
 eventmanager.add_event_hook("server-starting", load_enabled_hosts);
index e783e9b43bbc85e97ff72c01fef040e4997e2483..8292eaa5d0d4147ce92cab7cad93fb1aecf3b981 100644 (file)
@@ -29,10 +29,12 @@ local config = require "core.configmanager";
 local multitable_new = require "util.multitable".new;
 local register_actions = require "core.actions".register;
 
+local hosts = hosts;
+
 local loadfile, pcall = loadfile, pcall;
 local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv;
 local pairs, ipairs = pairs, ipairs;
-local t_insert = table.insert;
+local t_insert, t_concat = table.insert, table.concat;
 local type = type;
 local next = next;
 local rawget = rawget;
@@ -107,7 +109,7 @@ function load(host, module_name, config)
        end
        
 
-       local mod, err = loadfile(plugin_dir.."mod_"..module_name..".lua");
+       local mod, err = loadfile(get_module_filename(module_name));
        if not mod then
                log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
                return nil, err;
@@ -132,18 +134,22 @@ function load(host, module_name, config)
        return true;
 end
 
+function get_module(host, name)
+       return modulemap[host] and modulemap[host][name];
+end
+
 function is_loaded(host, name)
        return modulemap[host] and modulemap[host][name] and true;
 end
 
 function unload(host, name, ...)
-       local mod = modulemap[host] and modulemap[host][name];
+       local mod = get_module(host, name); 
        if not mod then return nil, "module-not-loaded"; end
        
-       if type(mod.module.unload) == "function" then
-               local ok, err = pcall(mod.module.unload, ...)
+       if module_has_method(mod, "unload") then
+               local ok, err = call_module_method(mod, "unload");
                if (not ok) and err then
-                       log("warn", "Non-fatal error unloading module '%s' from '%s': %s", name, host, err);
+                       log("warn", "Non-fatal error unloading module '%s' on '%s': %s", name, host, err);
                end
        end
        modulemap[host][name] = nil;
@@ -161,36 +167,45 @@ function unload(host, name, ...)
 end
 
 function reload(host, name, ...)
-       local mod = modulemap[host] and modulemap[host][name];
+       local mod = get_module(host, name);
        if not mod then return nil, "module-not-loaded"; end
 
-       local _mod, err = loadfile(plugin_dir.."mod_"..name..".lua"); -- checking for syntax errors
+       local _mod, err = loadfile(get_module_filename(name)); -- checking for syntax errors
        if not _mod then
                log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
                return nil, err;
        end
 
        local saved;
-       if type(mod.module.save) == "function" then
-               local ok, err = pcall(mod.module.save)
-               if (not ok) and err then
-                       log("warn", "Non-fatal error unloading module '%s' from '%s': %s", name, host, err);
+
+       if module_has_method(mod, "save") then
+               local ok, ret, err = call_module_method(mod, "save");
+               if ok then
+                       saved = ret;
                else
-                       saved = err;
+                       log("warn", "Error saving module '%s:%s' state: %s", host, module, ret);
+                       if not config.get(host, "core", "force_module_reload") then
+                               log("warn", "Aborting reload due to error, set force_module_reload to ignore this");
+                               return nil, "save-state-failed";
+                       else
+                               log("warn", "Continuing with reload (using the force)");
+                       end
                end
        end
 
        unload(host, name, ...);
-       if load(host, name, ...) then
-               mod = modulemap[host] and modulemap[host][name];
-               if type(mod.module.restore) == "function" then
-                       local ok, err = pcall(mod.module.restore, saved or {})
+       local ok, err = load(host, name, ...);
+       if ok then
+               mod = get_module(host, name);
+               if module_has_method(mod, "restore") then
+                       local ok, err = call_module_method(mod, "restore", saved or {})
                        if (not ok) and err then
-                               log("warn", "Non-fatal error unloading module '%s' from '%s': %s", name, host, err);
+                               log("warn", "Error restoring module '%s' from '%s': %s", name, host, err);
                        end
                end
                return true;
        end
+       return ok, err;
 end
 
 function handle_stanza(host, origin, stanza)
@@ -214,6 +229,25 @@ function handle_stanza(host, origin, stanza)
        end
 end
 
+function module_has_method(module, method)
+       return type(module.module[method]) == "function";
+end
+
+function call_module_method(module, method, ...)
+       if module_has_method(module, method) then       
+               local f = module.module[method];
+               return pcall(f, ...);
+       else
+               return false, "no-such-method";
+       end
+end
+
+local _modulepath = { plugin_dir, "mod_", nil, ".lua"};
+function get_module_filename(name)
+       _modulepath[3] = name;
+       return t_concat(_modulepath);
+end
+
 ----- API functions exposed to modules -----------
 -- Must all be in api.* 
 
@@ -227,6 +261,14 @@ function api:get_host()
        return self.host;
 end
 
+function api:get_host_type()
+       return hosts[self.host].type;
+end
+
+function api:set_global()
+       self.host = "*";
+end
+
 local function _add_handler(module, origin_type, tag, xmlns, handler)
        local handlers = stanza_handlers:get(module.host, origin_type, tag, xmlns);
        local msg = (tag == "iq") and "namespace" or "payload namespace";
index bc1abfe847519a6d80c39e54d918e397767925d9..5243085c98220ba0fb3410cbc3ef4049069ea605 100644 (file)
@@ -31,7 +31,7 @@ local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber
 
 local idna_to_ascii = require "util.encodings".idna.to_ascii;
 local connlisteners_get = require "net.connlisteners".get;
-local wraptlsclient = require "net.server".wraptlsclient;
+local wrapclient = require "net.server".wrapclient;
 local modulemanager = require "core.modulemanager";
 local st = require "stanza";
 local stanza = st.stanza;
@@ -196,7 +196,7 @@ function attempt_connection(host_session, err)
        end
        
        local cl = connlisteners_get("xmppserver");
-       conn = wraptlsclient(cl, conn, connect_host, connect_port, 0, cl.default_mode or 1, hosts[from_host].ssl_ctx );
+       conn = wrapclient(conn, connect_host, connect_port, cl, cl.default_mode or 1, hosts[from_host].ssl_ctx, false );
        host_session.conn = conn;
        
        -- Register this outgoing connection so that xmppserver_listener knows about it
index 1230b79cc1f0bfe8a8ea6c742dd244c739a5096a..c25f3af820402ed3cd033b36497be9027ac0cc57 100644 (file)
@@ -54,19 +54,23 @@ function get(name)
        return h;
 end
 
-local wrapper_functions = { tcp = server.wraptcpclient, ssl = server.wrapsslclient, tls = server.wraptlsclient }
-
 function start(name, udata)
        local h, err = get(name);
        if not h then
                error("No such connection module: "..name.. (err and (" ("..err..")") or ""), 0);
        end
        
-       local wrapper_function = wrapper_functions[(udata and udata.type)] or wrapper_functions.tcp;
+       if udata then
+               if (udata.type == "ssl" or udata.type == "tls") and not udata.ssl then
+                       error("No SSL context supplied for a "..tostring(udata.type):upper().." connection!", 0);
+               elseif udata.ssl and udata.type == "tcp" then
+                       error("SSL context supplied for a TCP connection!", 0);
+               end
+       end
        
-       return server.add(h, 
+       return server.addserver(h, 
                        (udata and udata.port) or h.default_port or error("Can't start listener "..name.." because no port was specified, and it has no default port", 0), 
-                               (udata and udata.interface) or "*", (udata and udata.mode) or h.default_mode or 1, (udata and udata.ssl) or nil, wrapper_function);
+                               (udata and udata.interface) or "*", (udata and udata.mode) or h.default_mode or 1, (udata and udata.ssl) or nil, 99999999, udata and udata.type == "ssl");
 end
 
 return _M;
index 043c589066752c33601d2d8e40361ae6e2d842ac..1ecbf41079f4ee6837e2178cb675b933efa74fbe 100644 (file)
@@ -134,7 +134,7 @@ function request(u, ex, callback)
                if ex.method then req.method = ex.method; end
        end
        
-       req.handler, req.conn = server.wraptcpclient(listener, socket.tcp(), req.host, req.port or 80, 0, "*a");
+       req.handler, req.conn = server.wrapclient(socket.tcp(), req.host, req.port or 80, listener, "*a");
        req.write = req.handler.write;
        req.conn:settimeout(0);
        local ok, err = req.conn:connect(req.host, req.port or 80);
index 7416276f467abff6b27f26b3e2b31306459da701..b5d84dd93ce32471a49099539b4226287295fefa 100644 (file)
---[[
-
-               server.lua by blastbeat of the luadch project
-               
-               re-used here under the MIT/X Consortium License
-               
-               Modifications (C) 2008 Matthew Wild, Waqas Hussain
-]]--
-
-----------------------------------// DECLARATION //--
-
---// constants //--
-
-local STAT_UNIT = 1 / ( 1024 * 1024 )    -- mb
-
---// lua functions //--
-
-local function use( what ) return _G[ what ] end
-
-local type = use "type"
-local pairs = use "pairs"
-local ipairs = use "ipairs"
-local tostring = use "tostring"
-local collectgarbage = use "collectgarbage"
-
---// lua libs //--
-
-local table = use "table"
-local coroutine = use "coroutine"
-
---// lua lib methods //--
-
-local table_concat = table.concat
-local table_remove = table.remove
-local string_sub = use'string'.sub
-local coroutine_wrap = coroutine.wrap
-local coroutine_yield = coroutine.yield
-local print = print;
-
-local log = require "util.logger".init("server");
-local out_put = function () end --print;
-local out_error = function (...) log("error", table_concat({...}, " ")); end
-
---// extern libs //--
-
-local luasec = select(2, pcall(require, "ssl"))
-local luasocket = require "socket"
-
---// extern lib methods //--
-
-local ssl_wrap = ( luasec and luasec.wrap )
-local socket_bind = luasocket.bind
-local socket_select = luasocket.select
-local ssl_newcontext = ( luasec and luasec.newcontext )
-
---// functions //--
-
-local loop
-local stats
-local addtimer
-local closeall
-local addserver
-local firetimer
-local closesocket
-local removesocket
-local wrapserver
-local wraptcpclient
-local wrapsslclient
-
---// tables //--
-
-local listener
-local readlist
-local writelist
-local socketlist
-local timelistener
-
---// simple data types //--
-
-local _
-local readlen = 0    -- length of readlist
-local writelen = 0    -- lenght of writelist
-
-local sendstat= 0
-local receivestat = 0
-
-----------------------------------// DEFINITION //--
-
-listener = { }    -- key = port, value = table
-readlist = { }    -- array with sockets to read from
-writelist = { }    -- arrary with sockets to write to
-socketlist = { }    -- key = socket, value = wrapped socket
-timelistener = { }
-
-stats = function( )
-       return receivestat, sendstat
-end
-
-wrapserver = function( listener, socket, ip, serverport, mode, sslctx, wrapper_function )    -- this function wraps a server
-
-       local dispatch, disconnect = listener.listener, listener.disconnect    -- dangerous
-
-       local wrapclient, err
-
-       out_put("Starting a new server on "..tostring(serverport).." with ssl: "..tostring(sslctx));
-       if sslctx then
-               if not ssl_newcontext then
-                       return nil, "luasec not found"
-               end
-               if type( sslctx ) ~= "table" then
-                       out_error "server.lua: wrong server sslctx"
-                       return nil, "wrong server sslctx"
-               end
-               sslctx, err = ssl_newcontext( sslctx )
-               if not sslctx then
-                       err = err or "wrong sslctx parameters"
-                       out_error( "server.lua: ", err )
-                       return nil, err
-               end
-       end
-       
-       if wrapper_function then
-               wrapclient = wrapper_function
-       elseif sslctx then
-               wrapclient = wrapsslclient
-       else
-               wrapclient = wraptcpclient
-       end
-       
-       local accept = socket.accept
-       local close = socket.close
-
-       --// public methods of the object //--    
-
-       local handler = { }
-
-       handler.shutdown = function( ) end
-
-       --[[handler.listener = function( data, err )
-               return ondata( handler, data, err )
-       end]]
-       handler.ssl = function( )
-               return sslctx and true or false
-       end
-       handler.close = function( closed )
-               _ = not closed and close( socket )
-               writelen = removesocket( writelist, socket, writelen )
-               readlen = removesocket( readlist, socket, readlen )
-               socketlist[ socket ] = nil
-               handler = nil
-       end
-       handler.ip = function( )
-               return ip
-       end
-       handler.serverport = function( )
-               return serverport
-       end
-       handler.socket = function( )
-               return socket
-       end
-       handler.receivedata = function( )
-               local client, err = accept( socket )    -- try to accept
-               if client then
-                       local ip, clientport = client:getpeername( )
-                       client:settimeout( 0 )
-                       local handler, client, err = wrapclient( listener, client, ip, serverport, clientport, mode, sslctx )    -- wrap new client socket
-                       if err then    -- error while wrapping ssl socket
-                               return false
-                       end
-                       out_put( "server.lua: accepted new client connection from ", ip, ":", clientport )
-                       return dispatch( handler )
-               elseif err then    -- maybe timeout or something else
-                       out_put( "server.lua: error with new client connection: ", err )
-                       return false
-               end
-       end
-       return handler
-end
-
-wrapsslclient = function( listener, socket, ip, serverport, clientport, mode, sslctx )    -- this function wraps a ssl cleint
-
-       local dispatch, disconnect = listener.listener, listener.disconnect
-
-       --// transform socket to ssl object //--
-
-       local err
-       socket, err = ssl_wrap( socket, sslctx )    -- wrap socket
-       if err then
-               out_put( "server.lua: ssl error: ", err )
-               return nil, nil, err    -- fatal error
-       end
-       socket:settimeout( 0 )
-
-       --// private closures of the object //--
-
-       local writequeue = { }    -- buffer for messages to send
-
-       local eol, fatal_send_error, wants_closing
-
-       local sstat, rstat = 0, 0
-
-       --// local import of socket methods //--
-
-       local send = socket.send
-       local receive = socket.receive
-       local close = socket.close
-       --local shutdown = socket.shutdown
-
-       --// public methods of the object //--
-
-       local handler = { }
-
-       handler.getstats = function( )
-               return rstat, sstat
-       end
-
-       handler.listener = function( data, err )
-               return listener( handler, data, err )
-       end
-       handler.ssl = function( )
-               return true
-       end
-       handler.send = function( _, data, i, j )
-                       return send( socket, data, i, j )
-       end
-       handler.receive = function( pattern, prefix )
-                       return receive( socket, pattern, prefix )
-       end
-       handler.shutdown = function( pattern )
-               --return shutdown( socket, pattern )
-       end
-       handler.close = function( closed )
-               if eol and not fatal_send_error then
-                       -- There is data in the buffer, and we haven't experienced
-                       -- an error trying to send yet, so we'll flush the buffer now
-                       handler._dispatchdata();
-                       if eol then
-                               -- and there is *still* data in the buffer
-                               -- we'll give up for now, and close later
-                               wants_closing = true;
-                               return;
-                       end
-               end
-               close( socket )
-               writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen
-               readlen = removesocket( readlist, socket, readlen )
-               socketlist[ socket ] = nil
-               out_put "server.lua: closed handler and removed socket from list"
-       end
-       handler.ip = function( )
-               return ip
-       end
-       handler.serverport = function( )
-               return serverport
-       end
-       handler.clientport = function( ) 
-               return clientport
-       end
-
-       handler.write = function( data )
-               if not eol then
-                       writelen = writelen + 1
-                       writelist[ writelen ] = socket
-                       eol = 0
-               end
-               eol = eol + 1
-               writequeue[ eol ] = data
-       end
-       handler.writequeue = function( )
-               return writequeue
-       end
-       handler.socket = function( )
-               return socket
-       end
-       handler.mode = function( )
-               return mode
-       end
-       handler._receivedata = function( )
-               local data, err, part = receive( socket, mode )    -- receive data in "mode"
-               if not err or ( err == "timeout" or err == "wantread" ) then    -- received something
-                       local data = data or part or ""
-                       local count = #data * STAT_UNIT
-                       rstat = rstat + count
-                       receivestat = receivestat + count
-                       --out_put( "server.lua: read data '", data, "', error: ", err )
-                       return dispatch( handler, data, err )
-               else    -- connections was closed or fatal error
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
-                       handler.close( )
-                       disconnect( handler, err )
-                       writequeue = nil
-                       handler = nil
-                       return false
-               end
-       end
-       handler._dispatchdata = function( )    -- this function writes data to handlers
-               local buffer = table_concat( writequeue, "", 1, eol )
-               local succ, err, byte = send( socket, buffer )
-               local count = ( succ or 0 ) * STAT_UNIT
-               sstat = sstat + count
-               sendstat = sendstat + count
-               out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )
-               if succ then    -- sending succesful
-                       --writequeue = { }
-                       eol = nil
-                       writelen = removesocket( writelist, socket, writelen )    -- delete socket from writelist
-                       if wants_closing then
-                               handler.close();
-                       end
-                       return true
-               elseif byte and ( err == "timeout" or err == "wantwrite" ) then    -- want write
-                       buffer = string_sub( buffer, byte + 1, -1 )    -- new buffer
-                       writequeue[ 1 ] = buffer    -- insert new buffer in queue
-                       eol = 1
-                       return true
-               else    -- connection was closed during sending or fatal error
-                       fatal_send_error = true;
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
-                       handler.close( )
-                       disconnect( handler, err )
-                       writequeue = nil
-                       handler = nil
-                       return false
-               end
-       end
-
-       -- // COMPAT // --
-
-       handler.getIp = handler.ip
-       handler.getPort = handler.clientport
-
-       --// handshake //--
-
-       local wrote
-
-       handler.handshake = coroutine_wrap( function( client )
-                       local err
-                       for i = 1, 10 do    -- 10 handshake attemps
-                               _, err = client:dohandshake( )
-                               if not err then
-                                       out_put( "server.lua: ssl handshake done" )
-                                       writelen = ( wrote and removesocket( writelist, socket, writelen ) ) or writelen
-                                       handler.receivedata = handler._receivedata    -- when handshake is done, replace the handshake function with regular functions
-                                       handler.dispatchdata = handler._dispatchdata
-                                       return dispatch( handler )
-                               else
-                                       out_put( "server.lua: error during ssl handshake: ", err )
-                                       if err == "wantwrite" then
-                                               if wrote == nil then
-                                                       writelen = writelen + 1
-                                                       writelist[ writelen ] = client
-                                                       wrote = true
-                                               end
-                                       end
-                                       coroutine_yield( handler, nil, err )    -- handshake not finished
-                               end
-                       end
-                       _ = err ~= "closed" and close( socket )
-                       handler.close( )
-                       disconnect( handler, err )
-                       writequeue = nil
-                       handler = nil
-                       return false    -- handshake failed
-               end
-       )
-       handler.receivedata = handler.handshake
-       handler.dispatchdata = handler.handshake
-
-       handler.handshake( socket )    -- do handshake
-
-       socketlist[ socket ] = handler
-       readlen = readlen + 1
-       readlist[ readlen ] = socket
-
-       return handler, socket
-end
-
-wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, sslctx )    -- this function wraps a tls cleint
-
-       local dispatch, disconnect = listener.listener, listener.disconnect
-
-       --// transform socket to ssl object //--
-
-       local err
-
-       socket:settimeout( 0 )
-       --// private closures of the object //--
-
-       local writequeue = { }    -- buffer for messages to send
-
-       local eol, fatal_send_error, wants_closing
-
-       local sstat, rstat = 0, 0
-
-       --// local import of socket methods //--
-
-       local send = socket.send
-       local receive = socket.receive
-       local close = socket.close
-       --local shutdown = socket.shutdown
-
-       --// public methods of the object //--
-
-       local handler = { }
-
-       handler.getstats = function( )
-               return rstat, sstat
-       end
-
-       handler.listener = function( data, err )
-               return listener( handler, data, err )
-       end
-       handler.ssl = function( )
-               return false
-       end
-       handler.send = function( _, data, i, j )
-                       return send( socket, data, i, j )
-       end
-       handler.receive = function( pattern, prefix )
-                       return receive( socket, pattern, prefix )
-       end
-       handler.shutdown = function( pattern )
-               --return shutdown( socket, pattern )
-       end
-       handler.close = function( closed )
-               if eol and not fatal_send_error then
-                       -- There is data in the buffer, and we haven't experienced
-                       -- an error trying to send yet, so we'll flush the buffer now
-                       handler._dispatchdata();
-                       if eol then
-                               -- and there is *still* data in the buffer
-                               -- we'll give up for now, and close later
-                               wants_closing = true;
-                               return;
-                       end
-               end
-               close( socket )
-               writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen
-               readlen = removesocket( readlist, socket, readlen )
-               socketlist[ socket ] = nil
-               out_put "server.lua: closed handler and removed socket from list"
-       end
-       handler.ip = function( )
-               return ip
-       end
-       handler.serverport = function( )
-               return serverport
-       end
-       handler.clientport = function( ) 
-               return clientport
-       end
-
-       handler.write = function( data )
-               if not eol then
-                       writelen = writelen + 1
-                       writelist[ writelen ] = socket
-                       eol = 0
-               end
-               eol = eol + 1
-               writequeue[ eol ] = data
-       end
-       handler.writequeue = function( )
-               return writequeue
-       end
-       handler.socket = function( )
-               return socket
-       end
-       handler.mode = function( )
-               return mode
-       end
-       handler._receivedata = function( )
-               local data, err, part = receive( socket, mode )    -- receive data in "mode"
-               if not err or ( err == "timeout" or err == "wantread" ) then    -- received something
-                       local data = data or part or ""
-                       local count = #data * STAT_UNIT
-                       rstat = rstat + count
-                       receivestat = receivestat + count
-                       --out_put( "server.lua: read data '", data, "', error: ", err )
-                       return dispatch( handler, data, err )
-               else    -- connections was closed or fatal error
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
-                       handler.close( )
-                       disconnect( handler, err )
-                       writequeue = nil
-                       handler = nil
-                       return false
-               end
-       end
-       handler._dispatchdata = function( )    -- this function writes data to handlers
-               local buffer = table_concat( writequeue, "", 1, eol )
-               local succ, err, byte = send( socket, buffer )
-               local count = ( succ or 0 ) * STAT_UNIT
-               sstat = sstat + count
-               sendstat = sendstat + count
-               out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )
-               if succ then    -- sending succesful
-                       --writequeue = { }
-                       eol = nil
-                       writelen = removesocket( writelist, socket, writelen )    -- delete socket from writelist
-                       if handler.need_tls then
-                               out_put("server.lua: connection is ready for tls handshake");
-                               handler.starttls(true);
-                       end
-                       if wants_closing then
-                               handler.close();
-                       end
-                       return true
-               elseif byte and ( err == "timeout" or err == "wantwrite" ) then    -- want write
-                       buffer = string_sub( buffer, byte + 1, -1 )    -- new buffer
-                       writequeue[ 1 ] = buffer    -- insert new buffer in queue
-                       eol = 1
-                       return true
-               else    -- connection was closed during sending or fatal error
-                       fatal_send_error = true; -- :(
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
-                       handler.close( )
-                       disconnect( handler, err )
-                       writequeue = nil
-                       handler = nil
-                       return false
-               end
-       end
-
-       handler.receivedata, handler.dispatchdata = handler._receivedata, handler._dispatchdata;
-       -- // COMPAT // --
-
-       handler.getIp = handler.ip
-       handler.getPort = handler.clientport
-
-       --// handshake //--
-
-       local wrote, read
-       
-       handler.starttls = function (now)
-               if not now then out_put("server.lua: we need to do tls, but delaying until later"); handler.need_tls = true; return; end
-               out_put( "server.lua: attempting to start tls on "..tostring(socket) )
-               local oldsocket = socket;
-               socket, err = ssl_wrap( socket, sslctx )    -- wrap socket
-               out_put("sslwrapped socket is "..tostring(socket));
-               if err then
-                       out_put( "server.lua: ssl error: ", err )
-                       return nil, nil, err    -- fatal error
-               end
-               socket:settimeout(0);
-               
-               -- Add the new socket to our system
-               socketlist[ socket ] = handler
-               readlen = readlen + 1
-               readlist[ readlen ] = socket
-               
-               -- Remove traces of the old socket
-               readlen = removesocket( readlist, oldsocket, readlen )
-               socketlist [ oldsocket ] = nil;
-               
-               send = socket.send
-               receive = socket.receive
-               close = socket.close
-               handler.ssl = function( )
-                       return true
-               end
-               handler.send = function( _, data, i, j )
-                       return send( socket, data, i, j )
-               end
-               handler.receive = function( pattern, prefix )
-                       return receive( socket, pattern, prefix )
-               end
-               
-               handler.starttls = nil;
-               handler.need_tls = nil
-               
-                       handler.handshake = coroutine_wrap( function( client )
-                                       local err
-                                       for i = 1, 10 do    -- 10 handshake attemps
-                                               _, err = client:dohandshake( )
-                                               if not err then
-                                                       out_put( "server.lua: ssl handshake done" )
-                                                       writelen = ( wrote and removesocket( writelist, socket, writelen ) ) or writelen
-                                                       handler.receivedata = handler._receivedata    -- when handshake is done, replace the handshake function with regular functions
-                                                       handler.dispatchdata = handler._dispatchdata;
-                                                       return true;
-                                               else
-                                                       out_put( "server.lua: error during ssl handshake: ", err )
-                                                       if err == "wantwrite" then
-                                                               if wrote == nil then
-                                                                       writelen = writelen + 1
-                                                                       writelist[ writelen ] = client
-                                                                       wrote = true
-                                                               end
-                                                       end
-                                                       coroutine_yield( handler, nil, err )    -- handshake not finished
-                                               end
-                                       end
-                                       _ = err ~= "closed" and close( socket )
-                                       handler.close( )
-                                       disconnect( handler, err )
-                                       writequeue = nil
-                                       handler = nil
-                                       return false    -- handshake failed
-                               end
-                       )
-                       handler.receivedata = handler.handshake
-                       handler.dispatchdata = handler.handshake
-                       
-                       handler.handshake( socket )    -- do handshake
-               end
-       socketlist[ socket ] = handler
-       readlen = readlen + 1
-       readlist[ readlen ] = socket
-
-       return handler, socket
-end
-
-wraptcpclient = function( listener, socket, ip, serverport, clientport, mode )    -- this function wraps a socket
-
-       local dispatch, disconnect = listener.listener, listener.disconnect
-
-       --// private closures of the object //--
-
-       local writequeue = { }    -- list for messages to send
-
-       local eol, fatal_send_error, wants_closing
-
-       socket:settimeout(0);
-       
-       local rstat, sstat = 0, 0
-
-       --// local import of socket methods //--
-
-       local send = socket.send
-       local receive = socket.receive
-       local close = socket.close
-       local shutdown = socket.shutdown
-
-       --// public methods of the object //--
-
-       local handler = { }
-
-       handler.getstats = function( )
-               return rstat, sstat
-       end
-
-       handler.listener = function( data, err )
-               return listener( handler, data, err )
-       end
-       handler.ssl = function( )
-               return false
-       end
-       handler.send = function( _, data, i, j )
-                       return send( socket, data, i, j )
-       end
-       handler.receive = function( pattern, prefix )
-                       return receive( socket, pattern, prefix )
-       end
-       handler.shutdown = function( pattern )
-               return shutdown( socket, pattern )
-       end
-       handler.close = function( closed )
-               if eol and not fatal_send_error then
-                       -- There is data in the buffer, and we haven't experienced
-                       -- an error trying to send yet, so we'll flush the buffer now
-                       handler.dispatchdata();
-                       if eol then
-                               -- and there is *still* data in the buffer
-                               -- we'll give up for now, and close later
-                               wants_closing = true;
-                               return;
-                       end
-               end
-               _ = not closed and shutdown( socket )
-               _ = not closed and close( socket )
-               writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen
-               readlen = removesocket( readlist, socket, readlen )
-               socketlist[ socket ] = nil
-               out_put "server.lua: closed handler and removed socket from list"
-       end
-       handler.ip = function( )
-               return ip
-       end
-       handler.serverport = function( )
-               return serverport
-       end
-       handler.clientport = function( ) 
-               return clientport
-       end
-       handler.write = function( data )
-               if not eol then
-                       writelen = writelen + 1
-                       writelist[ writelen ] = socket
-                       eol = 0
-               end
-               eol = eol + 1
-               writequeue[ eol ] = data
-       end
-       handler.writequeue = function( )
-               return writequeue
-       end
-       handler.socket = function( )
-               return socket
-       end
-       handler.mode = function( )
-               return mode
-       end
-       
-       handler.receivedata = function( )
-               local data, err, part = receive( socket, mode )    -- receive data in "mode"
-               if not err or ( err == "timeout" or err == "wantread" ) then    -- received something
-                       local data = data or part or ""
-                       local count = #data * STAT_UNIT
-                       rstat = rstat + count
-                       receivestat = receivestat + count
-                       --out_put( "server.lua: read data '", data, "', error: ", err )
-                       return dispatch( handler, data, err )
-               else    -- connections was closed or fatal error
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
-                       handler.close( )
-                       disconnect( handler, err )
-                       writequeue = nil
-                       handler = nil
-                       return false
-               end
-       end
-       
-       handler.dispatchdata = function( )    -- this function writes data to handlers
-               local buffer = table_concat( writequeue, "", 1, eol )
-               local succ, err, byte = send( socket, buffer )
-               local count = ( succ or 0 ) * STAT_UNIT
-               sstat = sstat + count
-               sendstat = sendstat + count
-               out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )
-               if succ then    -- sending succesful
-                       --writequeue = { }
-                       eol = nil
-                       writelen = removesocket( writelist, socket, writelen )    -- delete socket from writelist
-                       if wants_closing then
-                               handler.close();
-                       end
-                       return true
-               elseif byte and ( err == "timeout" or err == "wantwrite" ) then    -- want write
-                       buffer = string_sub( buffer, byte + 1, -1 )    -- new buffer
-                       writequeue[ 1 ] = buffer    -- insert new buffer in queue
-                       eol = 1
-                       return true
-               else    -- connection was closed during sending or fatal error
-                       fatal_send_error = true; -- :'-(
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
-                       handler.close( )
-                       disconnect( handler, err )
-                       writequeue = nil
-                       handler = nil
-                       return false
-               end
-       end
-
-       -- // COMPAT // --
-
-       handler.getIp = handler.ip
-       handler.getPort = handler.clientport
-
-       socketlist[ socket ] = handler
-       readlen = readlen + 1
-       readlist[ readlen ] = socket
-
-       return handler, socket
-end
-
-addtimer = function( listener )
-       timelistener[ #timelistener + 1 ] = listener
-end
-
-firetimer = function( listener )
-       for i, listener in ipairs( timelistener ) do
-               listener( )
-       end
-end
-
-addserver = function( listeners, port, addr, mode, sslctx, wrapper_function )    -- this function provides a way for other scripts to reg a server
-       local err
-       if type( listeners ) ~= "table" then
-               err = "invalid listener table"
-       else
-               for name, func in pairs( listeners ) do
-                       if type( func ) ~= "function" then
-                               --err = "invalid listener function"
-                               break
-                       end
-               end
-       end
-       if not type( port ) == "number" or not ( port >= 0 and port <= 65535 ) then
-               err = "invalid port"
-       elseif listener[ port ] then
-               err=  "listeners on port '" .. port .. "' already exist"
-       elseif sslctx and not luasec then
-               err = "luasec not found"
-       end
-       if err then
-               out_error( "server.lua: ", err )
-               return nil, err
-       end
-       addr = addr or "*"
-       local server, err = socket_bind( addr, port )
-       if err then
-               out_error( addr..":"..port.." -", err )
-               return nil, err
-       end
-       local handler, err = wrapserver( listeners, server, addr, port, mode, sslctx, wrapper_function )    -- wrap new server socket
-       if not handler then
-               server:close( )
-               return nil, err
-       end
-       server:settimeout( 0 )
-       readlen = readlen + 1
-       readlist[ readlen ] = server
-       listener[ port ] = listeners
-       socketlist[ server ] = handler
-       out_put( "server.lua: new server listener on ", addr, ":", port )
-       return true
-end
-
-removesocket = function( tbl, socket, len )    -- this function removes sockets from a list
-       for i, target in ipairs( tbl ) do
-               if target == socket then
-                       len = len - 1
-                       table_remove( tbl, i )
-                       return len
-               end
-       end
-       return len
-end
-
-closeall = function( )
-       for sock, handler in pairs( socketlist ) do
-               handler.shutdown( )
-               handler.close( )
-               socketlist[ sock ] = nil
-       end
-       writelist, readlist, socketlist = { }, { }, { }
-end
-
-closesocket = function( socket )
-       writelen = removesocket( writelist, socket, writelen )
-       readlen = removesocket( readlist, socket, readlen )
-       socketlist[ socket ] = nil
-       socket:close( )
-end
-
-loop = function( )    -- this is the main loop of the program
-       --signal_set( "hub", "run" )
-       repeat
-               local read, write, err = socket_select( readlist, writelist, 1 )    -- 1 sec timeout, nice for timers
-               for i, socket in ipairs( write ) do    -- send data waiting in writequeues
-                       local handler = socketlist[ socket ]
-                       if handler then
-                               handler.dispatchdata( )
-                       else
-                               closesocket( socket )
-                               out_put "server.lua: found no handler and closed socket (writelist)"    -- this should not happen
-                       end
-               end
-               for i, socket in ipairs( read ) do    -- receive data
-                       local handler = socketlist[ socket ]
-                       if handler then
-                               handler.receivedata( )
-                       else
-                               closesocket( socket )
-                               out_put "server.lua: found no handler and closed socket (readlist)"    -- this can happen
-                       end
-               end
-               firetimer( )
-       until false
-       return
-end
-
-----------------------------------// BEGIN //--
-
-----------------------------------// PUBLIC INTERFACE //--
-
-return {
-
-       add = addserver,
-       loop = loop,
-       stats = stats,
-       closeall = closeall,
-       addtimer = addtimer,
-       wraptcpclient = wraptcpclient,
-       wrapsslclient = wrapsslclient,
-       wraptlsclient = wraptlsclient,
-}
+--[[\r
+\r
+        server.lua by blastbeat\r
+\r
+        - this script contains the server loop of the program\r
+        - other scripts can reg a server here\r
+\r
+]]--\r
+\r
+-- // wrapping luadch stuff // --\r
+\r
+local use = function( what )\r
+    return _G[ what ]\r
+end\r
+local clean = function( tbl )\r
+    for i, k in pairs( tbl ) do\r
+        tbl[ i ] = nil\r
+    end\r
+end\r
+\r
+local log, table_concat = require ("util.logger").init("socket"), table.concat;\r
+local out_put = function (...) return log("debug", table_concat{...}); end\r
+local out_error = function (...) return log("warn", table_concat{...}); end\r
+local mem_free = collectgarbage\r
+\r
+----------------------------------// DECLARATION //--\r
+\r
+--// constants //--\r
+\r
+local STAT_UNIT = 1    -- byte\r
+\r
+--// lua functions //--\r
+\r
+local type = use "type"\r
+local pairs = use "pairs"\r
+local ipairs = use "ipairs"\r
+local tostring = use "tostring"\r
+local collectgarbage = use "collectgarbage"\r
+\r
+--// lua libs //--\r
+\r
+local os = use "os"\r
+local table = use "table"\r
+local string = use "string"\r
+local coroutine = use "coroutine"\r
+\r
+--// lua lib methods //--\r
+\r
+local os_time = os.time\r
+local os_difftime = os.difftime\r
+local table_concat = table.concat\r
+local table_remove = table.remove\r
+local string_len = string.len\r
+local string_sub = string.sub\r
+local coroutine_wrap = coroutine.wrap\r
+local coroutine_yield = coroutine.yield\r
+\r
+--// extern libs //--\r
+\r
+local luasec = select( 2, pcall( require, "ssl" ) )\r
+local luasocket = require "socket"\r
+\r
+--// extern lib methods //--\r
+\r
+local ssl_wrap = ( luasec and luasec.wrap )\r
+local socket_bind = luasocket.bind\r
+local socket_sleep = luasocket.sleep\r
+local socket_select = luasocket.select\r
+local ssl_newcontext = ( luasec and luasec.newcontext )\r
+\r
+--// functions //--\r
+\r
+local id\r
+local loop\r
+local stats\r
+local idfalse\r
+local addtimer\r
+local closeall\r
+local addserver\r
+local wrapserver\r
+local getsettings\r
+local closesocket\r
+local removesocket\r
+local removeserver\r
+local changetimeout\r
+local wrapconnection\r
+local changesettings\r
+\r
+--// tables //--\r
+\r
+local _server\r
+local _readlist\r
+local _timerlist\r
+local _sendlist\r
+local _socketlist\r
+local _closelist\r
+local _readtimes\r
+local _writetimes\r
+\r
+--// simple data types //--\r
+\r
+local _\r
+local _readlistlen\r
+local _sendlistlen\r
+local _timerlistlen\r
+\r
+local _sendtraffic\r
+local _readtraffic\r
+\r
+local _selecttimeout\r
+local _sleeptime\r
+\r
+local _starttime\r
+local _currenttime\r
+\r
+local _maxsendlen\r
+local _maxreadlen\r
+\r
+local _checkinterval\r
+local _sendtimeout\r
+local _readtimeout\r
+\r
+local _cleanqueue\r
+\r
+local _timer\r
+\r
+local _maxclientsperserver\r
+\r
+----------------------------------// DEFINITION //--\r
+\r
+_server = { }    -- key = port, value = table; list of listening servers\r
+_readlist = { }    -- array with sockets to read from\r
+_sendlist = { }    -- arrary with sockets to write to\r
+_timerlist = { }    -- array of timer functions\r
+_socketlist = { }    -- key = socket, value = wrapped socket (handlers)\r
+_readtimes = { }   -- key = handler, value = timestamp of last data reading\r
+_writetimes = { }   -- key = handler, value = timestamp of last data writing/sending\r
+_closelist = { }    -- handlers to close\r
+\r
+_readlistlen = 0    -- length of readlist\r
+_sendlistlen = 0    -- length of sendlist\r
+_timerlistlen = 0    -- lenght of timerlist\r
+\r
+_sendtraffic = 0    -- some stats\r
+_readtraffic = 0\r
+\r
+_selecttimeout = 1    -- timeout of socket.select\r
+_sleeptime = 0    -- time to wait at the end of every loop\r
+\r
+_maxsendlen = 51000 * 1024    -- max len of send buffer\r
+_maxreadlen = 25000 * 1024    -- max len of read buffer\r
+\r
+_checkinterval = 1200000    -- interval in secs to check idle clients\r
+_sendtimeout = 60000    -- allowed send idle time in secs\r
+_readtimeout = 6 * 60 * 60    -- allowed read idle time in secs\r
+\r
+_cleanqueue = false    -- clean bufferqueue after using\r
+\r
+_maxclientsperserver = 1000\r
+\r
+----------------------------------// PRIVATE //--\r
+\r
+wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxconnections, startssl )    -- this function wraps a server\r
+\r
+    maxconnections = maxconnections or _maxclientsperserver\r
+\r
+    local connections = 0\r
+\r
+    local dispatch, disconnect = listeners.incoming or listeners.listener, listeners.disconnect\r
+\r
+    local err\r
+\r
+    local ssl = false\r
+\r
+    if sslctx then\r
+        if not ssl_newcontext then\r
+            return nil, "luasec not found"\r
+        end\r
+        if type( sslctx ) ~= "table" then\r
+            out_error "server.lua: wrong server sslctx"\r
+            return nil, "wrong server sslctx"\r
+        end\r
+        sslctx, err = ssl_newcontext( sslctx )\r
+        if not sslctx then\r
+            err = err or "wrong sslctx parameters"\r
+            out_error( "server.lua: ", err )\r
+            return nil, err\r
+        end\r
+        ssl = true\r
+    else\r
+       out_put("server.lua: ", "ssl not enabled on ", serverport);\r
+    end\r
+\r
+    local accept = socket.accept\r
+\r
+    --// public methods of the object //--\r
+\r
+    local handler = { }\r
+\r
+    handler.shutdown = function( ) end\r
+\r
+    handler.ssl = function( )\r
+        return ssl\r
+    end\r
+    handler.remove = function( )\r
+        connections = connections - 1\r
+    end\r
+    handler.close = function( )\r
+        for _, handler in pairs( _socketlist ) do\r
+            if handler.serverport == serverport then\r
+                handler.disconnect( handler, "server closed" )\r
+                handler.close( true )\r
+            end\r
+        end\r
+        socket:close( )\r
+        _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )\r
+        _readlistlen = removesocket( _readlist, socket, _readlistlen )\r
+        _socketlist[ socket ] = nil\r
+        handler = nil\r
+        socket = nil\r
+        mem_free( )\r
+        out_put "server.lua: closed server handler and removed sockets from list"\r
+    end\r
+    handler.ip = function( )\r
+        return ip\r
+    end\r
+    handler.serverport = function( )\r
+        return serverport\r
+    end\r
+    handler.socket = function( )\r
+        return socket\r
+    end\r
+    handler.readbuffer = function( )\r
+        if connections > maxconnections then\r
+            out_put( "server.lua: refused new client connection: server full" )\r
+            return false\r
+        end\r
+        local client, err = accept( socket )    -- try to accept\r
+        if client then\r
+            local ip, clientport = client:getpeername( )\r
+            client:settimeout( 0 )\r
+            local handler, client, err = wrapconnection( handler, listeners, client, ip, serverport, clientport, pattern, sslctx, startssl )    -- wrap new client socket\r
+            if err then    -- error while wrapping ssl socket\r
+                return false\r
+            end\r
+            connections = connections + 1\r
+            out_put( "server.lua: accepted new client connection from ", ip, ":", clientport, " to ",  serverport)\r
+            return dispatch( handler )\r
+        elseif err then    -- maybe timeout or something else\r
+            out_put( "server.lua: error with new client connection: ", err )\r
+            return false\r
+        end\r
+    end\r
+    return handler\r
+end\r
+\r
+wrapconnection = function( server, listeners, socket, ip, serverport, clientport, pattern, sslctx, startssl )    -- this function wraps a client to a handler object\r
+\r
+    socket:settimeout( 0 )\r
+\r
+    --// local import of socket methods //--\r
+\r
+    local send\r
+    local receive\r
+    local shutdown\r
+\r
+    --// private closures of the object //--\r
+\r
+    local ssl\r
+\r
+    local dispatch = listeners.incoming or listeners.listener\r
+    local disconnect = listeners.disconnect\r
+\r
+    local bufferqueue = { }    -- buffer array\r
+    local bufferqueuelen = 0    -- end of buffer array\r
+\r
+    local toclose\r
+    local fatalerror\r
+    local needtls\r
+\r
+    local bufferlen = 0\r
+\r
+    local noread = false\r
+    local nosend = false\r
+\r
+    local sendtraffic, readtraffic = 0, 0\r
+\r
+    local maxsendlen = _maxsendlen\r
+    local maxreadlen = _maxreadlen\r
+\r
+    --// public methods of the object //--\r
+\r
+    local handler = bufferqueue    -- saves a table ^_^\r
+\r
+    handler.dispatch = function( )\r
+        return dispatch\r
+    end\r
+    handler.disconnect = function( )\r
+        return disconnect\r
+    end\r
+    handler.setlistener = function( listeners )\r
+        dispatch = listeners.incoming\r
+        disconnect = listeners.disconnect\r
+    end\r
+    handler.getstats = function( )\r
+        return readtraffic, sendtraffic\r
+    end\r
+    handler.ssl = function( )\r
+        return ssl\r
+    end\r
+    handler.send = function( _, data, i, j )\r
+        return send( socket, data, i, j )\r
+    end\r
+    handler.receive = function( pattern, prefix )\r
+        return receive( socket, pattern, prefix )\r
+    end\r
+    handler.shutdown = function( pattern )\r
+        return shutdown( socket, pattern )\r
+    end\r
+    handler.close = function( forced )\r
+        _readlistlen = removesocket( _readlist, socket, _readlistlen )\r
+        _readtimes[ handler ] = nil\r
+        if bufferqueuelen ~= 0 then\r
+            if not ( forced or fatalerror ) then\r
+                handler.sendbuffer( )\r
+                if bufferqueuelen ~= 0 then   -- try again...\r
+                    handler.write = nil    -- ... but no further writing allowed\r
+                    toclose = true\r
+                    return false\r
+                end\r
+            else\r
+                send( socket, table_concat( bufferqueue, "", 1, bufferqueuelen ), 1, bufferlen )    -- forced send\r
+            end\r
+        end\r
+        shutdown( socket )\r
+        socket:close( )\r
+        _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )\r
+        _socketlist[ socket ] = nil\r
+        _writetimes[ handler ] = nil\r
+        _closelist[ handler ] = nil\r
+        handler = nil\r
+        socket = nil\r
+        mem_free( )\r
+       if server then\r
+               server.remove( )\r
+       end\r
+        out_put "server.lua: closed client handler and removed socket from list"\r
+        return true\r
+    end\r
+    handler.ip = function( )\r
+        return ip\r
+    end\r
+    handler.serverport = function( )\r
+        return serverport\r
+    end\r
+    handler.clientport = function( )\r
+        return clientport\r
+    end\r
+    local write = function( data )\r
+        bufferlen = bufferlen + string_len( data )\r
+        if bufferlen > maxsendlen then\r
+            _closelist[ handler ] = "send buffer exceeded"   -- cannot close the client at the moment, have to wait to the end of the cycle\r
+            handler.write = idfalse    -- dont write anymore\r
+            return false\r
+        elseif not _sendlist[ socket ] then\r
+            _sendlistlen = _sendlistlen + 1\r
+            _sendlist[ _sendlistlen ] = socket\r
+            _sendlist[ socket ] = _sendlistlen\r
+        end\r
+        bufferqueuelen = bufferqueuelen + 1\r
+        bufferqueue[ bufferqueuelen ] = data\r
+        _writetimes[ handler ] = _writetimes[ handler ] or _currenttime\r
+        return true\r
+    end\r
+    handler.write = write\r
+    handler.bufferqueue = function( )\r
+        return bufferqueue\r
+    end\r
+    handler.socket = function( )\r
+        return socket\r
+    end\r
+    handler.pattern = function( new )\r
+        pattern = new or pattern\r
+        return pattern\r
+    end\r
+    handler.bufferlen = function( readlen, sendlen )\r
+        maxsendlen = sendlen or maxsendlen\r
+        maxreadlen = readlen or maxreadlen\r
+        return maxreadlen, maxsendlen\r
+    end\r
+    handler.lock = function( switch )\r
+        if switch == true then\r
+            handler.write = idfalse\r
+            local tmp = _sendlistlen\r
+            _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )\r
+            _writetimes[ handler ] = nil\r
+            if _sendlistlen ~= tmp then\r
+                nosend = true\r
+            end\r
+            tmp = _readlistlen\r
+            _readlistlen = removesocket( _readlist, socket, _readlistlen )\r
+            _readtimes[ handler ] = nil\r
+            if _readlistlen ~= tmp then\r
+                noread = true\r
+            end\r
+        elseif switch == false then\r
+            handler.write = write\r
+            if noread then\r
+                noread = false\r
+                _readlistlen = _readlistlen + 1\r
+                _readlist[ socket ] = _readlistlen\r
+                _readlist[ _readlistlen ] = socket\r
+                _readtimes[ handler ] = _currenttime\r
+            end\r
+            if nosend then\r
+                nosend = false\r
+                write( "" )\r
+            end\r
+        end\r
+        return noread, nosend\r
+    end\r
+    local _readbuffer = function( )    -- this function reads data\r
+        local buffer, err, part = receive( socket, pattern )    -- receive buffer with "pattern"\r
+        if not err or ( err == "timeout" or err == "wantread" ) then    -- received something\r
+            local buffer = buffer or part or ""\r
+            local len = string_len( buffer )\r
+            if len > maxreadlen then\r
+                disconnect( handler, "receive buffer exceeded" )\r
+                handler.close( true )\r
+                return false\r
+            end\r
+            local count = len * STAT_UNIT\r
+            readtraffic = readtraffic + count\r
+            _readtraffic = _readtraffic + count\r
+            _readtimes[ handler ] = _currenttime\r
+            --out_put( "server.lua: read data '", buffer, "', error: ", err )\r
+            return dispatch( handler, buffer, err )\r
+        else    -- connections was closed or fatal error\r
+            out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )\r
+            fatalerror = true\r
+            disconnect( handler, err )\r
+            handler.close( )\r
+            return false\r
+        end\r
+    end\r
+    local _sendbuffer = function( )    -- this function sends data\r
+        local buffer = table_concat( bufferqueue, "", 1, bufferqueuelen )\r
+        local succ, err, byte = send( socket, buffer, 1, bufferlen )\r
+        local count = ( succ or byte or 0 ) * STAT_UNIT\r
+        sendtraffic = sendtraffic + count\r
+        _sendtraffic = _sendtraffic + count\r
+        _ = _cleanqueue and clean( bufferqueue )\r
+        --out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )\r
+        if succ then    -- sending succesful\r
+            bufferqueuelen = 0\r
+            bufferlen = 0\r
+            _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )    -- delete socket from writelist\r
+            _ = needtls and handler.starttls(true)\r
+           _ = toclose and handler.close( )\r
+            _writetimes[ handler ] = nil\r
+            return true\r
+        elseif byte and ( err == "timeout" or err == "wantwrite" ) then    -- want write\r
+            buffer = string_sub( buffer, byte + 1, bufferlen )    -- new buffer\r
+            bufferqueue[ 1 ] = buffer    -- insert new buffer in queue\r
+            bufferqueuelen = 1\r
+            bufferlen = bufferlen - byte\r
+            _writetimes[ handler ] = _currenttime\r
+            return true\r
+        else    -- connection was closed during sending or fatal error\r
+            out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )\r
+            fatalerror = true\r
+            disconnect( handler, err )\r
+            handler.close( )\r
+            return false\r
+        end\r
+    end\r
+\r
+    if sslctx then    -- ssl?\r
+        ssl = true\r
+        local wrote\r
+        local handshake = coroutine_wrap( function( client )    -- create handshake coroutine\r
+                local err\r
+                for i = 1, 10 do    -- 10 handshake attemps\r
+                    _, err = client:dohandshake( )\r
+                    if not err then\r
+                        --out_put( "server.lua: ssl handshake done" )\r
+                        _sendlistlen = ( wrote and removesocket( _sendlist, socket, _sendlistlen ) ) or _sendlistlen\r
+                        handler.readbuffer = _readbuffer    -- when handshake is done, replace the handshake function with regular functions\r
+                        handler.sendbuffer = _sendbuffer\r
+                        --return dispatch( handler )\r
+                        return true\r
+                    else\r
+                        out_put( "server.lua: error during ssl handshake: ", err )\r
+                        if err == "wantwrite" and not wrote then\r
+                            _sendlistlen = _sendlistlen + 1\r
+                            _sendlist[ _sendlistlen ] = client\r
+                            wrote = true\r
+                        end\r
+                        --coroutine_yield( handler, nil, err )    -- handshake not finished\r
+                        coroutine_yield( )\r
+                    end\r
+                end\r
+                disconnect( handler, "max handshake attemps exceeded" )\r
+                handler.close( true )    -- forced disconnect\r
+                return false    -- handshake failed\r
+            end\r
+        )\r
+        if startssl then    -- ssl now?\r
+            --out_put("server.lua: ", "starting ssl handshake")\r
+           local err\r
+            socket, err = ssl_wrap( socket, sslctx )    -- wrap socket\r
+            if err then\r
+                out_put( "server.lua: ssl error: ", err )\r
+                mem_free( )\r
+                return nil, nil, err    -- fatal error\r
+            end\r
+            socket:settimeout( 0 )\r
+            handler.readbuffer = handshake\r
+            handler.sendbuffer = handshake\r
+            handshake( socket )    -- do handshake\r
+        else\r
+            handler.starttls = function( now )\r
+                if not now then\r
+                    --out_put "server.lua: we need to do tls, but delaying until later"\r
+                    needtls = true\r
+                    return\r
+                end\r
+                --out_put( "server.lua: attempting to start tls on " .. tostring( socket ) )\r
+                local oldsocket, err = socket\r
+                socket, err = ssl_wrap( socket, sslctx )    -- wrap socket\r
+                --out_put( "server.lua: sslwrapped socket is " .. tostring( socket ) )\r
+                if err then\r
+                    out_put( "server.lua: error while starting tls on client: ", err )\r
+                    return nil, err    -- fatal error\r
+                end\r
+\r
+                socket:settimeout( 0 )\r
+\r
+                -- add the new socket to our system\r
+\r
+                send = socket.send\r
+                receive = socket.receive\r
+                shutdown = id\r
+\r
+                _socketlist[ socket ] = handler\r
+                _readlistlen = _readlistlen + 1\r
+                _readlist[ _readlistlen ] = socket\r
+                _readlist[ socket ] = _readlistlen\r
+\r
+                -- remove traces of the old socket\r
+\r
+                _readlistlen = removesocket( _readlist, oldsocket, _readlistlen )\r
+                _sendlistlen = removesocket( _sendlist, oldsocket, _sendlistlen )\r
+                _socketlist[ oldsocket ] = nil\r
+\r
+                handler.starttls = nil\r
+                needtls = nil\r
+\r
+                handler.receivedata = handler.handshake\r
+                handler.dispatchdata = handler.handshake\r
+                handshake( socket )    -- do handshake\r
+            end\r
+            handler.readbuffer = _readbuffer\r
+            handler.sendbuffer = _sendbuffer\r
+        end\r
+    else    -- normal connection\r
+        ssl = false\r
+        handler.readbuffer = _readbuffer\r
+        handler.sendbuffer = _sendbuffer\r
+    end\r
+\r
+    send = socket.send\r
+    receive = socket.receive\r
+    shutdown = ( ssl and id ) or socket.shutdown\r
+\r
+    _socketlist[ socket ] = handler\r
+    _readlistlen = _readlistlen + 1\r
+    _readlist[ _readlistlen ] = socket\r
+    _readlist[ socket ] = _readlistlen\r
+\r
+    return handler, socket\r
+end\r
+\r
+id = function( )\r
+end\r
+\r
+idfalse = function( )\r
+    return false\r
+end\r
+\r
+removesocket = function( list, socket, len )    -- this function removes sockets from a list ( copied from copas )\r
+    local pos = list[ socket ]\r
+    if pos then\r
+        list[ socket ] = nil\r
+        local last = list[ len ]\r
+        list[ len ] = nil\r
+        if last ~= socket then\r
+            list[ last ] = pos\r
+            list[ pos ] = last\r
+        end\r
+        return len - 1\r
+    end\r
+    return len\r
+end\r
+\r
+closesocket = function( socket )\r
+    _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )\r
+    _readlistlen = removesocket( _readlist, socket, _readlistlen )\r
+    _socketlist[ socket ] = nil\r
+    socket:close( )\r
+    mem_free( )\r
+end\r
+\r
+----------------------------------// PUBLIC //--\r
+\r
+addserver = function( listeners, port, addr, pattern, sslctx, maxconnections, startssl )    -- this function provides a way for other scripts to reg a server\r
+    local err\r
+    --out_put("server.lua: autossl on ", port, " is ", startssl)\r
+    if type( listeners ) ~= "table" then\r
+        err = "invalid listener table"\r
+    end\r
+    if not type( port ) == "number" or not ( port >= 0 and port <= 65535 ) then\r
+        err = "invalid port"\r
+    elseif _server[ port ] then\r
+        err =  "listeners on port '" .. port .. "' already exist"\r
+    elseif sslctx and not luasec then\r
+        err = "luasec not found"\r
+    end\r
+    if err then\r
+        out_error( "server.lua: ", err )\r
+        return nil, err\r
+    end\r
+    addr = addr or "*"\r
+    local server, err = socket_bind( addr, port )\r
+    if err then\r
+        out_error( "server.lua: ", err )\r
+        return nil, err\r
+    end\r
+    local handler, err = wrapserver( listeners, server, addr, port, pattern, sslctx, maxconnections, startssl )    -- wrap new server socket\r
+    if not handler then\r
+        server:close( )\r
+        return nil, err\r
+    end\r
+    server:settimeout( 0 )\r
+    _readlistlen = _readlistlen + 1\r
+    _readlist[ _readlistlen ] = server\r
+    _server[ port ] = handler\r
+    _socketlist[ server ] = handler\r
+    out_put( "server.lua: new server listener on '", addr, ":", port, "'" )\r
+    return handler\r
+end\r
+\r
+removeserver = function( port )\r
+    local handler = _server[ port ]\r
+    if not handler then\r
+        return nil, "no server found on port '" .. tostring( port ) "'"\r
+    end\r
+    handler.close( )\r
+    return true\r
+end\r
+\r
+closeall = function( )\r
+    for _, handler in pairs( _socketlist ) do\r
+        handler.close( )\r
+        _socketlist[ _ ] = nil\r
+    end\r
+    _readlistlen = 0\r
+    _sendlistlen = 0\r
+    _timerlistlen = 0\r
+    _server = { }\r
+    _readlist = { }\r
+    _sendlist = { }\r
+    _timerlist = { }\r
+    _socketlist = { }\r
+    mem_free( )\r
+end\r
+\r
+getsettings = function( )\r
+    return  _selecttimeout, _sleeptime, _maxsendlen, _maxreadlen, _checkinterval, _sendtimeout, _readtimeout, _cleanqueue, _maxclientsperserver\r
+end\r
+\r
+changesettings = function( new )\r
+    if type( new ) ~= "table" then\r
+        return nil, "invalid settings table"\r
+    end\r
+    _selecttimeout = tonumber( new.timeout ) or _selecttimeout\r
+    _sleeptime = tonumber( new.sleeptime ) or _sleeptime\r
+    _maxsendlen = tonumber( new.maxsendlen ) or _maxsendlen\r
+    _maxreadlen = tonumber( new.maxreadlen ) or _maxreadlen\r
+    _checkinterval = tonumber( new.checkinterval ) or _checkinterval\r
+    _sendtimeout = tonumber( new.sendtimeout ) or _sendtimeout\r
+    _readtimeout = tonumber( new.readtimeout ) or _readtimeout\r
+    _cleanqueue = new.cleanqueue\r
+    _maxclientsperserver = new._maxclientsperserver or _maxclientsperserver\r
+    return true\r
+end\r
+\r
+addtimer = function( listener )\r
+    if type( listener ) ~= "function" then\r
+        return nil, "invalid listener function"\r
+    end\r
+    _timerlistlen = _timerlistlen + 1\r
+    _timerlist[ _timerlistlen ] = listener\r
+    return true\r
+end\r
+\r
+stats = function( )\r
+    return _readtraffic, _sendtraffic, _readlistlen, _sendlistlen, _timerlistlen\r
+end\r
+\r
+loop = function( )    -- this is the main loop of the program\r
+    while true do\r
+        local read, write, err = socket_select( _readlist, _sendlist, _selecttimeout )\r
+        for i, socket in ipairs( write ) do    -- send data waiting in writequeues\r
+            local handler = _socketlist[ socket ]\r
+            if handler then\r
+                handler.sendbuffer( )\r
+            else\r
+                closesocket( socket )\r
+                out_put "server.lua: found no handler and closed socket (writelist)"    -- this should not happen\r
+            end\r
+        end\r
+        for i, socket in ipairs( read ) do    -- receive data\r
+            local handler = _socketlist[ socket ]\r
+            if handler then\r
+                handler.readbuffer( )\r
+            else\r
+                closesocket( socket )\r
+                out_put "server.lua: found no handler and closed socket (readlist)"    -- this can happen\r
+            end\r
+        end\r
+        for handler, err in pairs( _closelist ) do\r
+            handler.disconnect( )( handler, err )\r
+            handler.close( true )    -- forced disconnect\r
+        end\r
+        clean( _closelist )\r
+        _currenttime = os_time( )\r
+        if os_difftime( _currenttime - _timer ) >= 1 then\r
+            for i = 1, _timerlistlen do\r
+                _timerlist[ i ]( )    -- fire timers\r
+            end\r
+            _timer = _currenttime\r
+        end\r
+        socket_sleep( _sleeptime )    -- wait some time\r
+        --collectgarbage( )\r
+    end\r
+end\r
+\r
+--// EXPERIMENTAL //--\r
+\r
+local wrapclient = function( socket, ip, serverport, listeners, pattern, sslctx, startssl )\r
+    local handler = wrapconnection( nil, listeners, socket, ip, serverport, "clientport", pattern, sslctx, startssl )\r
+    _socketlist[ socket ] = handler\r
+    _sendlistlen = _sendlistlen + 1\r
+    _sendlist[ _sendlistlen ] = socket\r
+    _sendlist[ socket ] = _sendlistlen\r
+    return handler, socket\r
+end\r
+\r
+local addclient = function( address, port, listeners, pattern, sslctx, startssl )\r
+    local client, err = socket.tcp( )\r
+    if err then\r
+        return nil, err\r
+    end\r
+    client:settimeout( 0 )\r
+    _, err = client:connect( address, port )\r
+    if err then    -- try again\r
+        local handler = wrapclient( client, address, port, listeners )\r
+    else\r
+        wrapconnection( server, listeners, socket, address, port, "clientport", pattern, sslctx, startssl )\r
+    end\r
+end\r
+\r
+--// EXPERIMENTAL //--\r
+\r
+----------------------------------// BEGIN //--\r
+\r
+use "setmetatable" ( _socketlist, { __mode = "k" } )\r
+use "setmetatable" ( _readtimes, { __mode = "k" } )\r
+use "setmetatable" ( _writetimes, { __mode = "k" } )\r
+\r
+_timer = os_time( )\r
+_starttime = os_time( )\r
+\r
+addtimer( function( )\r
+        local difftime = os_difftime( _currenttime - _starttime )\r
+        if difftime > _checkinterval then\r
+            _starttime = _currenttime\r
+            for handler, timestamp in pairs( _writetimes ) do\r
+                if os_difftime( _currenttime - timestamp ) > _sendtimeout then\r
+                    --_writetimes[ handler ] = nil\r
+                    handler.disconnect( )( handler, "send timeout" )\r
+                    handler.close( true )    -- forced disconnect\r
+                end\r
+            end\r
+            for handler, timestamp in pairs( _readtimes ) do\r
+                if os_difftime( _currenttime - timestamp ) > _readtimeout then\r
+                    --_readtimes[ handler ] = nil\r
+                    handler.disconnect( )( handler, "read timeout" )\r
+                    handler.close( )    -- forced disconnect?\r
+                end\r
+            end\r
+        end\r
+    end\r
+)\r
+\r
+----------------------------------// PUBLIC INTERFACE //--\r
+\r
+return {\r
+\r
+    addclient = addclient,\r
+    wrapclient = wrapclient,\r
+    \r
+    loop = loop,\r
+    stats = stats,\r
+    closeall = closeall,\r
+    addtimer = addtimer,\r
+    addserver = addserver,\r
+    getsettings = getsettings,\r
+    removeserver = removeserver,\r
+    changesettings = changesettings,\r
+\r
+}\r
index f1b46eed86f1a96200efd434af15648bede3f63f..0b610835c417ef11413ea6e6c4e47e4b12ee97a4 100644 (file)
@@ -8,7 +8,12 @@ local st = require "util.stanza";
 local log = require "util.logger".init("mod_muc");\r
 local multitable_new = require "util.multitable".new;\r
 \r
-local muc_domain = "conference."..module:get_host();\r
+if module:get_host_type() ~= "component" then\r
+       error("MUC should be loaded as a component, please see http://prosody.im/doc/components", 0);\r
+end\r
+\r
+local muc_domain = module:get_host();\r
+\r
 local muc_name = "MUCMUCMUC!!!";\r
 \r
 -- room_name -> room\r
@@ -256,7 +261,7 @@ function handle_to_domain(origin, stanza)
        end\r
 end\r
 \r
-component = register_component(muc_domain, function(origin, stanza)\r
+function handle_stanza(origin, stanza)\r
        local to_node, to_host, to_resource = jid_split(stanza.attr.to);\r
        if stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then\r
                if type == "error" or type == "result" then return; end\r
@@ -272,7 +277,11 @@ component = register_component(muc_domain, function(origin, stanza)
                if type == "error" or type == "result" then return; end\r
                handle_to_domain(origin, stanza);\r
        end\r
-end);\r
+end\r
+\r
+module.load_component = function()\r
+       return handle_stanza; -- Return the function that we want to handle incoming stanzas\r
+end\r
 \r
 module.unload = function()\r
        deregister_component(muc_domain);\r
diff --git a/prosody b/prosody
index b9e927fb96f792db4a32e2a12560a656f9826c03..3bec8a6cb6fd1b8ff090325cb9e9ca71919b7fd9 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -53,19 +53,16 @@ do
        -- Use lfs? Make a new conf/ dir?
        local ok, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
        if not ok then
-               log("error", "Couldn't load config file: %s", err);
-               log("info", "Falling back to old config file format...")
-               ok, err = pcall(dofile, "lxmppd.cfg");
-               if not ok then
-                       log("error", "Old config format loading failed too: %s", err);
-               else
-                       for _, host in ipairs(_G.config.hosts) do
-                               config.set(host, "core", "defined", true);
-                       end
-                       
-                       config.set("*", "core", "modules_enabled", _G.config.modules);
-                       config.set("*", "core", "ssl", _G.config.ssl_ctx);
-               end
+               print("");
+               print("**************************");
+               print("Prosody was unable to find the configuration file.");
+               print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+               print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist");
+               print("Copy or rename it to prosody.cfg.lua and edit as necessary.");
+               print("More help on configuring Prosody can be found at http://prosody.im/doc/configure");
+               print("Good luck!");
+               print("**************************");
+               os.exit(1);
        end
 end
 
@@ -133,7 +130,7 @@ local function do_ports(option, listener, default, conntype)
                        if type(port) ~= "number" then
                                log("error", "Non-numeric "..option..": "..tostring(port));
                        else
-                               cl.start(listener, { ssl = global_ssl_ctx, port = port, type = conntype });
+                               cl.start(listener, { ssl = conntype ~= "tcp" and global_ssl_ctx, port = port, type = conntype });
                        end
                end
        end
index 6e78a13865f41bd9d09678f043a1fc4a997cb05c..8fe6edba03c203025bd8074c2d4480a402944638 100644 (file)
@@ -62,5 +62,20 @@ if not ssl then
        end
 end
 
+local encodings = softreq "util.encodings"
+if not encodings then
+       missingdep("util.encodings", { ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/";
+                                       ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so";
+                               });
+       fatal = true;
+end
+
+local encodings = softreq "util.hashes"
+if not encodings then
+       missingdep("util.hashes", { ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/";
+                                       ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so";
+                               });
+       fatal = true;
+end
 
 if fatal then os.exit(1); end