Mercurial > prosody-hg

annotate main.lua @ 49:1cd2a8db392d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New "import" module to help tidy up all the local declarations at the top of modules
author Matthew Wild <mwild1@gmail.com>
date Sat, 04 Oct 2008 02:43:23 +0100
parents 3fdfd6e0cb4e
children 14ea0fe6ca86
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
1 require "luarocks.require"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
2
12
90f22275f7ae Moved server module to net/
Matthew Wild <mwild1@gmail.com>
parents: 11
diff changeset
3 server = require "net.server"
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
4 require "socket"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
5 require "ssl"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
6 require "lxp"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
7
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
8 function log(type, area, message)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
9 print(type, area, message);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
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
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
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
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
19 require "core.rostermanager"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
20 require "core.offlinemessage"
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
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
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
23 require "core.sessionmanager"
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
24 require "core.stanza_router"
38
Matthew Wild <mwild1@gmail.com>
parents: 37
diff changeset
25 require "net.connhandlers"
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
26 require "util.stanza"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
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
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
30 -- Locals for faster access --
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
31 local t_insert = table.insert;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
32 local t_concat = table.concat;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
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
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
34 local m_random = math.random;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
35 local format = string.format;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
36 local st = stanza;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
37 ------------------------------
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
38
36
62998e5319e3 Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents: 34
diff changeset
39
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
40
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
41 local hosts, users = hosts, users;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
42
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
43 function connect_host(host)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
44 hosts[host] = { type = "remote", sendbuffer = {} };
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
45 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
46
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
47 function handler(conn, data, err)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
48 local session = sessions[conn];
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
49
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
50 if not session then
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
51 sessions[conn] = sessionmanager.new_session(conn);
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
52 session = sessions[conn];
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
53
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
54 -- Logging functions --
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
55
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
56 local mainlog, log = log;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
57 do
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
58 local conn_name = tostring(conn):match("%w+$");
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
59 log = function (type, area, message) mainlog(type, conn_name, message); end
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
60 --log = function () end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
61 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
62 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
63 session.log = log;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
64
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
65 print("Client connected");
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
66
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
67 session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end
38
Matthew Wild <mwild1@gmail.com>
parents: 37
diff changeset
68
Matthew Wild <mwild1@gmail.com>
parents: 37
diff changeset
69 session.connhandler = connhandlers.new("xmpp-client", session);
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
70
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
71 function session.disconnect(err)
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
72 if session.last_presence and session.last_presence.attr.type ~= "unavailable" then
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
73 local pres = st.presence{ type = "unavailable" };
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
74 if err == "closed" then err = "connection closed"; end
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
75 pres:tag("status"):text("Disconnected: "..err);
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
76 session.stanza_dispatch(pres);
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
77 end
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
78 if session.username then
2
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
79 hosts[session.host].sessions[session.username] = nil;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
80 end
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
81 session = nil;
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
82 print("Disconnected: "..err);
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
83 collectgarbage("collect");
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
84 end
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
85 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
86 if data then
38
Matthew Wild <mwild1@gmail.com>
parents: 37
diff changeset
87 session.connhandler:data(data);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
88 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
89
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
90 --log("info", "core", "Client disconnected, connection closed");
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
91 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
92
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
93 function disconnect(conn, err)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
94 sessions[conn].disconnect(err);
34
fd693ef5d978 Fixed: Session data was never removed from sessions list
Waqas Hussain <waqas20@gmail.com>
parents: 33
diff changeset
95 sessions[conn] = nil;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
96 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
97
33
091f91a1f67a Let modules set/write globals
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
98 modulemanager.loadall();
091f91a1f67a Let modules set/write globals
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
99
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
100 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
101
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
102
20
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
103 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
104 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
105
20
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
106 server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5222, "*", 1, nil ) -- server.add will send a status message
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
107 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
108
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
109 server.loop();