prosody
7f1946174d4b
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 @ 657:7f1946174d4b

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