Software `/` code `/` prosody

Annotate

net/server_select.lua @ 7096:95e4c81291cc

server_select: Pause and mark server as full if accepting a client fails (fixes #597)

author	Kim Alvefur <zash@zash.se>
date	Fri, 22 Jan 2016 02:00:27 +0100
parent	7095:3e1dac35af87
child	7097:5a71aaa2c542

rev	line source
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	1 --
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	2 -- server.lua by blastbeat of the luadch project
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	3 -- Re-used here under the MIT/X Consortium License
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	4 --
2925 692b3c6c5bd2 Merge 0.6->0.7 Matthew Wild <mwild1@gmail.com> parents: 2923 2740 diff changeset	5 -- Modifications (C) 2008-2010 Matthew Wild, Waqas Hussain
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	6 --
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	7
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	8 -- // wrapping luadch stuff // --
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	9
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	10 local use = function( what )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	11 return _G[ what ]
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	12 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	13
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	14 local log, table_concat = require ("util.logger").init("socket"), table.concat;
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	15 local out_put = function (...) return log("debug", table_concat{...}); end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	16 local out_error = function (...) return log("warn", table_concat{...}); end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	17
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	18 ----------------------------------// DECLARATION //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	19
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	20 --// constants //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	21
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	22 local STAT_UNIT = 1 -- byte
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	23
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	24 --// lua functions //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	25
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	26 local type = use "type"
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	27 local pairs = use "pairs"
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	28 local ipairs = use "ipairs"
3685 63efe4eefa07 net.server_select: Made some globals local. Waqas Hussain <waqas20@gmail.com> parents: 3682 diff changeset	29 local tonumber = use "tonumber"
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	30 local tostring = use "tostring"
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	31
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	32 --// lua libs //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	33
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	34 local os = use "os"
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	35 local table = use "table"
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	36 local string = use "string"
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	37 local coroutine = use "coroutine"
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	38
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	39 --// lua lib methods //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	40
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	41 local os_difftime = os.difftime
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	42 local math_min = math.min
d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	43 local math_huge = math.huge
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	44 local table_concat = table.concat
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	45 local string_sub = string.sub
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	46 local coroutine_wrap = coroutine.wrap
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	47 local coroutine_yield = coroutine.yield
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	48
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	49 --// extern libs //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	50
2597 40a174e8cdf6 net.server_select: Fix traceback with no LuaSec available (thanks Nolan) Matthew Wild <mwild1@gmail.com> parents: 2582 diff changeset	51 local luasec = use "ssl"
40a174e8cdf6 net.server_select: Fix traceback with no LuaSec available (thanks Nolan) Matthew Wild <mwild1@gmail.com> parents: 2582 diff changeset	52 local luasocket = use "socket" or require "socket"
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	53 local luasocket_gettime = luasocket.gettime
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	54
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	55 --// extern lib methods //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	56
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	57 local ssl_wrap = ( luasec and luasec.wrap )
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	58 local socket_bind = luasocket.bind
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	59 local socket_sleep = luasocket.sleep
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	60 local socket_select = luasocket.select
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	61
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	62 --// functions //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	63
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	64 local id
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	65 local loop
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	66 local stats
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	67 local idfalse
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	68 local closeall
3686 27d3e2a2a248 net.server_select: Made another global local. Waqas Hussain <waqas20@gmail.com> parents: 3685 diff changeset	69 local addsocket
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	70 local addserver
5288 2777f34adbd3 net.server_select: Fix global access Kim Alvefur <zash@zash.se> parents: 5280 diff changeset	71 local addtimer
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	72 local getserver
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	73 local wrapserver
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	74 local getsettings
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	75 local closesocket
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	76 local removesocket
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	77 local removeserver
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	78 local wrapconnection
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	79 local changesettings
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	80
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	81 --// tables //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	82
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	83 local _server
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	84 local _readlist
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	85 local _timerlist
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	86 local _sendlist
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	87 local _socketlist
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	88 local _closelist
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	89 local _readtimes
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	90 local _writetimes
7094 e8f202856fc0 server_select: Keep track of which server listeners are full Kim Alvefur <zash@zash.se> parents: 6381 diff changeset	91 local _fullservers
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	92
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	93 --// simple data types //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	94
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	95 local _
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	96 local _readlistlen
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	97 local _sendlistlen
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	98 local _timerlistlen
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	99
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	100 local _sendtraffic
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	101 local _readtraffic
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	102
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	103 local _selecttimeout
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	104 local _sleeptime
5531 483f795f6f99 net.server: Allow the TCP backlog parameter to be set in the config Kim Alvefur <zash@zash.se>* parents: 5492 diff changeset	105 local _tcpbacklog
7095 3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	106 local _accepretry
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	107
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	108 local _starttime
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	109 local _currenttime
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	110
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	111 local _maxsendlen
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	112 local _maxreadlen
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	113
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	114 local _checkinterval
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	115 local _sendtimeout
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	116 local _readtimeout
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	117
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	118 local _timer
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	119
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	120 local _maxselectlen
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	121 local _maxfd
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	122
3685 63efe4eefa07 net.server_select: Made some globals local. Waqas Hussain <waqas20@gmail.com> parents: 3682 diff changeset	123 local _maxsslhandshake
63efe4eefa07 net.server_select: Made some globals local. Waqas Hussain <waqas20@gmail.com> parents: 3682 diff changeset	124
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	125 ----------------------------------// DEFINITION //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	126
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	127 _server = { } -- key = port, value = table; list of listening servers
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	128 _readlist = { } -- array with sockets to read from
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	129 _sendlist = { } -- arrary with sockets to write to
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	130 _timerlist = { } -- array of timer functions
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	131 _socketlist = { } -- key = socket, value = wrapped socket (handlers)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	132 _readtimes = { } -- key = handler, value = timestamp of last data reading
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	133 _writetimes = { } -- key = handler, value = timestamp of last data writing/sending
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	134 _closelist = { } -- handlers to close
7094 e8f202856fc0 server_select: Keep track of which server listeners are full Kim Alvefur <zash@zash.se> parents: 6381 diff changeset	135 _fullservers = { } -- servers in a paused state while there are too many clients
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	136
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	137 _readlistlen = 0 -- length of readlist
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	138 _sendlistlen = 0 -- length of sendlist
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	139 _timerlistlen = 0 -- lenght of timerlist
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	140
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	141 _sendtraffic = 0 -- some stats
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	142 _readtraffic = 0
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	143
3775 f3f2a7810108 net/server_select.lua: Reduce select() timeout back to 1s Matthew Wild <mwild1@gmail.com> parents: 3687 diff changeset	144 _selecttimeout = 1 -- timeout of socket.select
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	145 _sleeptime = 0 -- time to wait at the end of every loop
5531 483f795f6f99 net.server: Allow the TCP backlog parameter to be set in the config Kim Alvefur <zash@zash.se>* parents: 5492 diff changeset	146 _tcpbacklog = 128 -- some kind of hint to the OS
7095 3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	147 _accepretry = 10 -- seconds to wait until the next attempt of a full server to accept
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	148
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	149 _maxsendlen = 51000 * 1024 -- max len of send buffer
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	150 _maxreadlen = 25000 * 1024 -- max len of read buffer
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	151
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	152 _checkinterval = 1200000 -- interval in secs to check idle clients
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	153 _sendtimeout = 60000 -- allowed send idle time in secs
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	154 _readtimeout = 6 * 60 * 60 -- allowed read idle time in secs
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	155
5548 c5d1c35c93f4 net.server_select: Don't limit max file descriptor number on Windows. Waqas Hussain <waqas20@gmail.com> parents: 5531 diff changeset	156 local is_windows = package.config:sub(1,1) == "\\" -- check the directory separator, to detemine whether this is Windows
5642 5862bb57a3f1 net.server_select: Ensure _maxfd = math.huge on Windows, always. Waqas Hussain <waqas20@gmail.com> parents: 5548 diff changeset	157 _maxfd = (is_windows and math.huge) or luasocket._SETSIZE or 1024 -- max fd number, limit to 1024 by default to prevent glibc buffer overflow, but not on Windows
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	158 _maxselectlen = luasocket._SETSIZE or 1024 -- But this still applies on Windows
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	159
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	160 _maxsslhandshake = 30 -- max handshake round-trips
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	161
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	162 ----------------------------------// PRIVATE //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	163
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	164 wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx ) -- this function wraps a server -- FIXME Make sure FD < _maxfd
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	165
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	166 if socket:getfd() >= _maxfd then
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	167 out_error("server.lua: Disallowed FD number: "..socket:getfd())
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	168 socket:close()
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	169 return nil, "fd-too-large"
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	170 end
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	171
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	172 local connections = 0
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	173
4388 eded80beab58 net.server_select: Never call onincoming with nil data when a listener doesn't have an onconnect handler Matthew Wild <mwild1@gmail.com> parents: 4353 diff changeset	174 local dispatch, disconnect = listeners.onconnect, listeners.ondisconnect
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	175
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	176 local accept = socket.accept
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	177
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	178 --// public methods of the object //--
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	179
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	180 local handler = { }
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	181
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	182 handler.shutdown = function( ) end
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	183
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	184 handler.ssl = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	185 return sslctx ~= nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	186 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	187 handler.sslctx = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	188 return sslctx
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	189 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	190 handler.remove = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	191 connections = connections - 1
5280 1514a6147e85 net.server_select: Pause servers while they are full Kim Alvefur <zash@zash.se> parents: 5279 diff changeset	192 if handler then
1514a6147e85 net.server_select: Pause servers while they are full Kim Alvefur <zash@zash.se> parents: 5279 diff changeset	193 handler.resume( )
1514a6147e85 net.server_select: Pause servers while they are full Kim Alvefur <zash@zash.se> parents: 5279 diff changeset	194 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	195 end
4904 5d2ff4627b72 net.server_select: Don't close client connections when closing a server (it wasn't working anyway) Matthew Wild <mwild1@gmail.com> parents: 4903 diff changeset	196 handler.close = function()
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	197 socket:close( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	198 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	199 _readlistlen = removesocket( _readlist, socket, _readlistlen )
4675 80f2d952d4c5 net.server_select: Remove server from _server table when closing Matthew Wild <mwild1@gmail.com> parents: 4429 diff changeset	200 _server[ip..":"..serverport] = nil;
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	201 _socketlist[ socket ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	202 handler = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	203 socket = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	204 --mem_free( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	205 out_put "server.lua: closed server handler and removed sockets from list"
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	206 end
5330 0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	207 handler.pause = function( hard )
5279 e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	208 if not handler.paused then
e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	209 _readlistlen = removesocket( _readlist, socket, _readlistlen )
5330 0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	210 if hard then
0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	211 _socketlist[ socket ] = nil
0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	212 socket:close( )
0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	213 socket = nil;
0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	214 end
5279 e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	215 handler.paused = true;
e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	216 end
e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	217 end
5330 0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	218 handler.resume = function( )
5279 e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	219 if handler.paused then
5330 0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	220 if not socket then
5531 483f795f6f99 net.server: Allow the TCP backlog parameter to be set in the config Kim Alvefur <zash@zash.se>* parents: 5492 diff changeset	221 socket = socket_bind( ip, serverport, _tcpbacklog );
5330 0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	222 socket:settimeout( 0 )
0a0ca2eb991b net.server_select: Be less aggressive about server pause Kim Alvefur <zash@zash.se> parents: 5289 diff changeset	223 end
5279 e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	224 _readlistlen = addsocket(_readlist, socket, _readlistlen)
e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	225 _socketlist[ socket ] = handler
7094 e8f202856fc0 server_select: Keep track of which server listeners are full Kim Alvefur <zash@zash.se> parents: 6381 diff changeset	226 _fullservers[ handler ] = nil
5279 e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	227 handler.paused = false;
e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	228 end
e8f7962056f5 net.server_select: Add pause and resume methods Kim Alvefur <zash@zash.se> parents: 5197 diff changeset	229 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	230 handler.ip = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	231 return ip
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	232 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	233 handler.serverport = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	234 return serverport
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	235 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	236 handler.socket = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	237 return socket
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	238 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	239 handler.readbuffer = function( )
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	240 if _readlistlen >= _maxselectlen or _sendlistlen >= _maxselectlen then
5280 1514a6147e85 net.server_select: Pause servers while they are full Kim Alvefur <zash@zash.se> parents: 5279 diff changeset	241 handler.pause( )
7094 e8f202856fc0 server_select: Keep track of which server listeners are full Kim Alvefur <zash@zash.se> parents: 6381 diff changeset	242 _fullservers[ handler ] = _currenttime
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	243 out_put( "server.lua: refused new client connection: server full" )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	244 return false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	245 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	246 local client, err = accept( socket ) -- try to accept
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	247 if client then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	248 local ip, clientport = client:getpeername( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	249 local handler, client, err = wrapconnection( handler, listeners, client, ip, serverport, clientport, pattern, sslctx ) -- wrap new client socket
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	250 if err then -- error while wrapping ssl socket
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	251 return false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	252 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	253 connections = connections + 1
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	254 out_put( "server.lua: accepted new client connection from ", tostring(ip), ":", tostring(clientport), " to ", tostring(serverport))
5492 5d0cc5de5c51 net.server_select: Don't call onconnect twice for SSL connections Matthew Wild <mwild1@gmail.com> parents: 5491 diff changeset	255 if dispatch and not sslctx then -- SSL connections will notify onconnect when handshake completes
4388 eded80beab58 net.server_select: Never call onincoming with nil data when a listener doesn't have an onconnect handler Matthew Wild <mwild1@gmail.com> parents: 4353 diff changeset	256 return dispatch( handler );
eded80beab58 net.server_select: Never call onincoming with nil data when a listener doesn't have an onconnect handler Matthew Wild <mwild1@gmail.com> parents: 4353 diff changeset	257 end
eded80beab58 net.server_select: Never call onincoming with nil data when a listener doesn't have an onconnect handler Matthew Wild <mwild1@gmail.com> parents: 4353 diff changeset	258 return;
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	259 elseif err then -- maybe timeout or something else
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	260 out_put( "server.lua: error with new client connection: ", tostring(err) )
7096 95e4c81291cc server_select: Pause and mark server as full if accepting a client fails (fixes #597) Kim Alvefur <zash@zash.se> parents: 7095 diff changeset	261 handler.pause( )
95e4c81291cc server_select: Pause and mark server as full if accepting a client fails (fixes #597) Kim Alvefur <zash@zash.se> parents: 7095 diff changeset	262 _fullservers[ handler ] = _currenttime
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	263 return false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	264 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	265 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	266 return handler
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	267 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	268
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	269 wrapconnection = function( server, listeners, socket, ip, serverport, clientport, pattern, sslctx ) -- this function wraps a client to a handler object
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	270
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	271 if socket:getfd() >= _maxfd then
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	272 out_error("server.lua: Disallowed FD number: "..socket:getfd()) -- PROTIP: Switch to libevent
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	273 socket:close( ) -- Should we send some kind of error here?
5663 4e51ceee469c net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn) Kim Alvefur <zash@zash.se> parents: 5642 diff changeset	274 if server then
7094 e8f202856fc0 server_select: Keep track of which server listeners are full Kim Alvefur <zash@zash.se> parents: 6381 diff changeset	275 _fullservers[ server ] = _currenttime
5663 4e51ceee469c net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn) Kim Alvefur <zash@zash.se> parents: 5642 diff changeset	276 server.pause( )
4e51ceee469c net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn) Kim Alvefur <zash@zash.se> parents: 5642 diff changeset	277 end
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	278 return nil, nil, "fd-too-large"
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	279 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	280 socket:settimeout( 0 )
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	281
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	282 --// local import of socket methods //--
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	283
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	284 local send
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	285 local receive
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	286 local shutdown
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	287
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	288 --// private closures of the object //--
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	289
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	290 local ssl
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	291
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	292 local dispatch = listeners.onincoming
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	293 local status = listeners.onstatus
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	294 local disconnect = listeners.ondisconnect
3002 d1f864ed44c0 net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty Matthew Wild <mwild1@gmail.com> parents: 3001 diff changeset	295 local drain = listeners.ondrain
6381 9ffd582c65d8 net.server_select: 'listener'->'listeners' (fixes undefined global access) Matthew Wild <mwild1@gmail.com> parents: 6379 diff changeset	296 local detach = listeners.ondetach
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	297
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	298 local bufferqueue = { } -- buffer array
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	299 local bufferqueuelen = 0 -- end of buffer array
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	300
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	301 local toclose
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	302 local fatalerror
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	303 local needtls
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	304
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	305 local bufferlen = 0
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	306
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	307 local noread = false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	308 local nosend = false
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	309
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	310 local sendtraffic, readtraffic = 0, 0
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	311
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	312 local maxsendlen = _maxsendlen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	313 local maxreadlen = _maxreadlen
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	314
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	315 --// public methods of the object //--
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	316
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	317 local handler = bufferqueue -- saves a table ^_^
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	318
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	319 handler.dispatch = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	320 return dispatch
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	321 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	322 handler.disconnect = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	323 return disconnect
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	324 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	325 handler.setlistener = function( self, listeners )
6379 a280bd6ccce2 net.server_{select,event}: Add 'ondetach' callback for listener objects, to notify them when another listener is being assigned to a connection Matthew Wild <mwild1@gmail.com> parents: 6314 diff changeset	326 if detach then
a280bd6ccce2 net.server_{select,event}: Add 'ondetach' callback for listener objects, to notify them when another listener is being assigned to a connection Matthew Wild <mwild1@gmail.com> parents: 6314 diff changeset	327 detach(self) -- Notify listener that it is no longer responsible for this connection
a280bd6ccce2 net.server_{select,event}: Add 'ondetach' callback for listener objects, to notify them when another listener is being assigned to a connection Matthew Wild <mwild1@gmail.com> parents: 6314 diff changeset	328 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	329 dispatch = listeners.onincoming
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	330 disconnect = listeners.ondisconnect
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	331 status = listeners.onstatus
3002 d1f864ed44c0 net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty Matthew Wild <mwild1@gmail.com> parents: 3001 diff changeset	332 drain = listeners.ondrain
6379 a280bd6ccce2 net.server_{select,event}: Add 'ondetach' callback for listener objects, to notify them when another listener is being assigned to a connection Matthew Wild <mwild1@gmail.com> parents: 6314 diff changeset	333 detach = listeners.ondetach
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	334 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	335 handler.getstats = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	336 return readtraffic, sendtraffic
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	337 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	338 handler.ssl = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	339 return ssl
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	340 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	341 handler.sslctx = function ( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	342 return sslctx
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	343 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	344 handler.send = function( _, data, i, j )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	345 return send( socket, data, i, j )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	346 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	347 handler.receive = function( pattern, prefix )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	348 return receive( socket, pattern, prefix )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	349 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	350 handler.shutdown = function( pattern )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	351 return shutdown( socket, pattern )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	352 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	353 handler.setoption = function (self, option, value)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	354 if socket.setoption then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	355 return socket:setoption(option, value);
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	356 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	357 return false, "setoption not implemented";
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	358 end
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	359 handler.force_close = function ( self, err )
4962 1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	360 if bufferqueuelen ~= 0 then
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	361 out_put("server.lua: discarding unwritten data for ", tostring(ip), ":", tostring(clientport))
4962 1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	362 bufferqueuelen = 0;
1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	363 end
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	364 return self:close(err);
4962 1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	365 end
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	366 handler.close = function( self, err )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	367 if not handler then return true; end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	368 _readlistlen = removesocket( _readlist, socket, _readlistlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	369 _readtimes[ handler ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	370 if bufferqueuelen ~= 0 then
4962 1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	371 handler.sendbuffer() -- Try now to send any outstanding data
1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	372 if bufferqueuelen ~= 0 then -- Still not empty, so we'll try again later
1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	373 if handler then
1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	374 handler.write = nil -- ... but no further writing allowed
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	375 end
4962 1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	376 toclose = true
1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	377 return false
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	378 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	379 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	380 if socket then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	381 _ = shutdown and shutdown( socket )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	382 socket:close( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	383 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	384 _socketlist[ socket ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	385 socket = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	386 else
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	387 out_put "server.lua: socket already closed"
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	388 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	389 if handler then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	390 _writetimes[ handler ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	391 _closelist[ handler ] = nil
4903 c576d2175fa4 net.server_select: Call ondisconnect handler, even if we closed the socket ourselves (fixes HTTP session hoarding, thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4888 diff changeset	392 local _handler = handler;
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	393 handler = nil
4903 c576d2175fa4 net.server_select: Call ondisconnect handler, even if we closed the socket ourselves (fixes HTTP session hoarding, thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4888 diff changeset	394 if disconnect then
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	395 disconnect(_handler, err or false);
2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	396 disconnect = nil
4903 c576d2175fa4 net.server_select: Call ondisconnect handler, even if we closed the socket ourselves (fixes HTTP session hoarding, thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4888 diff changeset	397 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	398 end
3310 ddcab5be2a5e net.server_select: Fix a snippet of code that was living at the wrong indentation level Matthew Wild <mwild1@gmail.com> parents: 3008 diff changeset	399 if server then
ddcab5be2a5e net.server_select: Fix a snippet of code that was living at the wrong indentation level Matthew Wild <mwild1@gmail.com> parents: 3008 diff changeset	400 server.remove( )
ddcab5be2a5e net.server_select: Fix a snippet of code that was living at the wrong indentation level Matthew Wild <mwild1@gmail.com> parents: 3008 diff changeset	401 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	402 out_put "server.lua: closed client handler and removed socket from list"
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	403 return true
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	404 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	405 handler.ip = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	406 return ip
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	407 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	408 handler.serverport = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	409 return serverport
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	410 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	411 handler.clientport = function( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	412 return clientport
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	413 end
6047 4db0403bfc0d net.server_{select,event}: Add compat code for supporting the same client port API on connections Kim Alvefur <zash@zash.se> parents: 5949 diff changeset	414 handler.port = handler.clientport -- COMPAT server_event
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	415 local write = function( self, data )
5337 c22dd451487f net.server_select: Use # operator instead of string.len Kim Alvefur <zash@zash.se> parents: 5331 diff changeset	416 bufferlen = bufferlen + #data
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	417 if bufferlen > maxsendlen then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	418 _closelist[ handler ] = "send buffer exceeded" -- cannot close the client at the moment, have to wait to the end of the cycle
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	419 handler.write = idfalse -- dont write anymore
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	420 return false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	421 elseif socket and not _sendlist[ socket ] then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	422 _sendlistlen = addsocket(_sendlist, socket, _sendlistlen)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	423 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	424 bufferqueuelen = bufferqueuelen + 1
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	425 bufferqueue[ bufferqueuelen ] = data
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	426 if handler then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	427 _writetimes[ handler ] = _writetimes[ handler ] or _currenttime
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	428 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	429 return true
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	430 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	431 handler.write = write
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	432 handler.bufferqueue = function( self )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	433 return bufferqueue
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	434 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	435 handler.socket = function( self )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	436 return socket
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	437 end
3001 fa00c6f563b4 net.server_select, net.server_event: Rename :pattern() method to :set_mode() for select backend, and add :set_mode() to event backend Matthew Wild <mwild1@gmail.com> parents: 3000 diff changeset	438 handler.set_mode = function( self, new )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	439 pattern = new or pattern
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	440 return pattern
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	441 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	442 handler.set_send = function ( self, newsend )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	443 send = newsend or send
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	444 return send
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	445 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	446 handler.bufferlen = function( self, readlen, sendlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	447 maxsendlen = sendlen or maxsendlen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	448 maxreadlen = readlen or maxreadlen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	449 return bufferlen, maxreadlen, maxsendlen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	450 end
3000 43a4cb707fe4 net.server_select, net.server_event: Support for :pause() and :resume() on connections Matthew Wild <mwild1@gmail.com> parents: 2970 diff changeset	451 --TODO: Deprecate
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	452 handler.lock_read = function (self, switch)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	453 if switch == true then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	454 local tmp = _readlistlen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	455 _readlistlen = removesocket( _readlist, socket, _readlistlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	456 _readtimes[ handler ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	457 if _readlistlen ~= tmp then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	458 noread = true
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	459 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	460 elseif switch == false then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	461 if noread then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	462 noread = false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	463 _readlistlen = addsocket(_readlist, socket, _readlistlen)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	464 _readtimes[ handler ] = _currenttime
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	465 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	466 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	467 return noread
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	468 end
3000 43a4cb707fe4 net.server_select, net.server_event: Support for :pause() and :resume() on connections Matthew Wild <mwild1@gmail.com> parents: 2970 diff changeset	469 handler.pause = function (self)
43a4cb707fe4 net.server_select, net.server_event: Support for :pause() and :resume() on connections Matthew Wild <mwild1@gmail.com> parents: 2970 diff changeset	470 return self:lock_read(true);
43a4cb707fe4 net.server_select, net.server_event: Support for :pause() and :resume() on connections Matthew Wild <mwild1@gmail.com> parents: 2970 diff changeset	471 end
43a4cb707fe4 net.server_select, net.server_event: Support for :pause() and :resume() on connections Matthew Wild <mwild1@gmail.com> parents: 2970 diff changeset	472 handler.resume = function (self)
43a4cb707fe4 net.server_select, net.server_event: Support for :pause() and :resume() on connections Matthew Wild <mwild1@gmail.com> parents: 2970 diff changeset	473 return self:lock_read(false);
43a4cb707fe4 net.server_select, net.server_event: Support for :pause() and :resume() on connections Matthew Wild <mwild1@gmail.com> parents: 2970 diff changeset	474 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	475 handler.lock = function( self, switch )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	476 handler.lock_read (switch)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	477 if switch == true then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	478 handler.write = idfalse
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	479 local tmp = _sendlistlen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	480 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	481 _writetimes[ handler ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	482 if _sendlistlen ~= tmp then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	483 nosend = true
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	484 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	485 elseif switch == false then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	486 handler.write = write
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	487 if nosend then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	488 nosend = false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	489 write( "" )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	490 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	491 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	492 return noread, nosend
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	493 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	494 local _readbuffer = function( ) -- this function reads data
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	495 local buffer, err, part = receive( socket, pattern ) -- receive buffer with "pattern"
3002 d1f864ed44c0 net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty Matthew Wild <mwild1@gmail.com> parents: 3001 diff changeset	496 if not err or (err == "wantread" or err == "timeout") then -- received something
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	497 local buffer = buffer or part or ""
5337 c22dd451487f net.server_select: Use # operator instead of string.len Kim Alvefur <zash@zash.se> parents: 5331 diff changeset	498 local len = #buffer
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	499 if len > maxreadlen then
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	500 handler:close( "receive buffer exceeded" )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	501 return false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	502 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	503 local count = len * STAT_UNIT
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	504 readtraffic = readtraffic + count
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	505 _readtraffic = _readtraffic + count
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	506 _readtimes[ handler ] = _currenttime
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	507 --out_put( "server.lua: read data '", buffer:gsub("[^%w%p ]", "."), "', error: ", err )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	508 return dispatch( handler, buffer, err )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	509 else -- connections was closed or fatal error
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	510 out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " read error: ", tostring(err) )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	511 fatalerror = true
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	512 _ = handler and handler:force_close( err )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	513 return false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	514 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	515 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	516 local _sendbuffer = function( ) -- this function sends data
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	517 local succ, err, byte, buffer, count;
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	518 if socket then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	519 buffer = table_concat( bufferqueue, "", 1, bufferqueuelen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	520 succ, err, byte = send( socket, buffer, 1, bufferlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	521 count = ( succ or byte or 0 ) * STAT_UNIT
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	522 sendtraffic = sendtraffic + count
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	523 _sendtraffic = _sendtraffic + count
5338 3df649ec43ea net.server_select: Optimization, clean bufferqueue when it makes sense. Kim Alvefur <zash@zash.se> parents: 5337 diff changeset	524 for i = bufferqueuelen,1,-1 do
3df649ec43ea net.server_select: Optimization, clean bufferqueue when it makes sense. Kim Alvefur <zash@zash.se> parents: 5337 diff changeset	525 bufferqueue[ i ] = nil
3df649ec43ea net.server_select: Optimization, clean bufferqueue when it makes sense. Kim Alvefur <zash@zash.se> parents: 5337 diff changeset	526 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	527 --out_put( "server.lua: sended '", buffer, "', bytes: ", tostring(succ), ", error: ", tostring(err), ", part: ", tostring(byte), ", to: ", tostring(ip), ":", tostring(clientport) )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	528 else
4962 1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	529 succ, err, count = false, "unexpected close", 0;
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	530 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	531 if succ then -- sending succesful
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	532 bufferqueuelen = 0
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	533 bufferlen = 0
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	534 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	535 _writetimes[ handler ] = nil
3002 d1f864ed44c0 net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty Matthew Wild <mwild1@gmail.com> parents: 3001 diff changeset	536 if drain then
d1f864ed44c0 net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty Matthew Wild <mwild1@gmail.com> parents: 3001 diff changeset	537 drain(handler)
d1f864ed44c0 net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty Matthew Wild <mwild1@gmail.com> parents: 3001 diff changeset	538 end
3398 abc4a52aef02 net.server_select: Remove 'now' parameter from starttls(), and base it on whether the sendbuffer is empty instead Matthew Wild <mwild1@gmail.com> parents: 3382 diff changeset	539 _ = needtls and handler:starttls(nil)
4962 1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	540 _ = toclose and handler:force_close( )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	541 return true
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	542 elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	543 buffer = string_sub( buffer, byte + 1, bufferlen ) -- new buffer
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	544 bufferqueue[ 1 ] = buffer -- insert new buffer in queue
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	545 bufferqueuelen = 1
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	546 bufferlen = bufferlen - byte
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	547 _writetimes[ handler ] = _currenttime
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	548 return true
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	549 else -- connection was closed during sending or fatal error
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	550 out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " write error: ", tostring(err) )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	551 fatalerror = true
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	552 _ = handler and handler:force_close( err )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	553 return false
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	554 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	555 end
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	556
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	557 -- Set the sslctx
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	558 local handshake;
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	559 function handler.set_sslctx(self, new_sslctx)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	560 sslctx = new_sslctx;
4347 4b5290dd4e58 net.server_select: Small fix to SSL handshake logic, read/wrote were being checked despite it not being possible for them to be other than nil Matthew Wild <mwild1@gmail.com> parents: 4346 diff changeset	561 local read, wrote
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	562 handshake = coroutine_wrap( function( client ) -- create handshake coroutine
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	563 local err
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	564 for i = 1, _maxsslhandshake do
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	565 _sendlistlen = ( wrote and removesocket( _sendlist, client, _sendlistlen ) ) or _sendlistlen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	566 _readlistlen = ( read and removesocket( _readlist, client, _readlistlen ) ) or _readlistlen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	567 read, wrote = nil, nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	568 _, err = client:dohandshake( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	569 if not err then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	570 out_put( "server.lua: ssl handshake done" )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	571 handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	572 handler.sendbuffer = _sendbuffer
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	573 _ = status and status( handler, "ssl-handshake-complete" )
5490 ab821566ede8 Backed out changeset f2631a14b953 Matthew Wild <mwild1@gmail.com> parents: 5482 diff changeset	574 if self.autostart_ssl and listeners.onconnect then
ab821566ede8 Backed out changeset f2631a14b953 Matthew Wild <mwild1@gmail.com> parents: 5482 diff changeset	575 listeners.onconnect(self);
ab821566ede8 Backed out changeset f2631a14b953 Matthew Wild <mwild1@gmail.com> parents: 5482 diff changeset	576 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	577 _readlistlen = addsocket(_readlist, client, _readlistlen)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	578 return true
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	579 else
4347 4b5290dd4e58 net.server_select: Small fix to SSL handshake logic, read/wrote were being checked despite it not being possible for them to be other than nil Matthew Wild <mwild1@gmail.com> parents: 4346 diff changeset	580 if err == "wantwrite" then
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	581 _sendlistlen = addsocket(_sendlist, client, _sendlistlen)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	582 wrote = true
4347 4b5290dd4e58 net.server_select: Small fix to SSL handshake logic, read/wrote were being checked despite it not being possible for them to be other than nil Matthew Wild <mwild1@gmail.com> parents: 4346 diff changeset	583 elseif err == "wantread" then
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	584 _readlistlen = addsocket(_readlist, client, _readlistlen)
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	585 read = true
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	586 else
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	587 break;
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	588 end
4348 5b240c6b5334 net.server_select: Update error logging logic during SSL handshake (now shows correctly when a handshake exceeded max. allowed iterations) Matthew Wild <mwild1@gmail.com> parents: 4347 diff changeset	589 err = nil;
5b240c6b5334 net.server_select: Update error logging logic during SSL handshake (now shows correctly when a handshake exceeded max. allowed iterations) Matthew Wild <mwild1@gmail.com> parents: 4347 diff changeset	590 coroutine_yield( ) -- handshake not finished
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	591 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	592 end
4348 5b240c6b5334 net.server_select: Update error logging logic during SSL handshake (now shows correctly when a handshake exceeded max. allowed iterations) Matthew Wild <mwild1@gmail.com> parents: 4347 diff changeset	593 out_put( "server.lua: ssl handshake error: ", tostring(err or "handshake too long") )
4980 2e35cfe11835 net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic. Matthew Wild <mwild1@gmail.com> parents: 4962 diff changeset	594 _ = handler and handler:force_close("ssl handshake failed")
5484 17ce73907c48 net.server_select: Normalize indentation Kim Alvefur <zash@zash.se> parents: 5482 diff changeset	595 return false, err -- handshake failed
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	596 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	597 )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	598 end
2582 d6afb6d919df net.server_select: Only allow starttls if luasec is available (thanks Nolan) Matthew Wild <mwild1@gmail.com> parents: 2581 diff changeset	599 if luasec then
4349 16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	600 handler.starttls = function( self, _sslctx)
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	601 if _sslctx then
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	602 handler:set_sslctx(_sslctx);
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	603 end
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	604 if bufferqueuelen > 0 then
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	605 out_put "server.lua: we need to do tls, but delaying until send buffer empty"
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	606 needtls = true
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	607 return
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	608 end
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	609 out_put( "server.lua: attempting to start tls on " .. tostring( socket ) )
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	610 local oldsocket, err = socket
2582 d6afb6d919df net.server_select: Only allow starttls if luasec is available (thanks Nolan) Matthew Wild <mwild1@gmail.com> parents: 2581 diff changeset	611 socket, err = ssl_wrap( socket, sslctx ) -- wrap socket
4349 16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	612 if not socket then
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	613 out_put( "server.lua: error while starting tls on client: ", tostring(err or "unknown error") )
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	614 return nil, err -- fatal error
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	615 end
4349 16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	616
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	617 socket:settimeout( 0 )
4349 16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	618
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	619 -- add the new socket to our system
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	620 send = socket.send
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	621 receive = socket.receive
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	622 shutdown = id
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	623 _socketlist[ socket ] = handler
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	624 _readlistlen = addsocket(_readlist, socket, _readlistlen)
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	625
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	626 -- remove traces of the old socket
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	627 _readlistlen = removesocket( _readlist, oldsocket, _readlistlen )
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	628 _sendlistlen = removesocket( _sendlist, oldsocket, _sendlistlen )
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	629 _socketlist[ oldsocket ] = nil
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	630
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	631 handler.starttls = nil
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	632 needtls = nil
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	633
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	634 -- Secure now (if handshake fails connection will close)
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	635 ssl = true
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	636
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	637 handler.readbuffer = handshake
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	638 handler.sendbuffer = handshake
5484 17ce73907c48 net.server_select: Normalize indentation Kim Alvefur <zash@zash.se> parents: 5482 diff changeset	639 return handshake( socket ) -- do handshake
4349 16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	640 end
4429 8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	641 end
2582 d6afb6d919df net.server_select: Only allow starttls if luasec is available (thanks Nolan) Matthew Wild <mwild1@gmail.com> parents: 2581 diff changeset	642
4429 8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	643 handler.readbuffer = _readbuffer
8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	644 handler.sendbuffer = _sendbuffer
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	645 send = socket.send
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	646 receive = socket.receive
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	647 shutdown = ( ssl and id ) or socket.shutdown
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	648
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	649 _socketlist[ socket ] = handler
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	650 _readlistlen = addsocket(_readlist, socket, _readlistlen)
4429 8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	651
8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	652 if sslctx and luasec then
8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	653 out_put "server.lua: auto-starting ssl negotiation..."
8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	654 handler.autostart_ssl = true;
5484 17ce73907c48 net.server_select: Normalize indentation Kim Alvefur <zash@zash.se> parents: 5482 diff changeset	655 local ok, err = handler:starttls(sslctx);
17ce73907c48 net.server_select: Normalize indentation Kim Alvefur <zash@zash.se> parents: 5482 diff changeset	656 if ok == false then
17ce73907c48 net.server_select: Normalize indentation Kim Alvefur <zash@zash.se> parents: 5482 diff changeset	657 return nil, nil, err
17ce73907c48 net.server_select: Normalize indentation Kim Alvefur <zash@zash.se> parents: 5482 diff changeset	658 end
4429 8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	659 end
8e02ba75ef06 net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) Matthew Wild <mwild1@gmail.com> parents: 4399 diff changeset	660
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	661 return handler, socket
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	662 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	663
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	664 id = function( )
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	665 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	666
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	667 idfalse = function( )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	668 return false
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	669 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	670
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	671 addsocket = function( list, socket, len )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	672 if not list[ socket ] then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	673 len = len + 1
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	674 list[ len ] = socket
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	675 list[ socket ] = len
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	676 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	677 return len;
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	678 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	679
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	680 removesocket = function( list, socket, len ) -- this function removes sockets from a list ( copied from copas )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	681 local pos = list[ socket ]
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	682 if pos then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	683 list[ socket ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	684 local last = list[ len ]
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	685 list[ len ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	686 if last ~= socket then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	687 list[ last ] = pos
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	688 list[ pos ] = last
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	689 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	690 return len - 1
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	691 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	692 return len
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	693 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	694
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	695 closesocket = function( socket )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	696 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	697 _readlistlen = removesocket( _readlist, socket, _readlistlen )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	698 _socketlist[ socket ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	699 socket:close( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	700 --mem_free( )
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	701 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	702
3003 48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	703 local function link(sender, receiver, buffersize)
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	704 local sender_locked;
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	705 local _sendbuffer = receiver.sendbuffer;
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	706 function receiver.sendbuffer()
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	707 _sendbuffer();
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	708 if sender_locked and receiver.bufferlen() < buffersize then
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	709 sender:lock_read(false); -- Unlock now
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	710 sender_locked = nil;
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	711 end
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	712 end
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	713
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	714 local _readbuffer = sender.readbuffer;
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	715 function sender.readbuffer()
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	716 _readbuffer();
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	717 if not sender_locked and receiver.bufferlen() >= buffersize then
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	718 sender_locked = true;
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	719 sender:lock_read(true);
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	720 end
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	721 end
6314 8029b8a5f37a net.server_select/event: Switch sender mode to a when reading, to make sure we get all available data Matthew Wild <mwild1@gmail.com>* parents: 6047 diff changeset	722 sender:set_mode("*a");
3003 48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	723 end
48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	724
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	725 ----------------------------------// PUBLIC //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	726
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	727 addserver = function( addr, port, listeners, pattern, sslctx ) -- this function provides a way for other scripts to reg a server
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	728 local err
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	729 if type( listeners ) ~= "table" then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	730 err = "invalid listener table"
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	731 end
2968 fdd049a4e551 Merge 0.6->0.7 Matthew Wild <mwild1@gmail.com> parents: 2967 2925 diff changeset	732 if type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	733 err = "invalid port"
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	734 elseif _server[ addr..":"..port ] then
aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	735 err = "listeners on '[" .. addr .. "]:" .. port .. "' already exist"
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	736 elseif sslctx and not luasec then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	737 err = "luasec not found"
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	738 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	739 if err then
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	740 out_error( "server.lua, [", addr, "]:", port, ": ", err )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	741 return nil, err
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	742 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	743 addr = addr or "*"
5531 483f795f6f99 net.server: Allow the TCP backlog parameter to be set in the config Kim Alvefur <zash@zash.se>* parents: 5492 diff changeset	744 local server, err = socket_bind( addr, port, _tcpbacklog )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	745 if err then
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	746 out_error( "server.lua, [", addr, "]:", port, ": ", err )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	747 return nil, err
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	748 end
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	749 local handler, err = wrapserver( listeners, server, addr, port, pattern, sslctx ) -- wrap new server socket
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	750 if not handler then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	751 server:close( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	752 return nil, err
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	753 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	754 server:settimeout( 0 )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	755 _readlistlen = addsocket(_readlist, server, _readlistlen)
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	756 _server[ addr..":"..port ] = handler
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	757 _socketlist[ server ] = handler
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	758 out_put( "server.lua: new "..(sslctx and "ssl " or "").."server listener on '[", addr, "]:", port, "'" )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	759 return handler
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	760 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	761
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	762 getserver = function ( addr, port )
aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	763 return _server[ addr..":"..port ];
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	764 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	765
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	766 removeserver = function( addr, port )
aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	767 local handler = _server[ addr..":"..port ]
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	768 if not handler then
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	769 return nil, "no server found on '[" .. addr .. "]:" .. tostring( port ) .. "'"
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	770 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	771 handler:close( )
4322 aff627b1ce95 connlistener, server_select, prosody: Add support for binding to multiple addresses Florian Zeitz <florob@babelmonkeys.de> parents: 4145 diff changeset	772 _server[ addr..":"..port ] = nil
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	773 return true
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	774 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	775
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	776 closeall = function( )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	777 for _, handler in pairs( _socketlist ) do
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	778 handler:close( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	779 _socketlist[ _ ] = nil
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	780 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	781 _readlistlen = 0
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	782 _sendlistlen = 0
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	783 _timerlistlen = 0
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	784 _server = { }
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	785 _readlist = { }
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	786 _sendlist = { }
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	787 _timerlist = { }
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	788 _socketlist = { }
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	789 --mem_free( )
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	790 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	791
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	792 getsettings = function( )
5385 d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	793 return {
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	794 select_timeout = _selecttimeout;
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	795 select_sleep_time = _sleeptime;
5531 483f795f6f99 net.server: Allow the TCP backlog parameter to be set in the config Kim Alvefur <zash@zash.se>* parents: 5492 diff changeset	796 tcp_backlog = _tcpbacklog;
5385 d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	797 max_send_buffer_size = _maxsendlen;
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	798 max_receive_buffer_size = _maxreadlen;
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	799 select_idle_check_interval = _checkinterval;
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	800 send_timeout = _sendtimeout;
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	801 read_timeout = _readtimeout;
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	802 max_connections = _maxselectlen;
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	803 max_ssl_handshake_roundtrips = _maxsslhandshake;
d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	804 highest_allowed_fd = _maxfd;
7095 3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	805 accept_retry_interval = _accepretry;
5385 d663483036db net.server, _select: Reorganise configuration of server_select to be more like server_event Kim Alvefur <zash@zash.se> parents: 5338 diff changeset	806 }
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	807 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	808
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	809 changesettings = function( new )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	810 if type( new ) ~= "table" then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	811 return nil, "invalid settings table"
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	812 end
5197 beffe931b3b6 net.server_select: Better names for config options (thanks MattJ) Kim Alvefur <zash@zash.se> parents: 4983 diff changeset	813 _selecttimeout = tonumber( new.select_timeout ) or _selecttimeout
beffe931b3b6 net.server_select: Better names for config options (thanks MattJ) Kim Alvefur <zash@zash.se> parents: 4983 diff changeset	814 _sleeptime = tonumber( new.select_sleep_time ) or _sleeptime
beffe931b3b6 net.server_select: Better names for config options (thanks MattJ) Kim Alvefur <zash@zash.se> parents: 4983 diff changeset	815 _maxsendlen = tonumber( new.max_send_buffer_size ) or _maxsendlen
beffe931b3b6 net.server_select: Better names for config options (thanks MattJ) Kim Alvefur <zash@zash.se> parents: 4983 diff changeset	816 _maxreadlen = tonumber( new.max_receive_buffer_size ) or _maxreadlen
beffe931b3b6 net.server_select: Better names for config options (thanks MattJ) Kim Alvefur <zash@zash.se> parents: 4983 diff changeset	817 _checkinterval = tonumber( new.select_idle_check_interval ) or _checkinterval
5531 483f795f6f99 net.server: Allow the TCP backlog parameter to be set in the config Kim Alvefur <zash@zash.se>* parents: 5492 diff changeset	818 _tcpbacklog = tonumber( new.tcp_backlog ) or _tcpbacklog
5197 beffe931b3b6 net.server_select: Better names for config options (thanks MattJ) Kim Alvefur <zash@zash.se> parents: 4983 diff changeset	819 _sendtimeout = tonumber( new.send_timeout ) or _sendtimeout
beffe931b3b6 net.server_select: Better names for config options (thanks MattJ) Kim Alvefur <zash@zash.se> parents: 4983 diff changeset	820 _readtimeout = tonumber( new.read_timeout ) or _readtimeout
7095 3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	821 _accepretry = tonumber( new.accept_retry_interval ) or _accepretry
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	822 _maxselectlen = new.max_connections or _maxselectlen
5197 beffe931b3b6 net.server_select: Better names for config options (thanks MattJ) Kim Alvefur <zash@zash.se> parents: 4983 diff changeset	823 _maxsslhandshake = new.max_ssl_handshake_roundtrips or _maxsslhandshake
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	824 _maxfd = new.highest_allowed_fd or _maxfd
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	825 return true
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	826 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	827
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	828 addtimer = function( listener )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	829 if type( listener ) ~= "function" then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	830 return nil, "invalid listener function"
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	831 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	832 _timerlistlen = _timerlistlen + 1
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	833 _timerlist[ _timerlistlen ] = listener
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	834 return true
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	835 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	836
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	837 stats = function( )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	838 return _readtraffic, _sendtraffic, _readlistlen, _sendlistlen, _timerlistlen
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	839 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	840
3491 e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	841 local quitting;
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	842
4399 1b4161970842 net.server_event, net.server_select: Fixed some global pollution. Waqas Hussain <waqas20@gmail.com> parents: 4393 diff changeset	843 local function setquitting(quit)
3491 e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	844 quitting = not not quit;
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	845 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	846
3491 e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	847 loop = function(once) -- this is the main loop of the program
e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	848 if quitting then return "quitting"; end
e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	849 if once then quitting = "once"; end
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	850 local next_timer_time = math_huge;
3491 e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	851 repeat
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	852 local read, write, err = socket_select( _readlist, _sendlist, math_min(_selecttimeout, next_timer_time) )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	853 for i, socket in ipairs( write ) do -- send data waiting in writequeues
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	854 local handler = _socketlist[ socket ]
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	855 if handler then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	856 handler.sendbuffer( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	857 else
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	858 closesocket( socket )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	859 out_put "server.lua: found no handler and closed socket (writelist)" -- this should not happen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	860 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	861 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	862 for i, socket in ipairs( read ) do -- receive data
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	863 local handler = _socketlist[ socket ]
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	864 if handler then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	865 handler.readbuffer( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	866 else
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	867 closesocket( socket )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	868 out_put "server.lua: found no handler and closed socket (readlist)" -- this can happen
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	869 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	870 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	871 for handler, err in pairs( _closelist ) do
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	872 handler.disconnect( )( handler, err )
4962 1d8fb12a9b2d net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed) Matthew Wild <mwild1@gmail.com> parents: 4904 diff changeset	873 handler:force_close() -- forced disconnect
5338 3df649ec43ea net.server_select: Optimization, clean bufferqueue when it makes sense. Kim Alvefur <zash@zash.se> parents: 5337 diff changeset	874 _closelist[ handler ] = nil;
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	875 end
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	876 _currenttime = luasocket_gettime( )
5485 5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	877
5486 bcf27dbef6c6 net.server_select: Add and improve some comments. Waqas Hussain <waqas20@gmail.com> parents: 5485 diff changeset	878 -- Check for socket timeouts
5485 5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	879 local difftime = os_difftime( _currenttime - _starttime )
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	880 if difftime > _checkinterval then
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	881 _starttime = _currenttime
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	882 for handler, timestamp in pairs( _writetimes ) do
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	883 if os_difftime( _currenttime - timestamp ) > _sendtimeout then
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	884 --_writetimes[ handler ] = nil
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	885 handler.disconnect( )( handler, "send timeout" )
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	886 handler:force_close() -- forced disconnect
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	887 end
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	888 end
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	889 for handler, timestamp in pairs( _readtimes ) do
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	890 if os_difftime( _currenttime - timestamp ) > _readtimeout then
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	891 --_readtimes[ handler ] = nil
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	892 handler.disconnect( )( handler, "read timeout" )
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	893 handler:close( ) -- forced disconnect?
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	894 end
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	895 end
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	896 end
5147eed0a42e net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer). Waqas Hussain <waqas20@gmail.com> parents: 5484 diff changeset	897
5486 bcf27dbef6c6 net.server_select: Add and improve some comments. Waqas Hussain <waqas20@gmail.com> parents: 5485 diff changeset	898 -- Fire timers
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	899 if _currenttime - _timer >= math_min(next_timer_time, 1) then
d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	900 next_timer_time = math_huge;
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	901 for i = 1, _timerlistlen do
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	902 local t = _timerlist[ i ]( _currenttime ) -- fire timers
d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	903 if t then next_timer_time = math_min(next_timer_time, t); end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	904 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	905 _timer = _currenttime
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	906 else
d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	907 next_timer_time = next_timer_time - (_currenttime - _timer);
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	908 end
5486 bcf27dbef6c6 net.server_select: Add and improve some comments. Waqas Hussain <waqas20@gmail.com> parents: 5485 diff changeset	909
7095 3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	910 for server, paused_time in pairs( _fullservers ) do
3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	911 if _currenttime - paused_time > _accepretry then
3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	912 _fullservers[ server ] = nil;
3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	913 server.resume();
3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	914 end
3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	915 end
3e1dac35af87 server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour) Kim Alvefur <zash@zash.se> parents: 7094 diff changeset	916
5486 bcf27dbef6c6 net.server_select: Add and improve some comments. Waqas Hussain <waqas20@gmail.com> parents: 5485 diff changeset	917 -- wait some time (0 by default)
bcf27dbef6c6 net.server_select: Add and improve some comments. Waqas Hussain <waqas20@gmail.com> parents: 5485 diff changeset	918 socket_sleep( _sleeptime )
3491 e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	919 until quitting;
e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	920 if once and quitting == "once" then quitting = nil; return; end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	921 return "quitting"
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	922 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	923
4399 1b4161970842 net.server_event, net.server_select: Fixed some global pollution. Waqas Hussain <waqas20@gmail.com> parents: 4393 diff changeset	924 local function step()
3491 e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	925 return loop(true);
e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	926 end
e8c06d20a18b net.server_select: Add server.step() to run through a single iteration of the event loop Matthew Wild <mwild1@gmail.com> parents: 3458 diff changeset	927
2339 b04014f42fce net.server_select: Add get_backend() method Matthew Wild <mwild1@gmail.com> parents: 2318 diff changeset	928 local function get_backend()
b04014f42fce net.server_select: Add get_backend() method Matthew Wild <mwild1@gmail.com> parents: 2318 diff changeset	929 return "select";
b04014f42fce net.server_select: Add get_backend() method Matthew Wild <mwild1@gmail.com> parents: 2318 diff changeset	930 end
b04014f42fce net.server_select: Add get_backend() method Matthew Wild <mwild1@gmail.com> parents: 2318 diff changeset	931
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	932 --// EXPERIMENTAL //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	933
2541 2febd008214e net.server_select: Remove startssl parameter to the client/server creation functions - passing a sslctx now indicates you want to use SSL from the start Matthew Wild <mwild1@gmail.com> parents: 2478 diff changeset	934 local wrapclient = function( socket, ip, serverport, listeners, pattern, sslctx )
5331 ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	935 local handler, socket, err = wrapconnection( nil, listeners, socket, ip, serverport, "clientport", pattern, sslctx )
ffa740b4f08d net.server_select: Limit global number of sockets passed to select. Kim Alvefur <zash@zash.se> parents: 5330 diff changeset	936 if not handler then return nil, err end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	937 _socketlist[ socket ] = handler
4349 16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	938 if not sslctx then
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	939 _sendlistlen = addsocket(_sendlist, socket, _sendlistlen)
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	940 if listeners.onconnect then
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	941 -- When socket is writeable, call onconnect
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	942 local _sendbuffer = handler.sendbuffer;
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	943 handler.sendbuffer = function ()
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	944 handler.sendbuffer = _sendbuffer;
16fd8061964e net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL Matthew Wild <mwild1@gmail.com> parents: 4348 diff changeset	945 listeners.onconnect(handler);
5949 a9abbdeddbf3 net.server_select: Don't remove the socket from sendlist when we might have data in the buffer (we'll now let sendbuffer() take care of that) (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 5663 diff changeset	946 return _sendbuffer(); -- Send any queued outgoing data
3382 fea0f8e19e4c net.server_select: Ensure that onconnect is called for server sockets as well as clients, rather than onincoming. Fixes mod_console traceback, issue #197 Matthew Wild <mwild1@gmail.com> parents: 3312 diff changeset	947 end
fea0f8e19e4c net.server_select: Ensure that onconnect is called for server sockets as well as clients, rather than onincoming. Fixes mod_console traceback, issue #197 Matthew Wild <mwild1@gmail.com> parents: 3312 diff changeset	948 end
fea0f8e19e4c net.server_select: Ensure that onconnect is called for server sockets as well as clients, rather than onincoming. Fixes mod_console traceback, issue #197 Matthew Wild <mwild1@gmail.com> parents: 3312 diff changeset	949 end
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	950 return handler, socket
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	951 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	952
2541 2febd008214e net.server_select: Remove startssl parameter to the client/server creation functions - passing a sslctx now indicates you want to use SSL from the start Matthew Wild <mwild1@gmail.com> parents: 2478 diff changeset	953 local addclient = function( address, port, listeners, pattern, sslctx )
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	954 local client, err = luasocket.tcp( )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	955 if err then
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	956 return nil, err
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	957 end
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	958 client:settimeout( 0 )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	959 _, err = client:connect( address, port )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	960 if err then -- try again
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	961 local handler = wrapclient( client, address, port, listeners )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	962 else
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	963 wrapconnection( nil, listeners, client, address, port, "clientport", pattern, sslctx )
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	964 end
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	965 end
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	966
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	967 --// EXPERIMENTAL //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	968
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	969 ----------------------------------// BEGIN //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	970
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	971 use "setmetatable" ( _socketlist, { __mode = "k" } )
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	972 use "setmetatable" ( _readtimes, { __mode = "k" } )
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	973 use "setmetatable" ( _writetimes, { __mode = "k" } )
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	974
3682 d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	975 _timer = luasocket_gettime( )
d12141cbbaa0 net.server_select: Make changes required for sub-second timer precision. Waqas Hussain <waqas20@gmail.com> parents: 3543 diff changeset	976 _starttime = luasocket_gettime( )
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	977
2424 7d3b071e3b5b net.server_select: Fix oops in last commit Matthew Wild <mwild1@gmail.com> parents: 2423 diff changeset	978 local function setlogger(new_logger)
2423 0597c553acf2 net.server_select: Allow setting the logger using server.setlogger Matthew Wild <mwild1@gmail.com> parents: 2339 diff changeset	979 local old_logger = log;
0597c553acf2 net.server_select: Allow setting the logger using server.setlogger Matthew Wild <mwild1@gmail.com> parents: 2339 diff changeset	980 if new_logger then
0597c553acf2 net.server_select: Allow setting the logger using server.setlogger Matthew Wild <mwild1@gmail.com> parents: 2339 diff changeset	981 log = new_logger;
0597c553acf2 net.server_select: Allow setting the logger using server.setlogger Matthew Wild <mwild1@gmail.com> parents: 2339 diff changeset	982 end
0597c553acf2 net.server_select: Allow setting the logger using server.setlogger Matthew Wild <mwild1@gmail.com> parents: 2339 diff changeset	983 return old_logger;
0597c553acf2 net.server_select: Allow setting the logger using server.setlogger Matthew Wild <mwild1@gmail.com> parents: 2339 diff changeset	984 end
0597c553acf2 net.server_select: Allow setting the logger using server.setlogger Matthew Wild <mwild1@gmail.com> parents: 2339 diff changeset	985
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	986 ----------------------------------// PUBLIC INTERFACE //--
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	987
a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	988 return {
4808 07d0a3a75c8a net.server, net.timer, net.server_select: Rearrange dependencies between these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani) Matthew Wild <mwild1@gmail.com> parents: 4675 diff changeset	989 _addtimer = addtimer,
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	990
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	991 addclient = addclient,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	992 wrapclient = wrapclient,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	993
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	994 loop = loop,
3003 48871a549b4c net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size Matthew Wild <mwild1@gmail.com> parents: 3002 diff changeset	995 link = link,
4145 e992650185c8 net.server_select: Expose step() function (thanks Łukasz) Matthew Wild <mwild1@gmail.com> parents: 4111 diff changeset	996 step = step,
2581 1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	997 stats = stats,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	998 closeall = closeall,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	999 addserver = addserver,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	1000 getserver = getserver,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	1001 setlogger = setlogger,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	1002 getsettings = getsettings,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	1003 setquitting = setquitting,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	1004 removeserver = removeserver,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	1005 get_backend = get_backend,
1b9f424e695e net.server_select: Major whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs Matthew Wild <mwild1@gmail.com> parents: 2559 diff changeset	1006 changesettings = changesettings,
2318 a831de056de3 net.server_select, net.server_event: Convert to unix line endings from Windows Matthew Wild <mwild1@gmail.com> parents: 2312 diff changeset	1007 }

prosody

95e4c81291cc

net/server_select.lua

Software / code / prosody

Annotate

net/server_select.lua @ 7096:95e4c81291cc

Software `/` code `/` prosody