prosody
9612abc89dd1
plugins/s2s/mod_s2s.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/s2s/mod_s2s.lua @ 4570:9612abc89dd1

mod_s2s, s2sout.lib: import cert verify and add another fallback method in case socket.local_addresses isn't there.
author Marco Cirillo <maranda@lightwitch.org>
date Fri, 24 Feb 2012 15:34:25 +0000
parent 4568:aae7a62671de
child 4572:aba47e6dff43
comparison
equal deleted inserted replaced
4569:34b1122126f6 4570:9612abc89dd1
18 local new_xmpp_stream = require "util.xmppstream".new; 18 local new_xmpp_stream = require "util.xmppstream".new;
19 local s2s_new_incoming = require "core.s2smanager".new_incoming; 19 local s2s_new_incoming = require "core.s2smanager".new_incoming;
20 local s2s_new_outgoing = require "core.s2smanager".new_outgoing; 20 local s2s_new_outgoing = require "core.s2smanager".new_outgoing;
21 local s2s_destroy_session = require "core.s2smanager".destroy_session; 21 local s2s_destroy_session = require "core.s2smanager".destroy_session;
22 local uuid_gen = require "util.uuid".generate; 22 local uuid_gen = require "util.uuid".generate;
23 local cert_verify_identity = require "util.x509".verify_identity;
23 24
24 local s2sout = module:require("s2sout"); 25 local s2sout = module:require("s2sout");
25 26
26 local connect_timeout = module:get_option_number("s2s_timeout", 60); 27 local connect_timeout = module:get_option_number("s2s_timeout", 60);
27 28