prosody
3e7231c6d6a9
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 @ 1962:3e7231c6d6a9

s2smanager: Fix access of 'config' global without requiring configmanager
author Matthew Wild <mwild1@gmail.com>
date Fri, 16 Oct 2009 22:19:20 +0100
parent 1936:a6ca0dcc7b83
child 1976:5f3eaab987c3
comparison
equal deleted inserted replaced
1961:3652ef68c361 1962:3e7231c6d6a9
37 local sha256_hash = require "util.hashes".sha256; 37 local sha256_hash = require "util.hashes".sha256;
38 38
39 local dialback_secret = uuid_gen(); 39 local dialback_secret = uuid_gen();
40 40
41 local adns, dns = require "net.adns", require "net.dns"; 41 local adns, dns = require "net.adns", require "net.dns";
42 42 local config = require "core.configmanager";
43 local connect_timeout = config.get("*", "core", "s2s_timeout") or 60; 43 local connect_timeout = config.get("*", "core", "s2s_timeout") or 60;
44 local dns_timeout = config.get("*", "core", "dns_timeout") or 60; 44 local dns_timeout = config.get("*", "core", "dns_timeout") or 60;
45 local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3; 45 local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3;
46 46
47 incoming_s2s = {}; 47 incoming_s2s = {};