aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-10-21 01:56:07 +0200
committerKim Alvefur <zash@zash.se>2015-10-21 01:56:07 +0200
commitb7e3bf93eae9c6ae373d2f555b9d1fb0bbc2056d (patch)
treedd2c794ec9fa8ecd5b1f90b3223a5080dba05718
parent7592b57bc634f514570cb70e0b38347c13085ffe (diff)
downloadprosody-b7e3bf93eae9c6ae373d2f555b9d1fb0bbc2056d.tar.gz
prosody-b7e3bf93eae9c6ae373d2f555b9d1fb0bbc2056d.zip
mod_component: Add config option for deciding what happens if a component connects while already connected (fixes #525)
-rw-r--r--plugins/mod_component.lua14
1 files changed, 11 insertions, 3 deletions
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index f29245b2..a5136f6c 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -36,11 +36,13 @@ function module.add_host(module)
local env = module.environment;
env.connected = false;
+ env.session = false;
local send;
local function on_destroy(session, err)
env.connected = false;
+ env.session = false;
send = nil;
session.on_destroy = nil;
end
@@ -73,12 +75,18 @@ function module.add_host(module)
end
if env.connected then
- module:log("error", "Second component attempted to connect, denying connection");
- session:close{ condition = "conflict", text = "Component already connected" };
- return true;
+ local policy = module:get_option_string("component_conflict_resolve", "kick_new");
+ if policy == "kick_old" then
+ env.session:close{ condition = "conflict", text = "Replaced by a new connection" };
+ else -- kick_new
+ module:log("error", "Second component attempted to connect, denying connection");
+ session:close{ condition = "conflict", text = "Component already connected" };
+ return true;
+ end
end
env.connected = true;
+ env.session = session;
send = session.send;
session.on_destroy = on_destroy;
session.component_validate_from = module:get_option_boolean("validate_from_addresses", true);