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