prosody
869f38f1eee4
core/s2smanager.lua

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

Software / code / prosody

Comparison

core/s2smanager.lua @ 4600:869f38f1eee4

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Sun, 11 Mar 2012 19:13:29 +0000
parent 4599:f9f5230d7a9c
child 4684:dc70c4ffb66d
comparison
equal deleted inserted replaced
4598:d2bcb959d713 4600:869f38f1eee4
35 local sha256_hash = require "util.hashes".sha256; 35 local sha256_hash = require "util.hashes".sha256;
36 36
37 local adns, dns = require "net.adns", require "net.dns"; 37 local adns, dns = require "net.adns", require "net.dns";
38 local config = require "core.configmanager"; 38 local config = require "core.configmanager";
39 local dns_timeout = config.get("*", "core", "dns_timeout") or 15; 39 local dns_timeout = config.get("*", "core", "dns_timeout") or 15;
40 local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3;
41 local cfg_sources = config.get("*", "core", "s2s_interface") 40 local cfg_sources = config.get("*", "core", "s2s_interface")
42 or config.get("*", "core", "interface"); 41 or config.get("*", "core", "interface");
43 local sources; 42 local sources;
44 43
45 --FIXME: s2sout should create its own resolver w/ timeout 44 --FIXME: s2sout should create its own resolver w/ timeout