s2smanager, mod_s2s: Move import of dns_max_depth to mod_s2s
authorKim Alvefur <zash@zash.se>
Sun, 11 Mar 2012 19:14:28 +0100
changeset 4599 f9f5230d7a9c
parent 4597 25d89c7d6aee
child 4600 869f38f1eee4
s2smanager, mod_s2s: Move import of dns_max_depth to mod_s2s
core/s2smanager.lua
plugins/s2s/s2sout.lib.lua
--- a/core/s2smanager.lua	Sun Mar 11 12:40:32 2012 +0000
+++ b/core/s2smanager.lua	Sun Mar 11 19:14:28 2012 +0100
@@ -37,7 +37,6 @@
 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 max_dns_depth = config.get("*", "core", "dns_max_depth") or 3;
 local cfg_sources = config.get("*", "core", "s2s_interface")
 	or config.get("*", "core", "interface");
 local sources;
--- a/plugins/s2s/s2sout.lib.lua	Sun Mar 11 12:40:32 2012 +0000
+++ b/plugins/s2s/s2sout.lib.lua	Sun Mar 11 19:14:28 2012 +0100
@@ -23,6 +23,8 @@
 
 local cfg_sources = config.get("*", "core", "s2s_interfaces") or socket.local_addresses and socket.local_addresses() or { "*" };
 
+local max_dns_depth = module:get_option_number("dns_max_depth", 3);
+
 local s2sout = {};
 
 local s2s_listener;