local addtimer\r
local closeall\r
local addserver\r
+local getserver\r
local wrapserver\r
local getsettings\r
local closesocket\r
return false\r
end\r
connections = connections + 1\r
- out_put( "server.lua: accepted new client connection from ", ip, ":", clientport, " to ", serverport)\r
+ out_put( "server.lua: accepted new client connection from ", tostring(ip), ":", tostring(clientport), " to ", tostring(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
+ out_put( "server.lua: error with new client connection: ", tostring(err) )\r
return false\r
end\r
end\r
return shutdown( socket, pattern )\r
end\r
handler.close = function( forced )\r
+ if not handler then return true; end\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
+ if handler then\r
+ handler.write = nil -- ... but no further writing allowed\r
+ end\r
toclose = true\r
return false\r
end\r
send( socket, table_concat( bufferqueue, "", 1, bufferqueuelen ), 1, bufferlen ) -- forced send\r
end\r
end\r
- shutdown( socket )\r
+ _ = shutdown and 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
+ if handler then\r
+ _writetimes[ handler ] = nil\r
+ _closelist[ handler ] = nil\r
+ handler = nil\r
+ end\r
socket = nil\r
mem_free( )\r
if server then\r
pattern = new or pattern\r
return pattern\r
end\r
+ handler.setsend = function ( newsend )\r
+ send = newsend or send\r
+ return send\r
+ end\r
handler.bufferlen = function( readlen, sendlen )\r
maxsendlen = sendlen or maxsendlen\r
maxreadlen = readlen or maxreadlen\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
+ out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " error: ", tostring(err) )\r
fatalerror = true\r
disconnect( handler, err )\r
_ = handler and handler.close( )\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
+ --out_put( "server.lua: sended '", buffer, "', bytes: ", tostring(succ), ", error: ", tostring(err), ", part: ", tostring(byte), ", to: ", tostring(ip), ":", tostring(clientport) )\r
if succ then -- sending succesful\r
bufferqueuelen = 0\r
bufferlen = 0\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
+ out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " error: ", tostring(err) )\r
fatalerror = true\r
disconnect( handler, err )\r
_ = handler and handler.close( )\r
-- return dispatch( handler )\r
return true\r
else\r
- out_put( "server.lua: error during ssl handshake: ", err )\r
+ out_put( "server.lua: error during ssl handshake: ", tostring(err) )\r
if err == "wantwrite" and not wrote then\r
_sendlistlen = _sendlistlen + 1\r
_sendlist[ _sendlistlen ] = client\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
+ out_put( "server.lua: ssl error: ", tostring(err) )\r
mem_free( )\r
return nil, nil, err -- fatal error\r
end\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
+ out_put( "server.lua: error while starting tls on client: ", tostring(err) )\r
return nil, err -- fatal error\r
end\r
\r
return handler\r
end\r
\r
+getserver = function ( port )\r
+ return _server[ port ];\r
+end\r
+\r
removeserver = function( port )\r
local handler = _server[ port ]\r
if not handler then\r
return _readtraffic, _sendtraffic, _readlistlen, _sendlistlen, _timerlistlen\r
end\r
\r
+local dontstop = true; -- thinking about tomorrow, ...\r
+\r
+setquitting = function (quit)\r
+ dontstop = not quit;\r
+ return;\r
+end\r
+\r
loop = function( ) -- this is the main loop of the program\r
- while true do\r
+ while dontstop 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
socket_sleep( _sleeptime ) -- wait some time\r
--collectgarbage( )\r
end\r
+ return "quitting"\r
end\r
\r
--// EXPERIMENTAL //--\r
end\r
\r
local addclient = function( address, port, listeners, pattern, sslctx, startssl )\r
- local client, err = socket.tcp( )\r
+ local client, err = luasocket.tcp( )\r
if err then\r
return nil, err\r
end\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
+ wrapconnection( nil, listeners, client, address, port, "clientport", pattern, sslctx, startssl )\r
end\r
end\r
\r
closeall = closeall,\r
addtimer = addtimer,\r
addserver = addserver,\r
+ getserver = getserver,\r
getsettings = getsettings,\r
+ setquitting = setquitting,\r
removeserver = removeserver,\r
changesettings = changesettings,\r
-\r
}\r
projects / prosody.git / blobdiff