Software `/` code `/` prosody

Annotate

net/server.lua @ 1522:569d58d21612

Add copyright header to those files missing one

author	Matthew Wild <mwild1@gmail.com>
date	Fri, 10 Jul 2009 03:08:38 +0100
parent	1297:9c8f86a3878d
child	1533:8c13be7aa9f0

rev	line source
1522 569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1297 diff changeset	1 -- Prosody IM
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1297 diff changeset	2 -- Copyright (C) 2008-2009 Matthew Wild
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1297 diff changeset	3 -- Copyright (C) 2008-2009 Waqas Hussain
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1297 diff changeset	4 --
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1297 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1297 diff changeset	6 -- COPYING file in the source package for more information.
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1297 diff changeset	7 --
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1297 diff changeset	8
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	9 --[[
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	10
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	11 server.lua by blastbeat
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	12
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	13 - this script contains the server loop of the program
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	14 - other scripts can reg a server here
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	15
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	16 ]]--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	17
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	18 -- // wrapping luadch stuff // --
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	19
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	20 local use = function( what )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	21 return _G[ what ]
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	22 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	23 local clean = function( tbl )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	24 for i, k in pairs( tbl ) do
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	25 tbl[ i ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	26 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	27 end
740 cc25d75b4027 server.lua: Use Prosody logger for errors, silence non-errors Matthew Wild <mwild1@gmail.com> parents: 739 diff changeset	28
cc25d75b4027 server.lua: Use Prosody logger for errors, silence non-errors Matthew Wild <mwild1@gmail.com> parents: 739 diff changeset	29 local log, table_concat = require ("util.logger").init("socket"), table.concat;
741 97577b6c07ca server.lua: Comment out unnecessary or very verbose logging, and log the rest as debug level Matthew Wild <mwild1@gmail.com> parents: 740 diff changeset	30 local out_put = function (...) return log("debug", table_concat{...}); end
740 cc25d75b4027 server.lua: Use Prosody logger for errors, silence non-errors Matthew Wild <mwild1@gmail.com> parents: 739 diff changeset	31 local out_error = function (...) return log("warn", table_concat{...}); end
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	32 local mem_free = collectgarbage
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	33
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	34 ----------------------------------// DECLARATION //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	35
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	36 --// constants //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	37
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	38 local STAT_UNIT = 1 -- byte
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	39
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	40 --// lua functions //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	41
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	42 local type = use "type"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	43 local pairs = use "pairs"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	44 local ipairs = use "ipairs"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	45 local tostring = use "tostring"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	46 local collectgarbage = use "collectgarbage"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	47
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	48 --// lua libs //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	49
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	50 local os = use "os"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	51 local table = use "table"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	52 local string = use "string"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	53 local coroutine = use "coroutine"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	54
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	55 --// lua lib methods //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	56
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	57 local os_time = os.time
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	58 local os_difftime = os.difftime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	59 local table_concat = table.concat
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	60 local table_remove = table.remove
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	61 local string_len = string.len
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	62 local string_sub = string.sub
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	63 local coroutine_wrap = coroutine.wrap
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	64 local coroutine_yield = coroutine.yield
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	65
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	66 --// extern libs //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	67
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	68 local luasec = select( 2, pcall( require, "ssl" ) )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	69 local luasocket = require "socket"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	70
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	71 --// extern lib methods //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	72
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	73 local ssl_wrap = ( luasec and luasec.wrap )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	74 local socket_bind = luasocket.bind
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	75 local socket_sleep = luasocket.sleep
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	76 local socket_select = luasocket.select
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	77 local ssl_newcontext = ( luasec and luasec.newcontext )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	78
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	79 --// functions //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	80
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	81 local id
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	82 local loop
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	83 local stats
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	84 local idfalse
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	85 local addtimer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	86 local closeall
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	87 local addserver
1098 37ea264e133d net.server: Add getserver() method to find the server listening on the specified port Matthew Wild <mwild1@gmail.com> parents: 999 diff changeset	88 local getserver
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	89 local wrapserver
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	90 local getsettings
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	91 local closesocket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	92 local removesocket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	93 local removeserver
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	94 local changetimeout
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	95 local wrapconnection
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	96 local changesettings
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	97
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	98 --// tables //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	99
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	100 local _server
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	101 local _readlist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	102 local _timerlist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	103 local _sendlist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	104 local _socketlist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	105 local _closelist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	106 local _readtimes
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	107 local _writetimes
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	108
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	109 --// simple data types //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	110
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	111 local _
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	112 local _readlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	113 local _sendlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	114 local _timerlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	115
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	116 local _sendtraffic
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	117 local _readtraffic
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	118
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	119 local _selecttimeout
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	120 local _sleeptime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	121
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	122 local _starttime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	123 local _currenttime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	124
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	125 local _maxsendlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	126 local _maxreadlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	127
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	128 local _checkinterval
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	129 local _sendtimeout
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	130 local _readtimeout
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	131
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	132 local _cleanqueue
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	133
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	134 local _timer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	135
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	136 local _maxclientsperserver
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	137
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	138 ----------------------------------// DEFINITION //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	139
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	140 _server = { } -- key = port, value = table; list of listening servers
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	141 _readlist = { } -- array with sockets to read from
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	142 _sendlist = { } -- arrary with sockets to write to
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	143 _timerlist = { } -- array of timer functions
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	144 _socketlist = { } -- key = socket, value = wrapped socket (handlers)
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	145 _readtimes = { } -- key = handler, value = timestamp of last data reading
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	146 _writetimes = { } -- key = handler, value = timestamp of last data writing/sending
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	147 _closelist = { } -- handlers to close
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	148
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	149 _readlistlen = 0 -- length of readlist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	150 _sendlistlen = 0 -- length of sendlist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	151 _timerlistlen = 0 -- lenght of timerlist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	152
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	153 _sendtraffic = 0 -- some stats
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	154 _readtraffic = 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	155
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	156 _selecttimeout = 1 -- timeout of socket.select
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	157 _sleeptime = 0 -- time to wait at the end of every loop
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	158
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	159 _maxsendlen = 51000 * 1024 -- max len of send buffer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	160 _maxreadlen = 25000 * 1024 -- max len of read buffer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	161
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	162 _checkinterval = 1200000 -- interval in secs to check idle clients
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	163 _sendtimeout = 60000 -- allowed send idle time in secs
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	164 _readtimeout = 6 * 60 * 60 -- allowed read idle time in secs
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	165
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	166 _cleanqueue = false -- clean bufferqueue after using
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	167
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	168 _maxclientsperserver = 1000
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	169
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	170 ----------------------------------// PRIVATE //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	171
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	172 wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxconnections, startssl ) -- this function wraps a server
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	173
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	174 maxconnections = maxconnections or _maxclientsperserver
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	175
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	176 local connections = 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	177
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	178 local dispatch, disconnect = listeners.incoming or listeners.listener, listeners.disconnect
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	179
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	180 local err
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	181
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	182 local ssl = false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	183
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	184 if sslctx then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	185 if not ssl_newcontext then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	186 return nil, "luasec not found"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	187 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	188 if type( sslctx ) ~= "table" then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	189 out_error "server.lua: wrong server sslctx"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	190 return nil, "wrong server sslctx"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	191 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	192 sslctx, err = ssl_newcontext( sslctx )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	193 if not sslctx then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	194 err = err or "wrong sslctx parameters"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	195 out_error( "server.lua: ", err )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	196 return nil, err
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	197 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	198 ssl = true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	199 else
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	200 out_put("server.lua: ", "ssl not enabled on ", serverport);
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	201 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	202
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	203 local accept = socket.accept
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	204
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	205 --// public methods of the object //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	206
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	207 local handler = { }
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	208
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	209 handler.shutdown = function( ) end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	210
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	211 handler.ssl = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	212 return ssl
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	213 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	214 handler.remove = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	215 connections = connections - 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	216 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	217 handler.close = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	218 for _, handler in pairs( _socketlist ) do
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	219 if handler.serverport == serverport then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	220 handler.disconnect( handler, "server closed" )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	221 handler.close( true )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	222 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	223 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	224 socket:close( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	225 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	226 _readlistlen = removesocket( _readlist, socket, _readlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	227 _socketlist[ socket ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	228 handler = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	229 socket = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	230 mem_free( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	231 out_put "server.lua: closed server handler and removed sockets from list"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	232 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	233 handler.ip = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	234 return ip
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	235 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	236 handler.serverport = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	237 return serverport
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	238 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	239 handler.socket = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	240 return socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	241 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	242 handler.readbuffer = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	243 if connections > maxconnections then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	244 out_put( "server.lua: refused new client connection: server full" )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	245 return false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	246 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	247 local client, err = accept( socket ) -- try to accept
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	248 if client then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	249 local ip, clientport = client:getpeername( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	250 client:settimeout( 0 )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	251 local handler, client, err = wrapconnection( handler, listeners, client, ip, serverport, clientport, pattern, sslctx, startssl ) -- wrap new client socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	252 if err then -- error while wrapping ssl socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	253 return false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	254 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	255 connections = connections + 1
962 872f5d85636e net.server: Ensure some logging parameters are strings Matthew Wild <mwild1@gmail.com> parents: 885 diff changeset	256 out_put( "server.lua: accepted new client connection from ", tostring(ip), ":", tostring(clientport), " to ", tostring(serverport))
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	257 return dispatch( handler )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	258 elseif err then -- maybe timeout or something else
962 872f5d85636e net.server: Ensure some logging parameters are strings Matthew Wild <mwild1@gmail.com> parents: 885 diff changeset	259 out_put( "server.lua: error with new client connection: ", tostring(err) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	260 return false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	261 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	262 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	263 return handler
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	264 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	265
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	266 wrapconnection = function( server, listeners, socket, ip, serverport, clientport, pattern, sslctx, startssl ) -- this function wraps a client to a handler object
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	267
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	268 socket:settimeout( 0 )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	269
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	270 --// local import of socket methods //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	271
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	272 local send
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	273 local receive
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	274 local shutdown
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	275
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	276 --// private closures of the object //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	277
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	278 local ssl
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	279
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	280 local dispatch = listeners.incoming or listeners.listener
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	281 local disconnect = listeners.disconnect
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	282
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	283 local bufferqueue = { } -- buffer array
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	284 local bufferqueuelen = 0 -- end of buffer array
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	285
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	286 local toclose
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	287 local fatalerror
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	288 local needtls
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	289
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	290 local bufferlen = 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	291
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	292 local noread = false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	293 local nosend = false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	294
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	295 local sendtraffic, readtraffic = 0, 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	296
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	297 local maxsendlen = _maxsendlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	298 local maxreadlen = _maxreadlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	299
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	300 --// public methods of the object //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	301
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	302 local handler = bufferqueue -- saves a table ^_^
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	303
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	304 handler.dispatch = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	305 return dispatch
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	306 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	307 handler.disconnect = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	308 return disconnect
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	309 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	310 handler.setlistener = function( listeners )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	311 dispatch = listeners.incoming
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	312 disconnect = listeners.disconnect
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	313 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	314 handler.getstats = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	315 return readtraffic, sendtraffic
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	316 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	317 handler.ssl = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	318 return ssl
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	319 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	320 handler.send = function( _, data, i, j )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	321 return send( socket, data, i, j )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	322 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	323 handler.receive = function( pattern, prefix )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	324 return receive( socket, pattern, prefix )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	325 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	326 handler.shutdown = function( pattern )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	327 return shutdown( socket, pattern )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	328 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	329 handler.close = function( forced )
867 21347a87e185 net.server: Check for potential nil handler on close Matthew Wild <mwild1@gmail.com> parents: 855 diff changeset	330 if not handler then return true; end
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	331 _readlistlen = removesocket( _readlist, socket, _readlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	332 _readtimes[ handler ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	333 if bufferqueuelen ~= 0 then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	334 if not ( forced or fatalerror ) then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	335 handler.sendbuffer( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	336 if bufferqueuelen ~= 0 then -- try again...
999 c088139d8f05 net.server: Fix potential nil handler usage Matthew Wild <mwild1@gmail.com> parents: 996 diff changeset	337 if handler then
c088139d8f05 net.server: Fix potential nil handler usage Matthew Wild <mwild1@gmail.com> parents: 996 diff changeset	338 handler.write = nil -- ... but no further writing allowed
c088139d8f05 net.server: Fix potential nil handler usage Matthew Wild <mwild1@gmail.com> parents: 996 diff changeset	339 end
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	340 toclose = true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	341 return false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	342 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	343 else
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	344 send( socket, table_concat( bufferqueue, "", 1, bufferqueuelen ), 1, bufferlen ) -- forced send
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	345 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	346 end
868 9e058e51ecaf net.server: Don't call shutdown method on socket if it doesn't have one, eg. for UDP Matthew Wild <mwild1@gmail.com> parents: 867 diff changeset	347 _ = shutdown and shutdown( socket )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	348 socket:close( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	349 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	350 _socketlist[ socket ] = nil
999 c088139d8f05 net.server: Fix potential nil handler usage Matthew Wild <mwild1@gmail.com> parents: 996 diff changeset	351 if handler then
c088139d8f05 net.server: Fix potential nil handler usage Matthew Wild <mwild1@gmail.com> parents: 996 diff changeset	352 _writetimes[ handler ] = nil
c088139d8f05 net.server: Fix potential nil handler usage Matthew Wild <mwild1@gmail.com> parents: 996 diff changeset	353 _closelist[ handler ] = nil
c088139d8f05 net.server: Fix potential nil handler usage Matthew Wild <mwild1@gmail.com> parents: 996 diff changeset	354 handler = nil
c088139d8f05 net.server: Fix potential nil handler usage Matthew Wild <mwild1@gmail.com> parents: 996 diff changeset	355 end
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	356 socket = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	357 mem_free( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	358 if server then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	359 server.remove( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	360 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	361 out_put "server.lua: closed client handler and removed socket from list"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	362 return true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	363 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	364 handler.ip = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	365 return ip
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	366 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	367 handler.serverport = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	368 return serverport
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	369 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	370 handler.clientport = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	371 return clientport
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	372 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	373 local write = function( data )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	374 bufferlen = bufferlen + string_len( data )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	375 if bufferlen > maxsendlen then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	376 _closelist[ handler ] = "send buffer exceeded" -- cannot close the client at the moment, have to wait to the end of the cycle
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	377 handler.write = idfalse -- dont write anymore
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	378 return false
775 d4b6714fc829 net.server: Fix nil table index assignment Matthew Wild <mwild1@gmail.com> parents: 773 diff changeset	379 elseif socket and not _sendlist[ socket ] then
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	380 _sendlistlen = _sendlistlen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	381 _sendlist[ _sendlistlen ] = socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	382 _sendlist[ socket ] = _sendlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	383 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	384 bufferqueuelen = bufferqueuelen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	385 bufferqueue[ bufferqueuelen ] = data
815 cf8392613f46 net.server: Fix some more potential nil handler accesses Matthew Wild <mwild1@gmail.com> parents: 775 diff changeset	386 if handler then
cf8392613f46 net.server: Fix some more potential nil handler accesses Matthew Wild <mwild1@gmail.com> parents: 775 diff changeset	387 _writetimes[ handler ] = _writetimes[ handler ] or _currenttime
cf8392613f46 net.server: Fix some more potential nil handler accesses Matthew Wild <mwild1@gmail.com> parents: 775 diff changeset	388 end
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	389 return true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	390 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	391 handler.write = write
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	392 handler.bufferqueue = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	393 return bufferqueue
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	394 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	395 handler.socket = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	396 return socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	397 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	398 handler.pattern = function( new )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	399 pattern = new or pattern
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	400 return pattern
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	401 end
885 38ed2db19a55 net.server: Allow replacement of send function on an open socket Matthew Wild <mwild1@gmail.com> parents: 868 diff changeset	402 handler.setsend = function ( newsend )
38ed2db19a55 net.server: Allow replacement of send function on an open socket Matthew Wild <mwild1@gmail.com> parents: 868 diff changeset	403 send = newsend or send
38ed2db19a55 net.server: Allow replacement of send function on an open socket Matthew Wild <mwild1@gmail.com> parents: 868 diff changeset	404 return send
38ed2db19a55 net.server: Allow replacement of send function on an open socket Matthew Wild <mwild1@gmail.com> parents: 868 diff changeset	405 end
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	406 handler.bufferlen = function( readlen, sendlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	407 maxsendlen = sendlen or maxsendlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	408 maxreadlen = readlen or maxreadlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	409 return maxreadlen, maxsendlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	410 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	411 handler.lock = function( switch )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	412 if switch == true then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	413 handler.write = idfalse
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	414 local tmp = _sendlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	415 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	416 _writetimes[ handler ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	417 if _sendlistlen ~= tmp then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	418 nosend = true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	419 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	420 tmp = _readlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	421 _readlistlen = removesocket( _readlist, socket, _readlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	422 _readtimes[ handler ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	423 if _readlistlen ~= tmp then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	424 noread = true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	425 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	426 elseif switch == false then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	427 handler.write = write
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	428 if noread then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	429 noread = false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	430 _readlistlen = _readlistlen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	431 _readlist[ socket ] = _readlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	432 _readlist[ _readlistlen ] = socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	433 _readtimes[ handler ] = _currenttime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	434 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	435 if nosend then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	436 nosend = false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	437 write( "" )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	438 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	439 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	440 return noread, nosend
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	441 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	442 local _readbuffer = function( ) -- this function reads data
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	443 local buffer, err, part = receive( socket, pattern ) -- receive buffer with "pattern"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	444 if not err or ( err == "timeout" or err == "wantread" ) then -- received something
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	445 local buffer = buffer or part or ""
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	446 local len = string_len( buffer )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	447 if len > maxreadlen then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	448 disconnect( handler, "receive buffer exceeded" )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	449 handler.close( true )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	450 return false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	451 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	452 local count = len * STAT_UNIT
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	453 readtraffic = readtraffic + count
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	454 _readtraffic = _readtraffic + count
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	455 _readtimes[ handler ] = _currenttime
741 97577b6c07ca server.lua: Comment out unnecessary or very verbose logging, and log the rest as debug level Matthew Wild <mwild1@gmail.com> parents: 740 diff changeset	456 --out_put( "server.lua: read data '", buffer, "', error: ", err )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	457 return dispatch( handler, buffer, err )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	458 else -- connections was closed or fatal error
962 872f5d85636e net.server: Ensure some logging parameters are strings Matthew Wild <mwild1@gmail.com> parents: 885 diff changeset	459 out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " error: ", tostring(err) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	460 fatalerror = true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	461 disconnect( handler, err )
773 c36edc1934c5 net.server: Fix potential fatal error in server.lua Matthew Wild <mwild1@gmail.com> parents: 770 diff changeset	462 _ = handler and handler.close( )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	463 return false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	464 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	465 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	466 local _sendbuffer = function( ) -- this function sends data
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	467 local buffer = table_concat( bufferqueue, "", 1, bufferqueuelen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	468 local succ, err, byte = send( socket, buffer, 1, bufferlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	469 local count = ( succ or byte or 0 ) * STAT_UNIT
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	470 sendtraffic = sendtraffic + count
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	471 _sendtraffic = _sendtraffic + count
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	472 _ = _cleanqueue and clean( bufferqueue )
996 6fb96dffb2c1 net.server: Simple logging fix Matthew Wild <mwild1@gmail.com> parents: 994 diff changeset	473 --out_put( "server.lua: sended '", buffer, "', bytes: ", tostring(succ), ", error: ", tostring(err), ", part: ", tostring(byte), ", to: ", tostring(ip), ":", tostring(clientport) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	474 if succ then -- sending succesful
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	475 bufferqueuelen = 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	476 bufferlen = 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	477 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	478 _ = needtls and handler.starttls(true)
770 bddf52121908 Fix for nil handler error after close Matthew Wild <mwild1@gmail.com> parents: 741 diff changeset	479 _writetimes[ handler ] = nil
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	480 _ = toclose and handler.close( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	481 return true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	482 elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	483 buffer = string_sub( buffer, byte + 1, bufferlen ) -- new buffer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	484 bufferqueue[ 1 ] = buffer -- insert new buffer in queue
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	485 bufferqueuelen = 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	486 bufferlen = bufferlen - byte
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	487 _writetimes[ handler ] = _currenttime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	488 return true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	489 else -- connection was closed during sending or fatal error
962 872f5d85636e net.server: Ensure some logging parameters are strings Matthew Wild <mwild1@gmail.com> parents: 885 diff changeset	490 out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " error: ", tostring(err) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	491 fatalerror = true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	492 disconnect( handler, err )
815 cf8392613f46 net.server: Fix some more potential nil handler accesses Matthew Wild <mwild1@gmail.com> parents: 775 diff changeset	493 _ = handler and handler.close( )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	494 return false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	495 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	496 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	497
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	498 if sslctx then -- ssl?
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	499 ssl = true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	500 local wrote
846 77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	501 local read
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	502 local handshake = coroutine_wrap( function( client ) -- create handshake coroutine
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	503 local err
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	504 for i = 1, 10 do -- 10 handshake attemps
846 77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	505 _sendlistlen = ( wrote and removesocket( _sendlist, socket, _sendlistlen ) ) or _sendlistlen
77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	506 _readlistlen = ( read and removesocket( _readlist, socket, _readlistlen ) ) or _readlistlen
77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	507 read, wrote = nil, nil
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	508 _, err = client:dohandshake( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	509 if not err then
850 edbd0d1fce93 net.server: Don't retry if client closes socket during SSL handshaking Matthew Wild <mwild1@gmail.com> parents: 846 diff changeset	510 out_put( "server.lua: ssl handshake done" )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	511 handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	512 handler.sendbuffer = _sendbuffer
846 77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	513 -- return dispatch( handler )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	514 return true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	515 else
962 872f5d85636e net.server: Ensure some logging parameters are strings Matthew Wild <mwild1@gmail.com> parents: 885 diff changeset	516 out_put( "server.lua: error during ssl handshake: ", tostring(err) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	517 if err == "wantwrite" and not wrote then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	518 _sendlistlen = _sendlistlen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	519 _sendlist[ _sendlistlen ] = client
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	520 wrote = true
846 77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	521 elseif err == "wantread" and not read then
77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	522 _readlistlen = _readlistlen + 1
77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	523 _readlist [ _readlistlen ] = client
77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	524 read = true
850 edbd0d1fce93 net.server: Don't retry if client closes socket during SSL handshaking Matthew Wild <mwild1@gmail.com> parents: 846 diff changeset	525 else
edbd0d1fce93 net.server: Don't retry if client closes socket during SSL handshaking Matthew Wild <mwild1@gmail.com> parents: 846 diff changeset	526 break;
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	527 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	528 --coroutine_yield( handler, nil, err ) -- handshake not finished
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	529 coroutine_yield( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	530 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	531 end
850 edbd0d1fce93 net.server: Don't retry if client closes socket during SSL handshaking Matthew Wild <mwild1@gmail.com> parents: 846 diff changeset	532 disconnect( handler, "ssl handshake failed" )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	533 handler.close( true ) -- forced disconnect
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	534 return false -- handshake failed
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	535 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	536 )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	537 if startssl then -- ssl now?
741 97577b6c07ca server.lua: Comment out unnecessary or very verbose logging, and log the rest as debug level Matthew Wild <mwild1@gmail.com> parents: 740 diff changeset	538 --out_put("server.lua: ", "starting ssl handshake")
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	539 local err
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	540 socket, err = ssl_wrap( socket, sslctx ) -- wrap socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	541 if err then
962 872f5d85636e net.server: Ensure some logging parameters are strings Matthew Wild <mwild1@gmail.com> parents: 885 diff changeset	542 out_put( "server.lua: ssl error: ", tostring(err) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	543 mem_free( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	544 return nil, nil, err -- fatal error
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	545 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	546 socket:settimeout( 0 )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	547 handler.readbuffer = handshake
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	548 handler.sendbuffer = handshake
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	549 handshake( socket ) -- do handshake
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	550 else
1214 27d4cfb8fb7a net.server: A connection is not secure if we delay the TLS handshake Matthew Wild <mwild1@gmail.com> parents: 1100 diff changeset	551 -- We're not automatically doing SSL, so we're not secure (yet)
27d4cfb8fb7a net.server: A connection is not secure if we delay the TLS handshake Matthew Wild <mwild1@gmail.com> parents: 1100 diff changeset	552 ssl = false
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	553 handler.starttls = function( now )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	554 if not now then
741 97577b6c07ca server.lua: Comment out unnecessary or very verbose logging, and log the rest as debug level Matthew Wild <mwild1@gmail.com> parents: 740 diff changeset	555 --out_put "server.lua: we need to do tls, but delaying until later"
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	556 needtls = true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	557 return
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	558 end
741 97577b6c07ca server.lua: Comment out unnecessary or very verbose logging, and log the rest as debug level Matthew Wild <mwild1@gmail.com> parents: 740 diff changeset	559 --out_put( "server.lua: attempting to start tls on " .. tostring( socket ) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	560 local oldsocket, err = socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	561 socket, err = ssl_wrap( socket, sslctx ) -- wrap socket
741 97577b6c07ca server.lua: Comment out unnecessary or very verbose logging, and log the rest as debug level Matthew Wild <mwild1@gmail.com> parents: 740 diff changeset	562 --out_put( "server.lua: sslwrapped socket is " .. tostring( socket ) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	563 if err then
962 872f5d85636e net.server: Ensure some logging parameters are strings Matthew Wild <mwild1@gmail.com> parents: 885 diff changeset	564 out_put( "server.lua: error while starting tls on client: ", tostring(err) )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	565 return nil, err -- fatal error
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	566 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	567
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	568 socket:settimeout( 0 )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	569
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	570 -- add the new socket to our system
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	571
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	572 send = socket.send
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	573 receive = socket.receive
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	574 shutdown = id
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	575
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	576 _socketlist[ socket ] = handler
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	577 _readlistlen = _readlistlen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	578 _readlist[ _readlistlen ] = socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	579 _readlist[ socket ] = _readlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	580
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	581 -- remove traces of the old socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	582
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	583 _readlistlen = removesocket( _readlist, oldsocket, _readlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	584 _sendlistlen = removesocket( _sendlist, oldsocket, _sendlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	585 _socketlist[ oldsocket ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	586
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	587 handler.starttls = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	588 needtls = nil
1214 27d4cfb8fb7a net.server: A connection is not secure if we delay the TLS handshake Matthew Wild <mwild1@gmail.com> parents: 1100 diff changeset	589
27d4cfb8fb7a net.server: A connection is not secure if we delay the TLS handshake Matthew Wild <mwild1@gmail.com> parents: 1100 diff changeset	590 -- Secure now
27d4cfb8fb7a net.server: A connection is not secure if we delay the TLS handshake Matthew Wild <mwild1@gmail.com> parents: 1100 diff changeset	591 ssl = true
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	592
846 77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	593 handler.readbuffer = handshake
77244ba297ac net.server: Some fixes for SSL/TLS handshake handling Matthew Wild <mwild1@gmail.com> parents: 815 diff changeset	594 handler.sendbuffer = handshake
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	595 handshake( socket ) -- do handshake
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	596 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	597 handler.readbuffer = _readbuffer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	598 handler.sendbuffer = _sendbuffer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	599 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	600 else -- normal connection
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	601 ssl = false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	602 handler.readbuffer = _readbuffer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	603 handler.sendbuffer = _sendbuffer
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	604 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	605
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	606 send = socket.send
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	607 receive = socket.receive
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	608 shutdown = ( ssl and id ) or socket.shutdown
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	609
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	610 _socketlist[ socket ] = handler
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	611 _readlistlen = _readlistlen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	612 _readlist[ _readlistlen ] = socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	613 _readlist[ socket ] = _readlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	614
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	615 return handler, socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	616 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	617
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	618 id = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	619 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	620
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	621 idfalse = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	622 return false
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	623 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	624
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	625 removesocket = function( list, socket, len ) -- this function removes sockets from a list ( copied from copas )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	626 local pos = list[ socket ]
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	627 if pos then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	628 list[ socket ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	629 local last = list[ len ]
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	630 list[ len ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	631 if last ~= socket then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	632 list[ last ] = pos
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	633 list[ pos ] = last
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	634 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	635 return len - 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	636 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	637 return len
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	638 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	639
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	640 closesocket = function( socket )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	641 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	642 _readlistlen = removesocket( _readlist, socket, _readlistlen )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	643 _socketlist[ socket ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	644 socket:close( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	645 mem_free( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	646 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	647
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	648 ----------------------------------// PUBLIC //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	649
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	650 addserver = function( listeners, port, addr, pattern, sslctx, maxconnections, startssl ) -- this function provides a way for other scripts to reg a server
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	651 local err
741 97577b6c07ca server.lua: Comment out unnecessary or very verbose logging, and log the rest as debug level Matthew Wild <mwild1@gmail.com> parents: 740 diff changeset	652 --out_put("server.lua: autossl on ", port, " is ", startssl)
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	653 if type( listeners ) ~= "table" then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	654 err = "invalid listener table"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	655 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	656 if not type( port ) == "number" or not ( port >= 0 and port <= 65535 ) then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	657 err = "invalid port"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	658 elseif _server[ port ] then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	659 err = "listeners on port '" .. port .. "' already exist"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	660 elseif sslctx and not luasec then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	661 err = "luasec not found"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	662 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	663 if err then
1297 9c8f86a3878d net.server: Display server port in error messages Matthew Wild <mwild1@gmail.com> parents: 1214 diff changeset	664 out_error( "server.lua, port ", port, ": ", err )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	665 return nil, err
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	666 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	667 addr = addr or "*"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	668 local server, err = socket_bind( addr, port )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	669 if err then
1297 9c8f86a3878d net.server: Display server port in error messages Matthew Wild <mwild1@gmail.com> parents: 1214 diff changeset	670 out_error( "server.lua, port ", port, ": ", err )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	671 return nil, err
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	672 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	673 local handler, err = wrapserver( listeners, server, addr, port, pattern, sslctx, maxconnections, startssl ) -- wrap new server socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	674 if not handler then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	675 server:close( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	676 return nil, err
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	677 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	678 server:settimeout( 0 )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	679 _readlistlen = _readlistlen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	680 _readlist[ _readlistlen ] = server
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	681 _server[ port ] = handler
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	682 _socketlist[ server ] = handler
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	683 out_put( "server.lua: new server listener on '", addr, ":", port, "'" )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	684 return handler
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	685 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	686
1098 37ea264e133d net.server: Add getserver() method to find the server listening on the specified port Matthew Wild <mwild1@gmail.com> parents: 999 diff changeset	687 getserver = function ( port )
37ea264e133d net.server: Add getserver() method to find the server listening on the specified port Matthew Wild <mwild1@gmail.com> parents: 999 diff changeset	688 return _server[ port ];
37ea264e133d net.server: Add getserver() method to find the server listening on the specified port Matthew Wild <mwild1@gmail.com> parents: 999 diff changeset	689 end
37ea264e133d net.server: Add getserver() method to find the server listening on the specified port Matthew Wild <mwild1@gmail.com> parents: 999 diff changeset	690
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	691 removeserver = function( port )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	692 local handler = _server[ port ]
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	693 if not handler then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	694 return nil, "no server found on port '" .. tostring( port ) "'"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	695 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	696 handler.close( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	697 return true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	698 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	699
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	700 closeall = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	701 for _, handler in pairs( _socketlist ) do
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	702 handler.close( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	703 _socketlist[ _ ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	704 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	705 _readlistlen = 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	706 _sendlistlen = 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	707 _timerlistlen = 0
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	708 _server = { }
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	709 _readlist = { }
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	710 _sendlist = { }
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	711 _timerlist = { }
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	712 _socketlist = { }
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	713 mem_free( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	714 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	715
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	716 getsettings = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	717 return _selecttimeout, _sleeptime, _maxsendlen, _maxreadlen, _checkinterval, _sendtimeout, _readtimeout, _cleanqueue, _maxclientsperserver
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	718 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	719
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	720 changesettings = function( new )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	721 if type( new ) ~= "table" then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	722 return nil, "invalid settings table"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	723 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	724 _selecttimeout = tonumber( new.timeout ) or _selecttimeout
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	725 _sleeptime = tonumber( new.sleeptime ) or _sleeptime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	726 _maxsendlen = tonumber( new.maxsendlen ) or _maxsendlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	727 _maxreadlen = tonumber( new.maxreadlen ) or _maxreadlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	728 _checkinterval = tonumber( new.checkinterval ) or _checkinterval
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	729 _sendtimeout = tonumber( new.sendtimeout ) or _sendtimeout
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	730 _readtimeout = tonumber( new.readtimeout ) or _readtimeout
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	731 _cleanqueue = new.cleanqueue
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	732 _maxclientsperserver = new._maxclientsperserver or _maxclientsperserver
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	733 return true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	734 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	735
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	736 addtimer = function( listener )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	737 if type( listener ) ~= "function" then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	738 return nil, "invalid listener function"
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	739 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	740 _timerlistlen = _timerlistlen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	741 _timerlist[ _timerlistlen ] = listener
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	742 return true
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	743 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	744
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	745 stats = function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	746 return _readtraffic, _sendtraffic, _readlistlen, _sendlistlen, _timerlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	747 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	748
1098 37ea264e133d net.server: Add getserver() method to find the server listening on the specified port Matthew Wild <mwild1@gmail.com> parents: 999 diff changeset	749 local dontstop = true; -- thinking about tomorrow, ...
989 ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	750
ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	751 setquitting = function (quit)
ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	752 dontstop = not quit;
ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	753 return;
ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	754 end
ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	755
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	756 loop = function( ) -- this is the main loop of the program
989 ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	757 while dontstop do
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	758 local read, write, err = socket_select( _readlist, _sendlist, _selecttimeout )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	759 for i, socket in ipairs( write ) do -- send data waiting in writequeues
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	760 local handler = _socketlist[ socket ]
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	761 if handler then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	762 handler.sendbuffer( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	763 else
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	764 closesocket( socket )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	765 out_put "server.lua: found no handler and closed socket (writelist)" -- this should not happen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	766 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	767 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	768 for i, socket in ipairs( read ) do -- receive data
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	769 local handler = _socketlist[ socket ]
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	770 if handler then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	771 handler.readbuffer( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	772 else
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	773 closesocket( socket )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	774 out_put "server.lua: found no handler and closed socket (readlist)" -- this can happen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	775 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	776 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	777 for handler, err in pairs( _closelist ) do
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	778 handler.disconnect( )( handler, err )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	779 handler.close( true ) -- forced disconnect
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	780 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	781 clean( _closelist )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	782 _currenttime = os_time( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	783 if os_difftime( _currenttime - _timer ) >= 1 then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	784 for i = 1, _timerlistlen do
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	785 _timerlist[ i ]( ) -- fire timers
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	786 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	787 _timer = _currenttime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	788 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	789 socket_sleep( _sleeptime ) -- wait some time
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	790 --collectgarbage( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	791 end
989 ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	792 return "quitting"
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	793 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	794
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	795 --// EXPERIMENTAL //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	796
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	797 local wrapclient = function( socket, ip, serverport, listeners, pattern, sslctx, startssl )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	798 local handler = wrapconnection( nil, listeners, socket, ip, serverport, "clientport", pattern, sslctx, startssl )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	799 _socketlist[ socket ] = handler
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	800 _sendlistlen = _sendlistlen + 1
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	801 _sendlist[ _sendlistlen ] = socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	802 _sendlist[ socket ] = _sendlistlen
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	803 return handler, socket
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	804 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	805
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	806 local addclient = function( address, port, listeners, pattern, sslctx, startssl )
1035 8cc7e4452b2b net.server: Fix global access Matthew Wild <mwild1@gmail.com> parents: 999 diff changeset	807 local client, err = luasocket.tcp( )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	808 if err then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	809 return nil, err
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	810 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	811 client:settimeout( 0 )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	812 _, err = client:connect( address, port )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	813 if err then -- try again
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	814 local handler = wrapclient( client, address, port, listeners )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	815 else
1039 cc4280f45d0e net.server: Fix global access/incorrect parameter Matthew Wild <mwild1@gmail.com> parents: 1036 diff changeset	816 wrapconnection( nil, listeners, client, address, port, "clientport", pattern, sslctx, startssl )
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	817 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	818 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	819
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	820 --// EXPERIMENTAL //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	821
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	822 ----------------------------------// BEGIN //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	823
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	824 use "setmetatable" ( _socketlist, { __mode = "k" } )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	825 use "setmetatable" ( _readtimes, { __mode = "k" } )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	826 use "setmetatable" ( _writetimes, { __mode = "k" } )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	827
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	828 _timer = os_time( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	829 _starttime = os_time( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	830
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	831 addtimer( function( )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	832 local difftime = os_difftime( _currenttime - _starttime )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	833 if difftime > _checkinterval then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	834 _starttime = _currenttime
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	835 for handler, timestamp in pairs( _writetimes ) do
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	836 if os_difftime( _currenttime - timestamp ) > _sendtimeout then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	837 --_writetimes[ handler ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	838 handler.disconnect( )( handler, "send timeout" )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	839 handler.close( true ) -- forced disconnect
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	840 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	841 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	842 for handler, timestamp in pairs( _readtimes ) do
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	843 if os_difftime( _currenttime - timestamp ) > _readtimeout then
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	844 --_readtimes[ handler ] = nil
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	845 handler.disconnect( )( handler, "read timeout" )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	846 handler.close( ) -- forced disconnect?
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	847 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	848 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	849 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	850 end
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	851 )
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	852
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	853 ----------------------------------// PUBLIC INTERFACE //--
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	854
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	855 return {
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	856
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	857 addclient = addclient,
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	858 wrapclient = wrapclient,
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	859
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	860 loop = loop,
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	861 stats = stats,
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	862 closeall = closeall,
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	863 addtimer = addtimer,
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	864 addserver = addserver,
1098 37ea264e133d net.server: Add getserver() method to find the server listening on the specified port Matthew Wild <mwild1@gmail.com> parents: 999 diff changeset	865 getserver = getserver,
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	866 getsettings = getsettings,
989 ec239c044f31 net.server: Add server.setquitting() to gracefully quit the socket loop Matthew Wild <mwild1@gmail.com> parents: 962 diff changeset	867 setquitting = setquitting,
739 1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	868 removeserver = removeserver,
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	869 changesettings = changesettings,
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working Matthew Wild <mwild1@gmail.com> parents: 731 diff changeset	870 }

prosody

569d58d21612

net/server.lua

Software / code / prosody

Annotate

net/server.lua @ 1522:569d58d21612

Software `/` code `/` prosody