prosody
e9336adb66e5
net/server.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

net/server.lua @ 630:e9336adb66e5

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