Annotate

main.lua @ 36:62998e5319e3

Moved hosts to a config file, still need better config though
author Matthew Wild <mwild1@gmail.com>
date Wed, 01 Oct 2008 22:11:28 +0100
parent 34:fd693ef5d978
child 37:06eadafafefa
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
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
16 require "core.stanza_dispatch"
20
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
17 require "core.xmlhandlers"
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
18 require "core.rostermanager"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
19 require "core.offlinemessage"
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
20 require "core.modulemanager"
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
21 require "core.usermanager"
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
22 require "core.sessionmanager"
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
23 require "core.stanza_router"
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
24 require "util.stanza"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
25 require "util.jid"
18
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
26
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
27 -- Locals for faster access --
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
28 local t_insert = table.insert;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
29 local t_concat = table.concat;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
30 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
31 local m_random = math.random;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
32 local format = string.format;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
33 local st = stanza;
20
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
34 local init_xmlhandlers = xmlhandlers.init_xmlhandlers;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
35 ------------------------------
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
36
36
62998e5319e3 Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents: 34
diff changeset
37
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
38
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
39 local hosts, users = hosts, users;
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 function connect_host(host)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
42 hosts[host] = { type = "remote", sendbuffer = {} };
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
43 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
44
18
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
45 local function route_stanza(stanza)
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
46 if not stanza.attr.to then
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
47 -- Has no 'to' attribute, handle internally
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
48 end
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
49 local node, host, resource = jid.split(stanza.attr.to);
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
50 if host and hosts[host] and hosts[host].type == "local" then
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
51 -- Is a local host, handle internally
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
52
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
53 else
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
54 -- Is not for us or a local user, route accordingly
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
55 end
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
56 end
ae161e907149 Beginning of new routing logic
Matthew Wild <mwild1@gmail.com>
parents: 12
diff changeset
57
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
58 local function send_to(session, to, stanza)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
59 local node, host, resource = jid.split(to);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
60 if not hosts[host] then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
61 -- s2s
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
62 elseif hosts[host].type == "local" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
63 print(" ...is to a local user")
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
64 local destuser = hosts[host].sessions[node];
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
65 if destuser and destuser.sessions then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
66 if not destuser.sessions[resource] then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
67 local best_session;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
68 for resource, session in pairs(destuser.sessions) do
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
69 if not best_session then best_session = session;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
70 elseif session.priority >= best_session.priority and session.priority >= 0 then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
71 best_session = session;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
72 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
73 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
74 if not best_session then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
75 offlinemessage.new(node, host, stanza);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
76 else
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
77 print("resource '"..resource.."' was not online, have chosen to send to '"..best_session.username.."@"..best_session.host.."/"..best_session.resource.."'");
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
78 resource = best_session.resource;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
79 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
80 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
81 if destuser.sessions[resource] == session then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
82 log("warn", "core", "Attempt to send stanza to self, dropping...");
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
83 else
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
84 print("...sending...", tostring(stanza));
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
85 --destuser.sessions[resource].conn.write(tostring(data));
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
86 print(" to conn ", destuser.sessions[resource].conn);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
87 destuser.sessions[resource].conn.write(tostring(stanza));
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
88 print("...sent")
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
89 end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
90 elseif stanza.name == "message" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
91 print(" ...will be stored offline");
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
92 offlinemessage.new(node, host, stanza);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
93 elseif stanza.name == "iq" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
94 print(" ...is an iq");
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
95 session.send(st.reply(stanza)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
96 :tag("error", { type = "cancel" })
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
97 :tag("service-unavailable", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" }));
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
98 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
99 print(" ...done routing");
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
100 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
101 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
102
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
103 function handler(conn, data, err)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
104 local session = sessions[conn];
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
105
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
106 if not session then
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
107 sessions[conn] = sessionmanager.new_session(conn);
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
108 session = sessions[conn];
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
109
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
110 -- Logging functions --
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
111
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
112 local mainlog, log = log;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
113 do
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
114 local conn_name = tostring(conn):match("%w+$");
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
115 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
116 --log = function () end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
117 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
118 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
119 session.log = log;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
120
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
121 print("Client connected");
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
122
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
123 session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
124 session.xml_handlers = init_xmlhandlers(session);
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
125 session.parser = lxp.new(session.xml_handlers, ":");
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
126
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
127 function session.disconnect(err)
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
128 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
129 local pres = st.presence{ type = "unavailable" };
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
130 if err == "closed" then err = "connection closed"; end
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
131 pres:tag("status"):text("Disconnected: "..err);
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
132 session.stanza_dispatch(pres);
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
133 end
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
134 if session.username then
2
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
135 hosts[session.host].sessions[session.username] = nil;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
136 end
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
137 session = nil;
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
138 print("Disconnected: "..err);
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
139 collectgarbage("collect");
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
140 end
7
dcc5ac721c20 - Remove some debugging code
Matthew Wild <mwild1@gmail.com>
parents: 6
diff changeset
141 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
142 if data then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
143 session.parser:parse(data);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
144 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
145
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
146 --log("info", "core", "Client disconnected, connection closed");
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
147 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
148
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
149 function disconnect(conn, err)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
150 sessions[conn].disconnect(err);
34
fd693ef5d978 Fixed: Session data was never removed from sessions list
Waqas Hussain <waqas20@gmail.com>
parents: 33
diff changeset
151 sessions[conn] = nil;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
152 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
153
33
091f91a1f67a Let modules set/write globals
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
154 modulemanager.loadall();
091f91a1f67a Let modules set/write globals
Matthew Wild <mwild1@gmail.com>
parents: 30
diff changeset
155
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
156 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
157
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
158
20
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
159 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
160 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
161
20
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
162 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
163 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
164
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
165 server.loop();