From ccf63862c565d1dcbea9ca3fdb2237b1800aa2dd Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 11 Jan 2010 10:13:02 +0000 Subject: componentmanager: Add dialback_secret to components to allow s2s to work (thanks Flo) --- core/componentmanager.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/componentmanager.lua b/core/componentmanager.lua index c701c4d7..a7c24617 100644 --- a/core/componentmanager.lua +++ b/core/componentmanager.lua @@ -16,6 +16,7 @@ local events_new = require "util.events".new; local st = require "util.stanza"; local prosody, hosts = prosody, prosody.hosts; local ssl = ssl; +local uuid_gen = require "util.uuid".generate; local pairs, setmetatable, type, tostring = pairs, setmetatable, type, tostring; @@ -91,7 +92,8 @@ function create_component(host, component, events) end end return { type = "component", host = host, connected = true, s2sout = {}, - ssl_ctx = ssl_ctx, ssl_ctx_in = ssl_ctx_in, events = events or events_new() }; + ssl_ctx = ssl_ctx, ssl_ctx_in = ssl_ctx_in, events = events or events_new(), + dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen() }; end function register_component(host, component, session) @@ -100,12 +102,16 @@ function register_component(host, component, session) components[host] = component; hosts[host] = session or create_component(host, component, old_events); - + -- Add events object if not already one if not hosts[host].events then hosts[host].events = old_events or events_new(); end - + + if not hosts[host].dialback_secret then + hosts[host].dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen(); + end + -- add to disco_items if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then disco_items:set(host:sub(host:find(".", 1, true)+1), host, true); -- cgit v1.2.3