Bumper commit for the new modulemanager API \o/ Updates all the modules, though some...

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 21a35312b4f4c7c208c548b3003136caf8dfebdf..d5f3157b8250c926da5dedbaa7317c131508029f 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,6 +1,5 @@
 
 local st = require "util.stanza";
-local send = require "core.sessionmanager".send_to_session;
 
 --local sessions = sessions;
 
@@ -10,10 +9,10 @@ local log = require "util.logger".init("mod_starttls");
 
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
-add_handler("c2s_unauthed", "starttls", xmlns_starttls,
+module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                function (session, stanza)
                        if session.conn.starttls then
-                               send(session, st.stanza("proceed", { xmlns = xmlns_starttls }));
+                               session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
                                -- FIXME: I'm commenting the below, not sure why it was necessary
                                -- sessions[session.conn] = nil;
                                session:reset_stream();
@@ -25,9 +24,10 @@ add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                        end
                end);
                
-add_event_hook("stream-features", 
+local starttls_attr = { xmlns = xmlns_starttls };
+module:add_event_hook("stream-features", 
                                        function (session, features)                                                                                            
                                                if session.conn.starttls then
-                                                       t_insert(features, "<starttls xmlns='"..xmlns_starttls.."'/>");
+                                                       features:tag("starttls", starttls_attr):up();
                                                end
                                        end);