aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-01-17 04:45:08 +0000
committerMatthew Wild <mwild1@gmail.com>2009-01-17 04:45:08 +0000
commitc0dbcb4389fa5470c9fc7f674fc7fa698b693c02 (patch)
tree989f31c69447cb405c148c4eb3bcb067652844f0 /core
parent5da8d030772c430bafef92bab6fa3d43767695b2 (diff)
downloadprosody-c0dbcb4389fa5470c9fc7f674fc7fa698b693c02.tar.gz
prosody-c0dbcb4389fa5470c9fc7f674fc7fa698b693c02.zip
Port to new server.lua, quite some changes, but I believe everything to be working
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index bc1abfe8..5243085c 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -31,7 +31,7 @@ local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber
local idna_to_ascii = require "util.encodings".idna.to_ascii;
local connlisteners_get = require "net.connlisteners".get;
-local wraptlsclient = require "net.server".wraptlsclient;
+local wrapclient = require "net.server".wrapclient;
local modulemanager = require "core.modulemanager";
local st = require "stanza";
local stanza = st.stanza;
@@ -196,7 +196,7 @@ function attempt_connection(host_session, err)
end
local cl = connlisteners_get("xmppserver");
- conn = wraptlsclient(cl, conn, connect_host, connect_port, 0, cl.default_mode or 1, hosts[from_host].ssl_ctx );
+ conn = wrapclient(conn, connect_host, connect_port, cl, cl.default_mode or 1, hosts[from_host].ssl_ctx, false );
host_session.conn = conn;
-- Register this outgoing connection so that xmppserver_listener knows about it