aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-05 19:50:34 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-05 19:50:34 +0000
commitfe6e46a55f68f566290250655247cd1393ae6d2c (patch)
tree1cf6e6e0fad1a9efd467895c02e748522dc2ca06
parentb2afc52730ae023a4fa3c4da525b3d1f92e5f1b9 (diff)
parentc016526d9d5b57c8b6157cba7eee4bb268e1e9b4 (diff)
downloadprosody-fe6e46a55f68f566290250655247cd1393ae6d2c.tar.gz
prosody-fe6e46a55f68f566290250655247cd1393ae6d2c.zip
Merge
-rw-r--r--core/presencemanager.lua9
-rw-r--r--core/sessionmanager.lua6
-rw-r--r--net/server.lua15
-rw-r--r--net/xmppclient_listener.lua2
-rw-r--r--plugins/mod_console.lua2
-rw-r--r--plugins/mod_saslauth.lua8
6 files changed, 7 insertions, 35 deletions
diff --git a/core/presencemanager.lua b/core/presencemanager.lua
index dbcb83d6..6e27752b 100644
--- a/core/presencemanager.lua
+++ b/core/presencemanager.lua
@@ -21,7 +21,6 @@
local log = require "util.logger".init("presencemanager")
-local tostring = tostring;
local require = require;
local pairs, ipairs = pairs, ipairs;
local t_concat = table.concat;
@@ -122,14 +121,6 @@ function handle_normal_presence(origin, stanza, core_route_stanza)
else
log("error", "presence recieved from client with no roster");
end
-
- if origin.conntimetotal then
- local session = origin;
- origin.log("BLAH", "***********\n\n\n\n\n\n****************");
- origin.send(st.stanza("message", { from = session.host, to=session.full_jid, type = "normal" }):body("Your login took "..tostring(session.conntimetotal).." seconds"));
- origin.conntimetotal = nil;
- end
-
end
function send_presence_of_available_resources(user, host, jid, recipient_session, core_route_stanza)
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index bc48d228..36111633 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -35,8 +35,6 @@ local uuid_generate = require "util.uuid".generate;
local rm_load_roster = require "core.rostermanager".load_roster;
local config_get = require "core.configmanager".get;
-local gettime = require "socket".gettime;
-
local st = require "util.stanza";
local newproxy = newproxy;
@@ -47,7 +45,7 @@ module "sessionmanager"
local open_sessions = 0;
function new_session(conn)
- local session = { conn = conn, priority = 0, type = "c2s_unauthed", conntime = gettime() };
+ local session = { conn = conn, priority = 0, type = "c2s_unauthed" };
if true then
session.trace = newproxy(true);
getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") end;
@@ -111,8 +109,6 @@ function bind_resource(session, resource)
if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end
-- We don't support binding multiple resources
- session.conntimetotal = gettime()-session.conntime;
-
resource = resource or uuid_generate();
--FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing
diff --git a/net/server.lua b/net/server.lua
index 7fdb3275..e01ddfb7 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -501,24 +501,13 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss
handler.starttls = function (now)
if not now then out_put("server.lua: we need to do tls, but delaying until later"); handler.need_tls = true; return; end
out_put( "server.lua: attempting to start tls on "..tostring(socket) )
- local oldsocket = socket;
socket, err = ssl_wrap( socket, sslctx ) -- wrap socket
out_put("sslwrapped socket is "..tostring(socket));
if err then
out_put( "server.lua: ssl error: ", err )
return nil, nil, err -- fatal error
end
- socket:settimeout(0);
-
- -- Add the new socket to our system
- socketlist[ socket ] = handler
- readlen = readlen + 1
- readlist[ readlen ] = socket
-
- -- Remove traces of the old socket
- readlen = removesocket( readlist, oldsocket, readlen )
- socketlist [ oldsocket ] = nil;
-
+ socket:settimeout( 1 )
send = socket.send
receive = socket.receive
close = socket.close
@@ -543,7 +532,7 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss
out_put( "server.lua: ssl handshake done" )
writelen = ( wrote and removesocket( writelist, socket, writelen ) ) or writelen
handler.receivedata = handler._receivedata -- when handshake is done, replace the handshake function with regular functions
- handler.dispatchdata = handler._dispatchdata
+ handler.dispatchdata = handler._dispatchdata;
return true;
else
out_put( "server.lua: error during ssl handshake: ", err )
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index fe6ec57b..22af2de4 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -113,7 +113,7 @@ function xmppclient.listener(conn, data)
if not session then
session = sm_new_session(conn);
sessions[conn] = session;
-
+
-- Logging functions --
local mainlog, log = log;
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 9b9fc217..4ac3c5fe 100644
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -33,7 +33,7 @@ function console:new_session(conn)
local w = conn.write;
local session = { conn = conn;
send = function (t) w(tostring(t)); end;
- print = function (t) w("| "..tostring(t).."\r\n"); end;
+ print = function (t) w("| "..tostring(t).."\n"); end;
disconnect = function () conn.close(); end;
};
session.env = setmetatable({}, default_env_mt);
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index d0ba8542..52ef68c7 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -24,8 +24,6 @@ local sm_bind_resource = require "core.sessionmanager".bind_resource;
local jid
local base64 = require "util.encodings".base64;
-local gettime = require "socket".gettime;
-
local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
local t_concat, t_insert = table.concat, table.insert;
local tostring = tostring;
@@ -66,14 +64,14 @@ local function handle_status(session, status)
end
end
-local function password_callback(node, host, mechanism)
+local function password_callback(node, host, mechanism, raw_host)
local password = (datamanager.load(node, host, "accounts") or {}).password; -- FIXME handle hashed passwords
local func = function(x) return x; end;
if password then
if mechanism == "PLAIN" then
return func, password;
elseif mechanism == "DIGEST-MD5" then
- return func, md5(node..":"..host..":"..password);
+ return func, md5(node..":"..raw_host..":"..password);
end
end
return func, nil;
@@ -144,8 +142,6 @@ module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
:tag("bind", { xmlns = xmlns_bind})
:tag("jid"):text(session.full_jid));
end
-
- session.log("******", "Connection took "..tostring(session.conntimetotal).." seconds");
end);
module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-session",