X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=20cf7c3dfef5738345615c1bb1837e0ffcec8079;hb=10904eb0553bd5e6efadbd8ab04ed77c49aa03b9;hp=21a35312b4f4c7c208c548b3003136caf8dfebdf;hpb=350abadcedbc236db13937bbb626081fe9bd9b63;p=prosody.git diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 21a35312..20cf7c3d 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -1,6 +1,25 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; -local send = require "core.sessionmanager".send_to_session; --local sessions = sessions; @@ -10,10 +29,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 +44,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, ""); + features:tag("starttls", starttls_attr):up(); end end);