author | Matthew Wild <mwild1@gmail.com> |
Wed, 01 May 2013 13:54:44 +0100 | |
branch | tls |
changeset 5556 | 7407b1160b46 |
parent 65 | 9c471840acb9 |
child 97 | c3f12fd0c823 |
permissions | -rw-r--r-- |
0 | 1 |
require "luarocks.require" |
2 |
||
12 | 3 |
server = require "net.server" |
0 | 4 |
require "socket" |
5 |
require "ssl" |
|
6 |
require "lxp" |
|
7 |
||
8 |
function log(type, area, message) |
|
9 |
print(type, area, message); |
|
10 |
end |
|
36
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
11 |
|
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
12 |
dofile "lxmppd.cfg" |
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
13 |
|
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
14 |
sessions = {}; |
18
ae161e907149
Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
15 |
|
49
1cd2a8db392d
New "import" module to help tidy up all the local declarations at the top of modules
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
16 |
require "util.import" |
0 | 17 |
require "core.stanza_dispatch" |
20
6885fd2cf51f
Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents:
18
diff
changeset
|
18 |
require "core.xmlhandlers" |
0 | 19 |
require "core.rostermanager" |
20 |
require "core.offlinemessage" |
|
30 | 21 |
require "core.modulemanager" |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
22 |
require "core.usermanager" |
30 | 23 |
require "core.sessionmanager" |
24 |
require "core.stanza_router" |
|
38 | 25 |
require "net.connhandlers" |
0 | 26 |
require "util.stanza" |
27 |
require "util.jid" |
|
49
1cd2a8db392d
New "import" module to help tidy up all the local declarations at the top of modules
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
28 |
|
18
ae161e907149
Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
29 |
|
0 | 30 |
-- Locals for faster access -- |
31 |
local t_insert = table.insert; |
|
32 |
local t_concat = table.concat; |
|
33 |
local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end |
|
34 |
local m_random = math.random; |
|
35 |
local format = string.format; |
|
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
49
diff
changeset
|
36 |
local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session"); |
0 | 37 |
local st = stanza; |
38 |
------------------------------ |
|
39 |
||
36
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
40 |
|
0 | 41 |
|
42 |
local hosts, users = hosts, users; |
|
43 |
||
44 |
function connect_host(host) |
|
45 |
hosts[host] = { type = "remote", sendbuffer = {} }; |
|
46 |
end |
|
47 |
||
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
48 |
function handler(conn, data, err) |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
49 |
local session = sessions[conn]; |
7 | 50 |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
51 |
if not session then |
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
49
diff
changeset
|
52 |
sessions[conn] = sm_new_session(conn); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
53 |
session = sessions[conn]; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
54 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
55 |
-- Logging functions -- |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
56 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
57 |
local mainlog, log = log; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
58 |
do |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
59 |
local conn_name = tostring(conn):match("%w+$"); |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
60 |
log = function (type, area, message) mainlog(type, conn_name, message); end |
7 | 61 |
--log = function () end |
0 | 62 |
end |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
63 |
local print = function (...) log("info", "core", t_concatall({...}, "\t")); end |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
64 |
session.log = log; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
65 |
|
7 | 66 |
print("Client connected"); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
67 |
|
30 | 68 |
session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end |
38 | 69 |
|
70 |
session.connhandler = connhandlers.new("xmpp-client", session); |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
71 |
|
7 | 72 |
function session.disconnect(err) |
73 |
if session.last_presence and session.last_presence.attr.type ~= "unavailable" then |
|
74 |
local pres = st.presence{ type = "unavailable" }; |
|
75 |
if err == "closed" then err = "connection closed"; end |
|
76 |
pres:tag("status"):text("Disconnected: "..err); |
|
77 |
session.stanza_dispatch(pres); |
|
78 |
end |
|
79 |
session = nil; |
|
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
49
diff
changeset
|
80 |
print("Disconnected: "..tostring(err)); |
7 | 81 |
collectgarbage("collect"); |
0 | 82 |
end |
7 | 83 |
end |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
84 |
if data then |
38 | 85 |
session.connhandler:data(data); |
0 | 86 |
end |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
87 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
88 |
--log("info", "core", "Client disconnected, connection closed"); |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
89 |
end |
0 | 90 |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
91 |
function disconnect(conn, err) |
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
49
diff
changeset
|
92 |
sm_destroy_session(sessions[conn]); |
34
fd693ef5d978
Fixed: Session data was never removed from sessions list
Waqas Hussain <waqas20@gmail.com>
parents:
33
diff
changeset
|
93 |
sessions[conn] = nil; |
0 | 94 |
end |
95 |
||
33
091f91a1f67a
Let modules set/write globals
Matthew Wild <mwild1@gmail.com>
parents:
30
diff
changeset
|
96 |
modulemanager.loadall(); |
091f91a1f67a
Let modules set/write globals
Matthew Wild <mwild1@gmail.com>
parents:
30
diff
changeset
|
97 |
|
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
98 |
setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][]; |
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
99 |
|
0 | 100 |
|
20
6885fd2cf51f
Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents:
18
diff
changeset
|
101 |
local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end; |
6885fd2cf51f
Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents:
18
diff
changeset
|
102 |
local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end; |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
103 |
|
65
9c471840acb9
TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
104 |
server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5222, "*", 1, ssl_ctx ) -- server.add will send a status message |
9c471840acb9
TLS: Handshake works, no data after that
Matthew Wild <mwild1@gmail.com>
parents:
53
diff
changeset
|
105 |
--server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5223, "*", 1, ssl_ctx ) -- server.add will send a status message |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
106 |
|
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
107 |
server.loop(); |