Automated merge with http://waqas.ath.cx/
authorMatthew Wild <mwild1@gmail.com>
Wed, 3 Dec 2008 17:24:20 +0000 (17:24 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 3 Dec 2008 17:24:20 +0000 (17:24 +0000)
HACKERS
net/server.lua
prosody.cfg.lua.dist
util/dependencies.lua

diff --git a/HACKERS b/HACKERS
index 02a1f1d0144589cf9a46edfa7036838d3715f036..23b7c56c834df7ecddda4d1e8d98409073221bb4 100644 (file)
--- a/HACKERS
+++ b/HACKERS
@@ -1,7 +1,5 @@
 Welcome hackers!
 
-This project accepts and *encourages* contributions. If you would like to get involved you can join us on our mailing list at: <doh, we need a mailing list>
+This project accepts and *encourages* contributions. If you would like to get involved you can join us on our mailing list and discussion rooms. More information on these at http://prosody.im/discuss
 
-You can also find us in the chatroom at lxmppd@conference.heavy-horse.co.uk
-
-Patches are welcome, though before sending we would appreciate if you read docs/coding_style.txt for guidelines on how to format your code.
+Patches are welcome, though before sending we would appreciate if you read docs/coding_style.txt for guidelines on how to format your code, and are comfortable with copyright of contributions being assigned to the core developers.
index 7548c735f97a247e876f5b12cafe9088bdffdfae..884ab3485a3593d4b2418a3a4172587667f6fe3a 100644 (file)
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
--- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
---
-
-
---[[\r
-\r
-               server.lua by blastbeat of the luadch project\r
-               \r
-               re-used here under the MIT/X Consortium License\r
-\r
-               - this script contains the server loop of the program\r
-               - other scripts can reg a server here\r
-\r
-]]--\r
-\r
-----------------------------------// DECLARATION //--\r
-\r
---// constants //--\r
-\r
-local STAT_UNIT = 1 / ( 1024 * 1024 )    -- mb\r
-\r
---// lua functions //--\r
-\r
-local function use( what ) return _G[ what ] end\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 table = use "table"\r
-local coroutine = use "coroutine"\r
-\r
---// lua lib methods //--\r
-\r
-local table_concat = table.concat\r
-local table_remove = table.remove\r
-local string_sub = use'string'.sub\r
-local coroutine_wrap = coroutine.wrap\r
-local coroutine_yield = coroutine.yield\r
-local print = print;\r
-local out_put = function () end --print;\r
-local out_error = print;\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_select = luasocket.select\r
-local ssl_newcontext = ( luasec and luasec.newcontext )\r
-\r
---// functions //--\r
-\r
-local loop\r
-local stats\r
-local addtimer\r
-local closeall\r
-local addserver\r
-local firetimer\r
-local closesocket\r
-local removesocket\r
-local wrapserver\r
-local wraptcpclient\r
-local wrapsslclient\r
-\r
---// tables //--\r
-\r
-local listener\r
-local readlist\r
-local writelist\r
-local socketlist\r
-local timelistener\r
-\r
---// simple data types //--\r
-\r
-local _\r
-local readlen = 0    -- length of readlist\r
-local writelen = 0    -- lenght of writelist\r
-\r
-local sendstat= 0\r
-local receivestat = 0\r
-\r
-----------------------------------// DEFINITION //--\r
-\r
-listener = { }    -- key = port, value = table\r
-readlist = { }    -- array with sockets to read from\r
-writelist = { }    -- arrary with sockets to write to\r
-socketlist = { }    -- key = socket, value = wrapped socket\r
-timelistener = { }\r
-\r
-stats = function( )\r
-       return receivestat, sendstat\r
-end\r
-\r
-wrapserver = function( listener, socket, ip, serverport, mode, sslctx )    -- this function wraps a server\r
-\r
-       local dispatch, disconnect = listener.listener, listener.disconnect    -- dangerous\r
-\r
-       local wrapclient, err\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
-               wrapclient = wrapsslclient\r
-               wrapclient = wraptlsclient\r
-       else\r
-               wrapclient = wraptcpclient\r
-       end\r
-\r
-       local accept = socket.accept\r
-       local close = socket.close\r
-\r
-       --// public methods of the object //--    \r
-\r
-       local handler = { }\r
-\r
-       handler.shutdown = function( ) end\r
-\r
-       --[[handler.listener = function( data, err )\r
-               return ondata( handler, data, err )\r
-       end]]\r
-       handler.ssl = function( )\r
-               return sslctx and true or false\r
-       end\r
-       handler.close = function( closed )\r
-               _ = not closed and close( socket )\r
-               writelen = removesocket( writelist, socket, writelen )\r
-               readlen = removesocket( readlist, socket, readlen )\r
-               socketlist[ socket ] = nil\r
-               handler = nil\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.receivedata = function( )\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 = wrapclient( listener, client, ip, serverport, clientport, mode, sslctx )    -- wrap new client socket\r
-                       if err then    -- error while wrapping ssl socket\r
-                               return false\r
-                       end\r
-                       out_put( "server.lua: accepted new client connection from ", ip, ":", clientport )\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
-wrapsslclient = function( listener, socket, ip, serverport, clientport, mode, sslctx )    -- this function wraps a ssl cleint\r
-\r
-       local dispatch, disconnect = listener.listener, listener.disconnect\r
-\r
-       --// transform socket to ssl object //--\r
-\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
-               return nil, nil, err    -- fatal error\r
-       end\r
-       socket:settimeout( 0 )\r
-\r
-       --// private closures of the object //--\r
-\r
-       local writequeue = { }    -- buffer for messages to send\r
-\r
-       local eol, fatal_send_error   -- end of buffer\r
-\r
-       local sstat, rstat = 0, 0\r
-\r
-       --// local import of socket methods //--\r
-\r
-       local send = socket.send\r
-       local receive = socket.receive\r
-       local close = socket.close\r
-       --local shutdown = socket.shutdown\r
-\r
-       --// public methods of the object //--\r
-\r
-       local handler = { }\r
-\r
-       handler.getstats = function( )\r
-               return rstat, sstat\r
-       end\r
-\r
-       handler.listener = function( data, err )\r
-               return listener( handler, data, err )\r
-       end\r
-       handler.ssl = function( )\r
-               return true\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( closed )\r
-               if eol and not fatal_send_error then handler._dispatchdata(); end\r
-               close( socket )\r
-               writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen\r
-               readlen = removesocket( readlist, socket, readlen )\r
-               socketlist[ socket ] = nil\r
-               out_put "server.lua: closed handler and removed socket from list"\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
-\r
-       handler.write = function( data )\r
-               if not eol then\r
-                       writelen = writelen + 1\r
-                       writelist[ writelen ] = socket\r
-                       eol = 0\r
-               end\r
-               eol = eol + 1\r
-               writequeue[ eol ] = data\r
-       end\r
-       handler.writequeue = function( )\r
-               return writequeue\r
-       end\r
-       handler.socket = function( )\r
-               return socket\r
-       end\r
-       handler.mode = function( )\r
-               return mode\r
-       end\r
-       handler._receivedata = function( )\r
-               local data, err, part = receive( socket, mode )    -- receive data in "mode"\r
-               if not err or ( err == "timeout" or err == "wantread" ) then    -- received something\r
-                       local data = data or part or ""\r
-                       local count = #data * STAT_UNIT\r
-                       rstat = rstat + count\r
-                       receivestat = receivestat + count\r
-                       out_put( "server.lua: read data '", data, "', error: ", err )\r
-                       return dispatch( handler, data, err )\r
-               else    -- connections was closed or fatal error\r
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )\r
-                       handler.close( )\r
-                       disconnect( handler, err )\r
-                       writequeue = nil\r
-                       handler = nil\r
-                       return false\r
-               end\r
-       end\r
-       handler._dispatchdata = function( )    -- this function writes data to handlers\r
-               local buffer = table_concat( writequeue, "", 1, eol )\r
-               local succ, err, byte = send( socket, buffer )\r
-               local count = ( succ or 0 ) * STAT_UNIT\r
-               sstat = sstat + count\r
-               sendstat = sendstat + count\r
-               out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )\r
-               if succ then    -- sending succesful\r
-                       --writequeue = { }\r
-                       eol = nil\r
-                       writelen = removesocket( writelist, socket, writelen )    -- delete socket from writelist\r
-                       return true\r
-               elseif byte and ( err == "timeout" or err == "wantwrite" ) then    -- want write\r
-                       buffer = string_sub( buffer, byte + 1, -1 )    -- new buffer\r
-                       writequeue[ 1 ] = buffer    -- insert new buffer in queue\r
-                       eol = 1\r
-                       return true\r
-               else    -- connection was closed during sending or fatal error\r
-                       fatal_send_error = true;\r
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )\r
-                       handler.close( )\r
-                       disconnect( handler, err )\r
-                       writequeue = nil\r
-                       handler = nil\r
-                       return false\r
-               end\r
-       end\r
-\r
-       -- // COMPAT // --\r
-\r
-       handler.getIp = handler.ip\r
-       handler.getPort = handler.clientport\r
-\r
-       --// handshake //--\r
-\r
-       local wrote\r
-\r
-       handler.handshake = coroutine_wrap( function( client )\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
-                                       writelen = ( wrote and removesocket( writelist, socket, writelen ) ) or writelen\r
-                                       handler.receivedata = handler._receivedata    -- when handshake is done, replace the handshake function with regular functions\r
-                                       handler.dispatchdata = handler._dispatchdata\r
-                                       return dispatch( handler )\r
-                               else\r
-                                       out_put( "server.lua: error during ssl handshake: ", err )\r
-                                       if err == "wantwrite" then\r
-                                               if wrote == nil then\r
-                                                       writelen = writelen + 1\r
-                                                       writelist[ writelen ] = client\r
-                                                       wrote = true\r
-                                               end\r
-                                       end\r
-                                       coroutine_yield( handler, nil, err )    -- handshake not finished\r
-                               end\r
-                       end\r
-                       _ = err ~= "closed" and close( socket )\r
-                       handler.close( )\r
-                       disconnect( handler, err )\r
-                       writequeue = nil\r
-                       handler = nil\r
-                       return false    -- handshake failed\r
-               end\r
-       )\r
-       handler.receivedata = handler.handshake\r
-       handler.dispatchdata = handler.handshake\r
-\r
-       handler.handshake( socket )    -- do handshake\r
-\r
-       socketlist[ socket ] = handler\r
-       readlen = readlen + 1\r
-       readlist[ readlen ] = socket\r
-\r
-       return handler, socket\r
-end\r
-\r
-wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, sslctx )    -- this function wraps a tls cleint\r
-\r
-       local dispatch, disconnect = listener.listener, listener.disconnect\r
-\r
-       --// transform socket to ssl object //--\r
-\r
-       local err\r
-\r
-       socket:settimeout( 0 )\r
-       out_put("setting linger on "..tostring(socket))\r
-       socket:setoption("linger", { on = true, timeout = 10 });\r
-       --// private closures of the object //--\r
-\r
-       local writequeue = { }    -- buffer for messages to send\r
-\r
-       local eol, fatal_send_error   -- end of buffer\r
-\r
-       local sstat, rstat = 0, 0\r
-\r
-       --// local import of socket methods //--\r
-\r
-       local send = socket.send\r
-       local receive = socket.receive\r
-       local close = socket.close\r
-       --local shutdown = socket.shutdown\r
-\r
-       --// public methods of the object //--\r
-\r
-       local handler = { }\r
-\r
-       handler.getstats = function( )\r
-               return rstat, sstat\r
-       end\r
-\r
-       handler.listener = function( data, err )\r
-               return listener( handler, data, err )\r
-       end\r
-       handler.ssl = function( )\r
-               return false\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( closed )\r
-               if eol and not fatal_send_error then handler._dispatchdata(); end\r
-               close( socket )\r
-               writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen\r
-               readlen = removesocket( readlist, socket, readlen )\r
-               socketlist[ socket ] = nil\r
-               out_put "server.lua: closed handler and removed socket from list"\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
-\r
-       handler.write = function( data )\r
-               if not eol then\r
-                       writelen = writelen + 1\r
-                       writelist[ writelen ] = socket\r
-                       eol = 0\r
-               end\r
-               eol = eol + 1\r
-               writequeue[ eol ] = data\r
-       end\r
-       handler.writequeue = function( )\r
-               return writequeue\r
-       end\r
-       handler.socket = function( )\r
-               return socket\r
-       end\r
-       handler.mode = function( )\r
-               return mode\r
-       end\r
-       handler._receivedata = function( )\r
-               local data, err, part = receive( socket, mode )    -- receive data in "mode"\r
-               if not err or ( err == "timeout" or err == "wantread" ) then    -- received something\r
-                       local data = data or part or ""\r
-                       local count = #data * STAT_UNIT\r
-                       rstat = rstat + count\r
-                       receivestat = receivestat + count\r
-                       --out_put( "server.lua: read data '", data, "', error: ", err )\r
-                       return dispatch( handler, data, err )\r
-               else    -- connections was closed or fatal error\r
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )\r
-                       handler.close( )\r
-                       disconnect( handler, err )\r
-                       writequeue = nil\r
-                       handler = nil\r
-                       return false\r
-               end\r
-       end\r
-       handler._dispatchdata = function( )    -- this function writes data to handlers\r
-               local buffer = table_concat( writequeue, "", 1, eol )\r
-               local succ, err, byte = send( socket, buffer )\r
-               local count = ( succ or 0 ) * STAT_UNIT\r
-               sstat = sstat + count\r
-               sendstat = sendstat + count\r
-               out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )\r
-               if succ then    -- sending succesful\r
-                       --writequeue = { }\r
-                       eol = nil\r
-                       writelen = removesocket( writelist, socket, writelen )    -- delete socket from writelist\r
-                       if handler.need_tls then\r
-                               out_put("server.lua: connection is ready for tls handshake");\r
-                               handler.starttls(true);\r
-                               if handler.need_tls then\r
-                                       out_put("server.lua: uh-oh... we still want tls, something must be wrong");\r
-                               end\r
-                       end\r
-                       return true\r
-               elseif byte and ( err == "timeout" or err == "wantwrite" ) then    -- want write\r
-                       buffer = string_sub( buffer, byte + 1, -1 )    -- new buffer\r
-                       writequeue[ 1 ] = buffer    -- insert new buffer in queue\r
-                       eol = 1\r
-                       return true\r
-               else    -- connection was closed during sending or fatal error\r
-                       fatal_send_error = true; -- :(\r
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )\r
-                       handler.close( )\r
-                       disconnect( handler, err )\r
-                       writequeue = nil\r
-                       handler = nil\r
-                       return false\r
-               end\r
-       end\r
-\r
-       handler.receivedata, handler.dispatchdata = handler._receivedata, handler._dispatchdata;\r
-       -- // COMPAT // --\r
-\r
-       handler.getIp = handler.ip\r
-       handler.getPort = handler.clientport\r
-\r
-       --// handshake //--\r
-\r
-       local wrote, read\r
-       \r
-       handler.starttls = function (now)\r
-               if not now then out_put("server.lua: we need to do tls, but delaying until later"); handler.need_tls = true; return; end\r
-               out_put( "server.lua: attempting to start tls on "..tostring(socket) )\r
-               socket, err = ssl_wrap( socket, sslctx )    -- wrap socket\r
-               out_put("sslwrapped socket is "..tostring(socket));\r
-               if err then\r
-                       out_put( "server.lua: ssl error: ", err )\r
-                       return nil, nil, err    -- fatal error\r
-               end\r
-               socket:settimeout( 1 )\r
-               send = socket.send\r
-               receive = socket.receive\r
-               close = socket.close\r
-               handler.ssl = function( )\r
-                       return true\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
-               \r
-               handler.starttls = nil;\r
-               \r
-                       handler.handshake = coroutine_wrap( function( client )\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
-                                                       writelen = ( wrote and removesocket( writelist, socket, writelen ) ) or writelen\r
-                                                       handler.receivedata = handler._receivedata    -- when handshake is done, replace the handshake function with regular functions\r
-                                                       handler.dispatchdata = handler._dispatchdata\r
-                                                       handler.need_tls = nil\r
-                                                       socketlist[ client ] = handler\r
-                                                       readlen = readlen + 1\r
-                                                       readlist[ readlen ] = client                                                                                            \r
-                                                       return true;\r
-                                               else\r
-                                                       out_put( "server.lua: error during ssl handshake: ", err )\r
-                                                       if err == "wantwrite" then\r
-                                                               if wrote == nil then\r
-                                                                       writelen = writelen + 1\r
-                                                                       writelist[ writelen ] = client\r
-                                                                       wrote = true\r
-                                                               end\r
-                                                       end\r
-                                                       coroutine_yield( handler, nil, err )    -- handshake not finished\r
-                                               end\r
-                                       end\r
-                                       _ = err ~= "closed" and close( socket )\r
-                                       handler.close( )\r
-                                       disconnect( handler, err )\r
-                                       writequeue = nil\r
-                                       handler = nil\r
-                                       return false    -- handshake failed\r
-                               end\r
-                       )\r
-                       handler.receivedata = handler.handshake\r
-                       handler.dispatchdata = handler.handshake\r
-\r
-                       handler.handshake( socket )    -- do handshake\r
-               end\r
-       socketlist[ socket ] = handler\r
-       readlen = readlen + 1\r
-       readlist[ readlen ] = socket\r
-\r
-       return handler, socket\r
-end\r
-\r
-wraptcpclient = function( listener, socket, ip, serverport, clientport, mode )    -- this function wraps a socket\r
-\r
-       local dispatch, disconnect = listener.listener, listener.disconnect\r
-\r
-       --// private closures of the object //--\r
-\r
-       local writequeue = { }    -- list for messages to send\r
-\r
-       local eol, fatal_send_error\r
-\r
-       local rstat, sstat = 0, 0\r
-\r
-       --// local import of socket methods //--\r
-\r
-       local send = socket.send\r
-       local receive = socket.receive\r
-       local close = socket.close\r
-       local shutdown = socket.shutdown\r
-\r
-       --// public methods of the object //--\r
-\r
-       local handler = { }\r
-\r
-       handler.getstats = function( )\r
-               return rstat, sstat\r
-       end\r
-\r
-       handler.listener = function( data, err )\r
-               return listener( handler, data, err )\r
-       end\r
-       handler.ssl = function( )\r
-               return false\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( closed )\r
-               if eol and not fatal_send_error then handler.dispatchdata(); end\r
-               _ = not closed and shutdown( socket )\r
-               _ = not closed and close( socket )\r
-               writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen\r
-               readlen = removesocket( readlist, socket, readlen )\r
-               socketlist[ socket ] = nil\r
-               out_put "server.lua: closed handler and removed socket from list"\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
-       handler.write = function( data )\r
-               if not eol then\r
-                       writelen = writelen + 1\r
-                       writelist[ writelen ] = socket\r
-                       eol = 0\r
-               end\r
-               eol = eol + 1\r
-               writequeue[ eol ] = data\r
-       end\r
-       handler.writequeue = function( )\r
-               return writequeue\r
-       end\r
-       handler.socket = function( )\r
-               return socket\r
-       end\r
-       handler.mode = function( )\r
-               return mode\r
-       end\r
-       \r
-       handler.receivedata = function( )\r
-               local data, err, part = receive( socket, mode )    -- receive data in "mode"\r
-               if not err or ( err == "timeout" or err == "wantread" ) then    -- received something\r
-                       local data = data or part or ""\r
-                       local count = #data * STAT_UNIT\r
-                       rstat = rstat + count\r
-                       receivestat = receivestat + count\r
-                       out_put( "server.lua: read data '", data, "', error: ", err )\r
-                       return dispatch( handler, data, err )\r
-               else    -- connections was closed or fatal error\r
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )\r
-                       handler.close( )\r
-                       disconnect( handler, err )\r
-                       writequeue = nil\r
-                       handler = nil\r
-                       return false\r
-               end\r
-       end\r
-       \r
-       handler.dispatchdata = function( )    -- this function writes data to handlers\r
-               local buffer = table_concat( writequeue, "", 1, eol )\r
-               local succ, err, byte = send( socket, buffer )\r
-               local count = ( succ or 0 ) * STAT_UNIT\r
-               sstat = sstat + count\r
-               sendstat = sendstat + count\r
-               out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )\r
-               if succ then    -- sending succesful\r
-                       --writequeue = { }\r
-                       eol = nil\r
-                       writelen = removesocket( writelist, socket, writelen )    -- delete socket from writelist\r
-                       return true\r
-               elseif byte and ( err == "timeout" or err == "wantwrite" ) then    -- want write\r
-                       buffer = string_sub( buffer, byte + 1, -1 )    -- new buffer\r
-                       writequeue[ 1 ] = buffer    -- insert new buffer in queue\r
-                       eol = 1\r
-                       return true\r
-               else    -- connection was closed during sending or fatal error\r
-                       fatal_send_error = true; -- :'-(\r
-                       out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )\r
-                       handler.close( )\r
-                       disconnect( handler, err )\r
-                       writequeue = nil\r
-                       handler = nil\r
-                       return false\r
-               end\r
-       end\r
-\r
-       -- // COMPAT // --\r
-\r
-       handler.getIp = handler.ip\r
-       handler.getPort = handler.clientport\r
-\r
-       socketlist[ socket ] = handler\r
-       readlen = readlen + 1\r
-       readlist[ readlen ] = socket\r
-\r
-       return handler, socket\r
-end\r
-\r
-addtimer = function( listener )\r
-       timelistener[ #timelistener + 1 ] = listener\r
-end\r
-\r
-firetimer = function( listener )\r
-       for i, listener in ipairs( timelistener ) do\r
-               listener( )\r
-       end\r
-end\r
-\r
-addserver = function( listeners, port, addr, mode, sslctx )    -- this function provides a way for other scripts to reg a server\r
-       local err\r
-       if type( listeners ) ~= "table" then\r
-               err = "invalid listener table"\r
-       else\r
-               for name, func in pairs( listeners ) do\r
-                       if type( func ) ~= "function" then\r
-                               --err = "invalid listener function"\r
-                               break\r
-                       end\r
-               end\r
-       end\r
-       if not type( port ) == "number" or not ( port >= 0 and port <= 65535 ) then\r
-               err = "invalid port"\r
-       elseif listener[ 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, mode, sslctx )    -- wrap new server socket\r
-       if not handler then\r
-               server:close( )\r
-               return nil, err\r
-       end\r
-       server:settimeout( 0 )\r
-       readlen = readlen + 1\r
-       readlist[ readlen ] = server\r
-       listener[ port ] = listeners\r
-       socketlist[ server ] = handler\r
-       out_put( "server.lua: new server listener on ", addr, ":", port )\r
-       return true\r
-end\r
-\r
-removesocket = function( tbl, socket, len )    -- this function removes sockets from a list\r
-       for i, target in ipairs( tbl ) do\r
-               if target == socket then\r
-                       len = len - 1\r
-                       table_remove( tbl, i )\r
-                       return len\r
-               end\r
-       end\r
-       return len\r
-end\r
-\r
-closeall = function( )\r
-       for sock, handler in pairs( socketlist ) do\r
-               handler.shutdown( )\r
-               handler.close( )\r
-               socketlist[ sock ] = nil\r
-       end\r
-       writelist, readlist, socketlist = { }, { }, { }\r
-end\r
-\r
-closesocket = function( socket )\r
-       writelen = removesocket( writelist, socket, writelen )\r
-       readlen = removesocket( readlist, socket, readlen )\r
-       socketlist[ socket ] = nil\r
-       socket:close( )\r
-end\r
-\r
-loop = function( )    -- this is the main loop of the program\r
-       --signal_set( "hub", "run" )\r
-       repeat\r
-               --[[print(readlen, writelen)\r
-               for _, s in ipairs(readlist) do print("R:", tostring(s)) end\r
-               for _, s in ipairs(writelist) do print("W:", tostring(s)) end\r
-               out_put("select()"..os.time())]]\r
-               local read, write, err = socket_select( readlist, writelist, 1 )    -- 1 sec timeout, nice for timers\r
-               for i, socket in ipairs( write ) do    -- send data waiting in writequeues\r
-                       local handler = socketlist[ socket ]\r
-                       if handler then\r
-                               handler.dispatchdata( )\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.receivedata( )\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
-               firetimer( )\r
-       until false\r
-       return\r
-end\r
-\r
-----------------------------------// BEGIN //--\r
-\r
-----------------------------------// PUBLIC INTERFACE //--\r
-\r
-return {\r
-\r
-       add = addserver,\r
-       loop = loop,\r
-       stats = stats,\r
-       closeall = closeall,\r
-       addtimer = addtimer,\r
-       wraptlsclient = wraptlsclient,\r
-}\r
+--[[
+
+               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 out_put = function () end --print;
+local out_error = print;
+
+--// 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 )    -- this function wraps a server
+
+       local dispatch, disconnect = listener.listener, listener.disconnect    -- dangerous
+
+       local wrapclient, err
+
+       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
+               wrapclient = wrapsslclient
+               wrapclient = wraptlsclient
+       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   -- end of buffer
+
+       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 handler._dispatchdata(); 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
+                       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 )
+       out_put("setting linger on "..tostring(socket))
+       socket:setoption("linger", { on = true, timeout = 10 });
+       --// private closures of the object //--
+
+       local writequeue = { }    -- buffer for messages to send
+
+       local eol, fatal_send_error   -- end of buffer
+
+       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 handler._dispatchdata(); 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);
+                               if handler.need_tls then
+                                       out_put("server.lua: uh-oh... we still want tls, something must be wrong");
+                               end
+                       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) )
+               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( 1 )
+               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.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
+                                                       handler.need_tls = nil
+                                                       socketlist[ client ] = handler
+                                                       readlen = readlen + 1
+                                                       readlist[ readlen ] = client                                                                                            
+                                                       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
+
+       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 handler.dispatchdata(); 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
+                       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 )    -- 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( "server.lua: ", err )
+               return nil, err
+       end
+       local handler, err = wrapserver( listeners, server, addr, port, mode, sslctx )    -- 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
+               --[[print(readlen, writelen)
+               for _, s in ipairs(readlist) do print("R:", tostring(s)) end
+               for _, s in ipairs(writelist) do print("W:", tostring(s)) end
+               out_put("select()"..os.time())]]
+               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,
+       wraptlsclient = wraptlsclient,
+}
index 5a0fab713ef4be8d4809731243a9507381455fe5..7289921a319ba72b7519f991f2b0b4f922e02e9e 100644 (file)
@@ -75,4 +75,3 @@ Host "example.com"
                }\r
 \r
        enabled = false -- This will disable the host, preserving the config, but denying connections\r
->>>>>>> other\r
index b7e6c61617b02b5a201223aa3d544b3d27d3a949..d841b30da2a36bb70b265432a29ab81a8daf6f42 100644 (file)
@@ -33,7 +33,7 @@ local function missingdep(name, sources, msg)
        end
        print("");
        print(msg or (name.." is required for Prosody to run, so we will now exit."));
-       print("More help can be found on our website, at http://.../doc/depends");
+       print("More help can be found on our website, at http://prosody.im/doc/depends");
        print("**************************");
        print("");
 end