# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1445385367 -7200
# Node ID c7a0d52999338495d5dceb89f766236634cae5c8
# Parent  cb5b14c95b7bd32e52cebe6a24e84156f025f74d
mod_component: Add config option for deciding what happens if a component connects while already connected (fixes #525)

diff -r cb5b14c95b7b -r c7a0d5299933 plugins/mod_component.lua
--- a/plugins/mod_component.lua	Sun Oct 18 21:54:17 2015 +0100
+++ b/plugins/mod_component.lua	Wed Oct 21 01:56:07 2015 +0200
@@ -36,11 +36,13 @@
 	
 	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 @@
 		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);