From 2cd39663b68f1936e5e086d14693a2e50f0e366a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 10 May 2012 23:01:10 +0200 Subject: s2smanager: Clean up unused imports. --- core/s2smanager.lua | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'core/s2smanager.lua') diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 5907ff2f..a4b75db5 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -9,37 +9,17 @@ local hosts = hosts; -local core_process_stanza = function(a, b) core_process_stanza(a, b); end -local format = string.format; -local t_insert, t_sort = table.insert, table.sort; -local get_traceback = debug.traceback; -local tostring, pairs, ipairs, getmetatable, newproxy, type, error, tonumber, setmetatable - = tostring, pairs, ipairs, getmetatable, newproxy, type, error, tonumber, setmetatable; - -local initialize_filters = require "util.filters".initialize; -local wrapclient = require "net.server".wrapclient; -local st = require "stanza"; -local stanza = st.stanza; -local nameprep = require "util.encodings".stringprep.nameprep; -local cert_verify_identity = require "util.x509".verify_identity; -local new_ip = require "util.ip".new_ip; -local rfc3484_dest = require "util.rfc3484".destination; +local tostring, pairs, ipairs, getmetatable, newproxy, setmetatable + = tostring, pairs, ipairs, getmetatable, newproxy, setmetatable; local fire_event = prosody.events.fire_event; -local uuid_gen = require "util.uuid".generate; - local logger_init = require "util.logger".init; local log = logger_init("s2smanager"); -local sha256_hash = require "util.hashes".sha256; - local adns, dns = require "net.adns", require "net.dns"; local config = require "core.configmanager"; local dns_timeout = config.get("*", "core", "dns_timeout") or 15; -local cfg_sources = config.get("*", "core", "s2s_interface") - or config.get("*", "core", "interface"); -local sources; --FIXME: s2sout should create its own resolver w/ timeout dns.settimeout(dns_timeout); -- cgit v1.2.3 From 3713488b271aee3c381048843c82d57d328df346 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 10 May 2012 23:05:03 +0200 Subject: s2smanager, mod_s2s: Move checking DNS timeout option to mod_s2s --- core/s2smanager.lua | 5 ----- 1 file changed, 5 deletions(-) (limited to 'core/s2smanager.lua') diff --git a/core/s2smanager.lua b/core/s2smanager.lua index a4b75db5..ea626baa 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -17,12 +17,7 @@ local logger_init = require "util.logger".init; local log = logger_init("s2smanager"); -local adns, dns = require "net.adns", require "net.dns"; local config = require "core.configmanager"; -local dns_timeout = config.get("*", "core", "dns_timeout") or 15; - ---FIXME: s2sout should create its own resolver w/ timeout -dns.settimeout(dns_timeout); local prosody = _G.prosody; incoming_s2s = {}; -- cgit v1.2.3