Annotate

net/server.lua @ 440:dee02bf4656a

Some mod_console updates
author Matthew Wild <mwild1@gmail.com>
date Thu, 27 Nov 2008 17:09:21 +0000
parent 374:ff502dada372
child 519:cccd610a0ef9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
1 --[[
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
2
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
3 server.lua by blastbeat of the luadch project
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
4
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
5 re-used here under the MIT/X Consortium License
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
6
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
7 - this script contains the server loop of the program
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
8 - other scripts can reg a server here
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
9
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
10 ]]--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
11
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
12 ----------------------------------// DECLARATION //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
13
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
14 --// constants //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
15
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
16 local STAT_UNIT = 1 / ( 1024 * 1024 ) -- mb
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
17
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
18 --// lua functions //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
19
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
20 local function use( what ) return _G[ what ] end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
21
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
22 local type = use "type"
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
23 local pairs = use "pairs"
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
24 local ipairs = use "ipairs"
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
25 local tostring = use "tostring"
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
26 local collectgarbage = use "collectgarbage"
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
27
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
28 --// lua libs //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
29
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
30 local table = use "table"
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
31 local coroutine = use "coroutine"
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
32
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
33 --// lua lib methods //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
34
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
35 local table_concat = table.concat
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
36 local table_remove = table.remove
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
37 local string_sub = use'string'.sub
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
38 local coroutine_wrap = coroutine.wrap
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
39 local coroutine_yield = coroutine.yield
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
40 local print = print;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
41 local out_put = function () end --print;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
42 local out_error = print;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
43
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
44 --// extern libs //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
45
98
3a2d327c4856 server.lua should degrade gracefully when LuaSec not present
Matthew Wild <mwild1@gmail.com>
parents: 74
diff changeset
46 local luasec = select(2, pcall(require, "ssl"))
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
47 local luasocket = require "socket"
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
48
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
49 --// extern lib methods //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
50
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
51 local ssl_wrap = ( luasec and luasec.wrap )
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
52 local socket_bind = luasocket.bind
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
53 local socket_select = luasocket.select
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
54 local ssl_newcontext = ( luasec and luasec.newcontext )
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
55
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
56 --// functions //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
57
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
58 local loop
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
59 local stats
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
60 local addtimer
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
61 local closeall
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
62 local addserver
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
63 local firetimer
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
64 local closesocket
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
65 local removesocket
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
66 local wrapserver
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
67 local wraptcpclient
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
68 local wrapsslclient
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
69
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
70 --// tables //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
71
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
72 local listener
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
73 local readlist
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
74 local writelist
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
75 local socketlist
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
76 local timelistener
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
77
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
78 --// simple data types //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
79
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
80 local _
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
81 local readlen = 0 -- length of readlist
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
82 local writelen = 0 -- lenght of writelist
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
83
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
84 local sendstat= 0
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
85 local receivestat = 0
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
86
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
87 ----------------------------------// DEFINITION //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
88
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
89 listener = { } -- key = port, value = table
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
90 readlist = { } -- array with sockets to read from
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
91 writelist = { } -- arrary with sockets to write to
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
92 socketlist = { } -- key = socket, value = wrapped socket
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
93 timelistener = { }
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
94
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
95 stats = function( )
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
96 return receivestat, sendstat
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
97 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
98
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
99 wrapserver = function( listener, socket, ip, serverport, mode, sslctx ) -- this function wraps a server
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
100
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
101 local dispatch, disconnect = listener.listener, listener.disconnect -- dangerous
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
102
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
103 local wrapclient, err
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
104
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
105 if sslctx then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
106 if not ssl_newcontext then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
107 return nil, "luasec not found"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
108 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
109 if type( sslctx ) ~= "table" then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
110 out_error "server.lua: wrong server sslctx"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
111 return nil, "wrong server sslctx"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
112 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
113 sslctx, err = ssl_newcontext( sslctx )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
114 if not sslctx then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
115 err = err or "wrong sslctx parameters"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
116 out_error( "server.lua: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
117 return nil, err
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
118 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
119 wrapclient = wrapsslclient
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
120 wrapclient = wraptlsclient
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
121 else
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
122 wrapclient = wraptcpclient
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
123 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
124
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
125 local accept = socket.accept
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
126 local close = socket.close
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
127
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
128 --// public methods of the object //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
129
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
130 local handler = { }
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
131
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
132 handler.shutdown = function( ) end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
133
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
134 --[[handler.listener = function( data, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
135 return ondata( handler, data, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
136 end]]
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
137 handler.ssl = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
138 return sslctx and true or false
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
139 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
140 handler.close = function( closed )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
141 _ = not closed and close( socket )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
142 writelen = removesocket( writelist, socket, writelen )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
143 readlen = removesocket( readlist, socket, readlen )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
144 socketlist[ socket ] = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
145 handler = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
146 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
147 handler.ip = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
148 return ip
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
149 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
150 handler.serverport = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
151 return serverport
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
152 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
153 handler.socket = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
154 return socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
155 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
156 handler.receivedata = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
157 local client, err = accept( socket ) -- try to accept
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
158 if client then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
159 local ip, clientport = client:getpeername( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
160 client:settimeout( 0 )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
161 local handler, client, err = wrapclient( listener, client, ip, serverport, clientport, mode, sslctx ) -- wrap new client socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
162 if err then -- error while wrapping ssl socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
163 return false
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
164 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
165 out_put( "server.lua: accepted new client connection from ", ip, ":", clientport )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
166 return dispatch( handler )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
167 elseif err then -- maybe timeout or something else
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
168 out_put( "server.lua: error with new client connection: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
169 return false
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
170 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
171 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
172 return handler
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
173 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
174
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
175 wrapsslclient = function( listener, socket, ip, serverport, clientport, mode, sslctx ) -- this function wraps a ssl cleint
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
176
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
177 local dispatch, disconnect = listener.listener, listener.disconnect
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
178
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
179 --// transform socket to ssl object //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
180
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
181 local err
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
182 socket, err = ssl_wrap( socket, sslctx ) -- wrap socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
183 if err then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
184 out_put( "server.lua: ssl error: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
185 return nil, nil, err -- fatal error
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
186 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
187 socket:settimeout( 0 )
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
188
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
189 --// private closures of the object //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
190
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
191 local writequeue = { } -- buffer for messages to send
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
192
335
906311ff2170 Fix to prevent send retry when connection is already closed
Matthew Wild <mwild1@gmail.com>
parents: 328
diff changeset
193 local eol, fatal_send_error -- end of buffer
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
194
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
195 local sstat, rstat = 0, 0
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
196
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
197 --// local import of socket methods //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
198
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
199 local send = socket.send
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
200 local receive = socket.receive
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
201 local close = socket.close
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
202 --local shutdown = socket.shutdown
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
203
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
204 --// public methods of the object //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
205
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
206 local handler = { }
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
207
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
208 handler.getstats = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
209 return rstat, sstat
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
210 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
211
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
212 handler.listener = function( data, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
213 return listener( handler, data, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
214 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
215 handler.ssl = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
216 return true
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
217 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
218 handler.send = function( _, data, i, j )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
219 return send( socket, data, i, j )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
220 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
221 handler.receive = function( pattern, prefix )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
222 return receive( socket, pattern, prefix )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
223 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
224 handler.shutdown = function( pattern )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
225 --return shutdown( socket, pattern )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
226 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
227 handler.close = function( closed )
335
906311ff2170 Fix to prevent send retry when connection is already closed
Matthew Wild <mwild1@gmail.com>
parents: 328
diff changeset
228 if eol and not fatal_send_error then handler._dispatchdata(); end
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
229 close( socket )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
230 writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
231 readlen = removesocket( readlist, socket, readlen )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
232 socketlist[ socket ] = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
233 out_put "server.lua: closed handler and removed socket from list"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
234 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
235 handler.ip = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
236 return ip
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
237 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
238 handler.serverport = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
239 return serverport
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
240 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
241 handler.clientport = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
242 return clientport
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
243 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
244
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
245 handler.write = function( data )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
246 if not eol then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
247 writelen = writelen + 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
248 writelist[ writelen ] = socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
249 eol = 0
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
250 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
251 eol = eol + 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
252 writequeue[ eol ] = data
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
253 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
254 handler.writequeue = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
255 return writequeue
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
256 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
257 handler.socket = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
258 return socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
259 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
260 handler.mode = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
261 return mode
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
262 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
263 handler._receivedata = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
264 local data, err, part = receive( socket, mode ) -- receive data in "mode"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
265 if not err or ( err == "timeout" or err == "wantread" ) then -- received something
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
266 local data = data or part or ""
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
267 local count = #data * STAT_UNIT
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
268 rstat = rstat + count
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
269 receivestat = receivestat + count
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
270 out_put( "server.lua: read data '", data, "', error: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
271 return dispatch( handler, data, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
272 else -- connections was closed or fatal error
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
273 out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
274 handler.close( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
275 disconnect( handler, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
276 writequeue = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
277 handler = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
278 return false
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
279 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
280 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
281 handler._dispatchdata = function( ) -- this function writes data to handlers
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
282 local buffer = table_concat( writequeue, "", 1, eol )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
283 local succ, err, byte = send( socket, buffer )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
284 local count = ( succ or 0 ) * STAT_UNIT
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
285 sstat = sstat + count
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
286 sendstat = sendstat + count
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
287 out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
288 if succ then -- sending succesful
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
289 --writequeue = { }
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
290 eol = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
291 writelen = removesocket( writelist, socket, writelen ) -- delete socket from writelist
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
292 return true
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
293 elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
294 buffer = string_sub( buffer, byte + 1, -1 ) -- new buffer
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
295 writequeue[ 1 ] = buffer -- insert new buffer in queue
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
296 eol = 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
297 return true
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
298 else -- connection was closed during sending or fatal error
335
906311ff2170 Fix to prevent send retry when connection is already closed
Matthew Wild <mwild1@gmail.com>
parents: 328
diff changeset
299 fatal_send_error = true;
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
300 out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
301 handler.close( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
302 disconnect( handler, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
303 writequeue = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
304 handler = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
305 return false
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
306 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
307 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
308
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
309 -- // COMPAT // --
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
310
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
311 handler.getIp = handler.ip
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
312 handler.getPort = handler.clientport
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
313
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
314 --// handshake //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
315
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
316 local wrote
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
317
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
318 handler.handshake = coroutine_wrap( function( client )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
319 local err
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
320 for i = 1, 10 do -- 10 handshake attemps
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
321 _, err = client:dohandshake( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
322 if not err then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
323 out_put( "server.lua: ssl handshake done" )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
324 writelen = ( wrote and removesocket( writelist, socket, writelen ) ) or writelen
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
325 handler.receivedata = handler._receivedata -- when handshake is done, replace the handshake function with regular functions
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
326 handler.dispatchdata = handler._dispatchdata
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
327 return dispatch( handler )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
328 else
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
329 out_put( "server.lua: error during ssl handshake: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
330 if err == "wantwrite" then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
331 if wrote == nil then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
332 writelen = writelen + 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
333 writelist[ writelen ] = client
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
334 wrote = true
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
335 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
336 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
337 coroutine_yield( handler, nil, err ) -- handshake not finished
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
338 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
339 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
340 _ = err ~= "closed" and close( socket )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
341 handler.close( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
342 disconnect( handler, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
343 writequeue = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
344 handler = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
345 return false -- handshake failed
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
346 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
347 )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
348 handler.receivedata = handler.handshake
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
349 handler.dispatchdata = handler.handshake
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
350
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
351 handler.handshake( socket ) -- do handshake
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
352
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
353 socketlist[ socket ] = handler
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
354 readlen = readlen + 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
355 readlist[ readlen ] = socket
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
356
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
357 return handler, socket
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
358 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
359
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
360 wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, sslctx ) -- this function wraps a tls cleint
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
361
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
362 local dispatch, disconnect = listener.listener, listener.disconnect
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
363
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
364 --// transform socket to ssl object //--
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
365
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
366 local err
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
367
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
368 socket:settimeout( 0 )
328
a1d25769970f Flush write queue before closing socket
Matthew Wild <mwild1@gmail.com>
parents: 319
diff changeset
369 out_put("setting linger on "..tostring(socket))
a1d25769970f Flush write queue before closing socket
Matthew Wild <mwild1@gmail.com>
parents: 319
diff changeset
370 socket:setoption("linger", { on = true, timeout = 10 });
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
371 --// private closures of the object //--
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
372
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
373 local writequeue = { } -- buffer for messages to send
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
374
335
906311ff2170 Fix to prevent send retry when connection is already closed
Matthew Wild <mwild1@gmail.com>
parents: 328
diff changeset
375 local eol, fatal_send_error -- end of buffer
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
376
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
377 local sstat, rstat = 0, 0
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
378
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
379 --// local import of socket methods //--
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
380
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
381 local send = socket.send
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
382 local receive = socket.receive
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
383 local close = socket.close
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
384 --local shutdown = socket.shutdown
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
385
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
386 --// public methods of the object //--
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
387
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
388 local handler = { }
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
389
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
390 handler.getstats = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
391 return rstat, sstat
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
392 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
393
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
394 handler.listener = function( data, err )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
395 return listener( handler, data, err )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
396 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
397 handler.ssl = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
398 return false
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
399 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
400 handler.send = function( _, data, i, j )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
401 return send( socket, data, i, j )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
402 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
403 handler.receive = function( pattern, prefix )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
404 return receive( socket, pattern, prefix )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
405 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
406 handler.shutdown = function( pattern )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
407 --return shutdown( socket, pattern )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
408 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
409 handler.close = function( closed )
335
906311ff2170 Fix to prevent send retry when connection is already closed
Matthew Wild <mwild1@gmail.com>
parents: 328
diff changeset
410 if eol and not fatal_send_error then handler._dispatchdata(); end
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
411 close( socket )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
412 writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
413 readlen = removesocket( readlist, socket, readlen )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
414 socketlist[ socket ] = nil
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
415 out_put "server.lua: closed handler and removed socket from list"
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
416 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
417 handler.ip = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
418 return ip
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
419 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
420 handler.serverport = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
421 return serverport
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
422 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
423 handler.clientport = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
424 return clientport
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
425 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
426
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
427 handler.write = function( data )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
428 if not eol then
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
429 writelen = writelen + 1
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
430 writelist[ writelen ] = socket
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
431 eol = 0
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
432 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
433 eol = eol + 1
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
434 writequeue[ eol ] = data
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
435 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
436 handler.writequeue = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
437 return writequeue
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
438 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
439 handler.socket = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
440 return socket
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
441 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
442 handler.mode = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
443 return mode
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
444 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
445 handler._receivedata = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
446 local data, err, part = receive( socket, mode ) -- receive data in "mode"
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
447 if not err or ( err == "timeout" or err == "wantread" ) then -- received something
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
448 local data = data or part or ""
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
449 local count = #data * STAT_UNIT
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
450 rstat = rstat + count
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
451 receivestat = receivestat + count
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
452 --out_put( "server.lua: read data '", data, "', error: ", err )
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
453 return dispatch( handler, data, err )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
454 else -- connections was closed or fatal error
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
455 out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
456 handler.close( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
457 disconnect( handler, err )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
458 writequeue = nil
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
459 handler = nil
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
460 return false
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
461 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
462 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
463 handler._dispatchdata = function( ) -- this function writes data to handlers
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
464 local buffer = table_concat( writequeue, "", 1, eol )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
465 local succ, err, byte = send( socket, buffer )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
466 local count = ( succ or 0 ) * STAT_UNIT
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
467 sstat = sstat + count
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
468 sendstat = sendstat + count
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
469 out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
470 if succ then -- sending succesful
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
471 --writequeue = { }
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
472 eol = nil
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
473 writelen = removesocket( writelist, socket, writelen ) -- delete socket from writelist
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
474 if handler.need_tls then
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
475 out_put("server.lua: connection is ready for tls handshake");
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
476 handler.starttls(true);
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
477 if handler.need_tls then
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
478 out_put("server.lua: uh-oh... we still want tls, something must be wrong");
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
479 end
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
480 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
481 return true
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
482 elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
483 buffer = string_sub( buffer, byte + 1, -1 ) -- new buffer
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
484 writequeue[ 1 ] = buffer -- insert new buffer in queue
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
485 eol = 1
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
486 return true
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
487 else -- connection was closed during sending or fatal error
335
906311ff2170 Fix to prevent send retry when connection is already closed
Matthew Wild <mwild1@gmail.com>
parents: 328
diff changeset
488 fatal_send_error = true; -- :(
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
489 out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
490 handler.close( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
491 disconnect( handler, err )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
492 writequeue = nil
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
493 handler = nil
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
494 return false
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
495 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
496 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
497
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
498 handler.receivedata, handler.dispatchdata = handler._receivedata, handler._dispatchdata;
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
499 -- // COMPAT // --
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
500
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
501 handler.getIp = handler.ip
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
502 handler.getPort = handler.clientport
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
503
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
504 --// handshake //--
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
505
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
506 local wrote, read
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
507
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
508 handler.starttls = function (now)
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
509 if not now then out_put("server.lua: we need to do tls, but delaying until later"); handler.need_tls = true; return; end
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
510 out_put( "server.lua: attempting to start tls on "..tostring(socket) )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
511 socket, err = ssl_wrap( socket, sslctx ) -- wrap socket
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
512 out_put("sslwrapped socket is "..tostring(socket));
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
513 if err then
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
514 out_put( "server.lua: ssl error: ", err )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
515 return nil, nil, err -- fatal error
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
516 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
517 socket:settimeout( 1 )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
518 send = socket.send
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
519 receive = socket.receive
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
520 close = socket.close
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
521 handler.ssl = function( )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
522 return true
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
523 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
524 handler.send = function( _, data, i, j )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
525 return send( socket, data, i, j )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
526 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
527 handler.receive = function( pattern, prefix )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
528 return receive( socket, pattern, prefix )
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
529 end
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
530
319
4a8a949c3870 Fix for putting TLS in stream:features for connections already using TLS. Thanks to albert for spotting.
Matthew Wild <mwild1@gmail.com>
parents: 127
diff changeset
531 handler.starttls = nil;
4a8a949c3870 Fix for putting TLS in stream:features for connections already using TLS. Thanks to albert for spotting.
Matthew Wild <mwild1@gmail.com>
parents: 127
diff changeset
532
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
533 handler.handshake = coroutine_wrap( function( client )
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
534 local err
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
535 for i = 1, 10 do -- 10 handshake attemps
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
536 _, err = client:dohandshake( )
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
537 if not err then
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
538 out_put( "server.lua: ssl handshake done" )
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
539 writelen = ( wrote and removesocket( writelist, socket, writelen ) ) or writelen
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
540 handler.receivedata = handler._receivedata -- when handshake is done, replace the handshake function with regular functions
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
541 handler.dispatchdata = handler._dispatchdata
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
542 handler.need_tls = nil
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
543 socketlist[ client ] = handler
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
544 readlen = readlen + 1
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
545 readlist[ readlen ] = client
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
546 return true;
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
547 else
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
548 out_put( "server.lua: error during ssl handshake: ", err )
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
549 if err == "wantwrite" then
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
550 if wrote == nil then
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
551 writelen = writelen + 1
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
552 writelist[ writelen ] = client
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
553 wrote = true
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
554 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
555 end
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
556 coroutine_yield( handler, nil, err ) -- handshake not finished
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
557 end
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
558 end
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
559 _ = err ~= "closed" and close( socket )
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
560 handler.close( )
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
561 disconnect( handler, err )
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
562 writequeue = nil
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
563 handler = nil
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
564 return false -- handshake failed
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
565 end
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
566 )
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
567 handler.receivedata = handler.handshake
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
568 handler.dispatchdata = handler.handshake
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
569
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
570 handler.handshake( socket ) -- do handshake
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
571 end
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
572 socketlist[ socket ] = handler
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
573 readlen = readlen + 1
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
574 readlist[ readlen ] = socket
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
575
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
576 return handler, socket
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
577 end
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
578
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
579 wraptcpclient = function( listener, socket, ip, serverport, clientport, mode ) -- this function wraps a socket
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
580
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
581 local dispatch, disconnect = listener.listener, listener.disconnect
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
582
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
583 --// private closures of the object //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
584
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
585 local writequeue = { } -- list for messages to send
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
586
335
906311ff2170 Fix to prevent send retry when connection is already closed
Matthew Wild <mwild1@gmail.com>
parents: 328
diff changeset
587 local eol, fatal_send_error
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
588
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
589 local rstat, sstat = 0, 0
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
590
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
591 --// local import of socket methods //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
592
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
593 local send = socket.send
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
594 local receive = socket.receive
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
595 local close = socket.close
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
596 local shutdown = socket.shutdown
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
597
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
598 --// public methods of the object //--
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
599
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
600 local handler = { }
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
601
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
602 handler.getstats = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
603 return rstat, sstat
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
604 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
605
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
606 handler.listener = function( data, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
607 return listener( handler, data, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
608 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
609 handler.ssl = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
610 return false
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
611 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
612 handler.send = function( _, data, i, j )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
613 return send( socket, data, i, j )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
614 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
615 handler.receive = function( pattern, prefix )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
616 return receive( socket, pattern, prefix )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
617 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
618 handler.shutdown = function( pattern )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
619 return shutdown( socket, pattern )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
620 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
621 handler.close = function( closed )
374
ff502dada372 All the people who don't use TLS, this one's for you.
Matthew Wild <mwild1@gmail.com>
parents: 335
diff changeset
622 if eol and not fatal_send_error then handler.dispatchdata(); end
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
623 _ = not closed and shutdown( socket )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
624 _ = not closed and close( socket )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
625 writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
626 readlen = removesocket( readlist, socket, readlen )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
627 socketlist[ socket ] = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
628 out_put "server.lua: closed handler and removed socket from list"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
629 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
630 handler.ip = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
631 return ip
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
632 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
633 handler.serverport = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
634 return serverport
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
635 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
636 handler.clientport = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
637 return clientport
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
638 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
639 handler.write = function( data )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
640 if not eol then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
641 writelen = writelen + 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
642 writelist[ writelen ] = socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
643 eol = 0
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
644 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
645 eol = eol + 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
646 writequeue[ eol ] = data
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
647 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
648 handler.writequeue = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
649 return writequeue
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
650 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
651 handler.socket = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
652 return socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
653 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
654 handler.mode = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
655 return mode
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
656 end
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
657
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
658 handler.receivedata = function( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
659 local data, err, part = receive( socket, mode ) -- receive data in "mode"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
660 if not err or ( err == "timeout" or err == "wantread" ) then -- received something
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
661 local data = data or part or ""
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
662 local count = #data * STAT_UNIT
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
663 rstat = rstat + count
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
664 receivestat = receivestat + count
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
665 out_put( "server.lua: read data '", data, "', error: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
666 return dispatch( handler, data, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
667 else -- connections was closed or fatal error
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
668 out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
669 handler.close( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
670 disconnect( handler, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
671 writequeue = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
672 handler = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
673 return false
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
674 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
675 end
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
676
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
677 handler.dispatchdata = function( ) -- this function writes data to handlers
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
678 local buffer = table_concat( writequeue, "", 1, eol )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
679 local succ, err, byte = send( socket, buffer )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
680 local count = ( succ or 0 ) * STAT_UNIT
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
681 sstat = sstat + count
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
682 sendstat = sendstat + count
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
683 out_put( "server.lua: sended '", buffer, "', bytes: ", succ, ", error: ", err, ", part: ", byte, ", to: ", ip, ":", clientport )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
684 if succ then -- sending succesful
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
685 --writequeue = { }
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
686 eol = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
687 writelen = removesocket( writelist, socket, writelen ) -- delete socket from writelist
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
688 return true
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
689 elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
690 buffer = string_sub( buffer, byte + 1, -1 ) -- new buffer
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
691 writequeue[ 1 ] = buffer -- insert new buffer in queue
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
692 eol = 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
693 return true
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
694 else -- connection was closed during sending or fatal error
335
906311ff2170 Fix to prevent send retry when connection is already closed
Matthew Wild <mwild1@gmail.com>
parents: 328
diff changeset
695 fatal_send_error = true; -- :'-(
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
696 out_put( "server.lua: client ", ip, ":", clientport, " error: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
697 handler.close( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
698 disconnect( handler, err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
699 writequeue = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
700 handler = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
701 return false
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
702 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
703 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
704
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
705 -- // COMPAT // --
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
706
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
707 handler.getIp = handler.ip
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
708 handler.getPort = handler.clientport
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
709
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
710 socketlist[ socket ] = handler
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
711 readlen = readlen + 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
712 readlist[ readlen ] = socket
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
713
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
714 return handler, socket
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
715 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
716
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
717 addtimer = function( listener )
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
718 timelistener[ #timelistener + 1 ] = listener
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
719 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
720
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
721 firetimer = function( listener )
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
722 for i, listener in ipairs( timelistener ) do
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
723 listener( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
724 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
725 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
726
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
727 addserver = function( listeners, port, addr, mode, sslctx ) -- this function provides a way for other scripts to reg a server
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
728 local err
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
729 if type( listeners ) ~= "table" then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
730 err = "invalid listener table"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
731 else
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
732 for name, func in pairs( listeners ) do
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
733 if type( func ) ~= "function" then
98
3a2d327c4856 server.lua should degrade gracefully when LuaSec not present
Matthew Wild <mwild1@gmail.com>
parents: 74
diff changeset
734 --err = "invalid listener function"
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
735 break
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
736 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
737 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
738 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
739 if not type( port ) == "number" or not ( port >= 0 and port <= 65535 ) then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
740 err = "invalid port"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
741 elseif listener[ port ] then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
742 err= "listeners on port '" .. port .. "' already exist"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
743 elseif sslctx and not luasec then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
744 err = "luasec not found"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
745 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
746 if err then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
747 out_error( "server.lua: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
748 return nil, err
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
749 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
750 addr = addr or "*"
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
751 local server, err = socket_bind( addr, port )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
752 if err then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
753 out_error( "server.lua: ", err )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
754 return nil, err
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
755 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
756 local handler, err = wrapserver( listeners, server, addr, port, mode, sslctx ) -- wrap new server socket
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
757 if not handler then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
758 server:close( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
759 return nil, err
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
760 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
761 server:settimeout( 0 )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
762 readlen = readlen + 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
763 readlist[ readlen ] = server
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
764 listener[ port ] = listeners
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
765 socketlist[ server ] = handler
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
766 out_put( "server.lua: new server listener on ", addr, ":", port )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
767 return true
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
768 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
769
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
770 removesocket = function( tbl, socket, len ) -- this function removes sockets from a list
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
771 for i, target in ipairs( tbl ) do
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
772 if target == socket then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
773 len = len - 1
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
774 table_remove( tbl, i )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
775 return len
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
776 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
777 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
778 return len
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
779 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
780
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
781 closeall = function( )
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
782 for sock, handler in pairs( socketlist ) do
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
783 handler.shutdown( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
784 handler.close( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
785 socketlist[ sock ] = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
786 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
787 writelist, readlist, socketlist = { }, { }, { }
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
788 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
789
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
790 closesocket = function( socket )
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
791 writelen = removesocket( writelist, socket, writelen )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
792 readlen = removesocket( readlist, socket, readlen )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
793 socketlist[ socket ] = nil
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
794 socket:close( )
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
795 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
796
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
797 loop = function( ) -- this is the main loop of the program
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
798 --signal_set( "hub", "run" )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
799 repeat
66
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
800 --[[print(readlen, writelen)
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
801 for _, s in ipairs(readlist) do print("R:", tostring(s)) end
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
802 for _, s in ipairs(writelist) do print("W:", tostring(s)) end
018705d57f09 Working TLS!
Matthew Wild <mwild1@gmail.com>
parents: 65
diff changeset
803 out_put("select()"..os.time())]]
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
804 local read, write, err = socket_select( readlist, writelist, 1 ) -- 1 sec timeout, nice for timers
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
805 for i, socket in ipairs( write ) do -- send data waiting in writequeues
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
806 local handler = socketlist[ socket ]
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
807 if handler then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
808 handler.dispatchdata( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
809 else
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
810 closesocket( socket )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
811 out_put "server.lua: found no handler and closed socket (writelist)" -- this should not happen
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
812 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
813 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
814 for i, socket in ipairs( read ) do -- receive data
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
815 local handler = socketlist[ socket ]
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
816 if handler then
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
817 handler.receivedata( )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
818 else
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
819 closesocket( socket )
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
820 out_put "server.lua: found no handler and closed socket (readlist)" -- this can happen
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
821 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
822 end
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
823 firetimer( )
65
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
824 until false
9c471840acb9 TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents: 64
diff changeset
825 return
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
826 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
827
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
828 ----------------------------------// BEGIN //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
829
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
830 ----------------------------------// PUBLIC INTERFACE //--
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
831
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
832 return {
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
833
64
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
834 add = addserver,
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
835 loop = loop,
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
836 stats = stats,
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
837 closeall = closeall,
bcd0a3975580 Convert spaces->tabs
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
838 addtimer = addtimer,
127
93f3c6b94c75 Initial s2s stuff
Matthew Wild <mwild1@gmail.com>
parents: 98
diff changeset
839 wraptlsclient = wraptlsclient,
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents:
diff changeset
840 }