X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=cc46d55613187e79c1cf30d4fb7eab1f27848c2c;hb=6d9f97378cd7d73cc22ac102e546c52799bb8615;hp=ab06b9a55d7e9faf15fad4aeb2337db8895961b9;hpb=dda60a00dfba3152f2cd7241c14911f58c598ac4;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index ab06b9a5..cc46d556 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,24 +1,18 @@
 
 local st = require "util.stanza";
-local send = require "core.sessionmanager".send_to_session;
-local sm_bind_resource = require "core.sessionmanager".bind_resource;
 
-local sessions = sessions;
+--local sessions = sessions;
 
-local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
-local t_concat, t_insert = table.concat, table.insert;
-local tostring = tostring;
+local t_insert = table.insert;
 
 local log = require "util.logger".init("mod_starttls");
 
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
-local new_connhandler = require "net.connhandlers".new;
-
 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();
@@ -30,9 +24,10 @@ add_handler("c2s_unauthed", "starttls", xmlns_starttls,
 			end
 		end);
 		
+local starttls_attr = { xmlns = xmlns_starttls };
 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);
\ No newline at end of file
+					end);