# HG changeset patch # User Marco Cirillo # Date 1330097665 0 # Node ID 9612abc89dd1b7c85b5044eb3b996bf1c67c60e4 # Parent 34b1122126f687deb08138ae3e9d39e6bebf788d mod_s2s, s2sout.lib: import cert verify and add another fallback method in case socket.local_addresses isn't there. diff -r 34b1122126f6 -r 9612abc89dd1 plugins/s2s/mod_s2s.lua --- a/plugins/s2s/mod_s2s.lua Fri Feb 24 15:24:10 2012 +0000 +++ b/plugins/s2s/mod_s2s.lua Fri Feb 24 15:34:25 2012 +0000 @@ -20,6 +20,7 @@ local s2s_new_outgoing = require "core.s2smanager".new_outgoing; local s2s_destroy_session = require "core.s2smanager".destroy_session; local uuid_gen = require "util.uuid".generate; +local cert_verify_identity = require "util.x509".verify_identity; local s2sout = module:require("s2sout"); diff -r 34b1122126f6 -r 9612abc89dd1 plugins/s2s/s2sout.lib.lua --- a/plugins/s2s/s2sout.lib.lua Fri Feb 24 15:24:10 2012 +0000 +++ b/plugins/s2s/s2sout.lib.lua Fri Feb 24 15:34:25 2012 +0000 @@ -24,7 +24,7 @@ local s2s_new_outgoing = require "core.s2smanager".new_outgoing; local s2s_destroy_session = require "core.s2smanager".destroy_session; -local cfg_sources = config.get("*", "core", "s2s_interfaces") or socket.local_addresses(); +local cfg_sources = config.get("*", "core", "s2s_interfaces") or socket.local_addresses and socket.local_addresses() or { "*" }; local s2sout = {};