projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4aaef42
)
mod_tls: Switch to : syntax for connection methods
author
Matthew Wild
<mwild1@gmail.com>
Sat, 21 Nov 2009 17:16:46 +0000
(17:16 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Sat, 21 Nov 2009 17:16:46 +0000
(17:16 +0000)
plugins/mod_tls.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_tls.lua
b/plugins/mod_tls.lua
index 8a45080341ec32afc70e91658a40f7f5ef49794c..706b42c948429d279b48220e7f570f9402bda0f8 100644
(file)
--- a/
plugins/mod_tls.lua
+++ b/
plugins/mod_tls.lua
@@
-20,9
+20,9
@@
module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
session:reset_stream();
if session.host and hosts[session.host].ssl_ctx_in then
session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
session:reset_stream();
if session.host and hosts[session.host].ssl_ctx_in then
- session.conn
.
set_sslctx(hosts[session.host].ssl_ctx_in);
+ session.conn
:
set_sslctx(hosts[session.host].ssl_ctx_in);
end
end
- session.conn
.
starttls();
+ session.conn
:
starttls();
session.log("info", "TLS negotiation started...");
session.secure = false;
else
session.log("info", "TLS negotiation started...");
session.secure = false;
else
@@
-37,9
+37,9
@@
module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls,
session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
session:reset_stream();
if session.to_host and hosts[session.to_host].ssl_ctx_in then
session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls }));
session:reset_stream();
if session.to_host and hosts[session.to_host].ssl_ctx_in then
- session.conn
.
set_sslctx(hosts[session.to_host].ssl_ctx_in);
+ session.conn
:
set_sslctx(hosts[session.to_host].ssl_ctx_in);
end
end
- session.conn
.
starttls();
+ session.conn
:
starttls();
session.log("info", "TLS negotiation started for incoming s2s...");
session.secure = false;
else
session.log("info", "TLS negotiation started for incoming s2s...");
session.secure = false;
else
@@
-91,7
+91,7
@@
module:hook_stanza(xmlns_starttls, "proceed",
module:log("debug", "Proceeding with TLS on s2sout...");
local format, to_host, from_host = string.format, session.to_host, session.from_host;
session:reset_stream();
module:log("debug", "Proceeding with TLS on s2sout...");
local format, to_host, from_host = string.format, session.to_host, session.from_host;
session:reset_stream();
- session.conn
.
starttls(true);
+ session.conn
:
starttls(true);
session.secure = false;
return true;
end);
session.secure = false;
return true;
end);