# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1409671465 -7200
# Node ID 3cec0eef0b704e1dcfa62429d61b8a114fed4524
# Parent  84c50a9addbcd06785200864f8875d4e7c8edec4
mod_s2s: Close offending s2s streams missing an 'id' attribute with a stream error instead of throwing an unhandled error

diff -r 84c50a9addbc -r 3cec0eef0b70 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Thu Aug 28 12:22:39 2014 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Tue Sep 02 17:24:25 2014 +0200
@@ -365,8 +365,11 @@
 		session.notopen = nil;
 	elseif session.direction == "outgoing" then
 		session.notopen = nil;
-		-- If we are just using the connection for verifying dialback keys, we won't try and auth it
-		if not attr.id then error("stream response did not give us a streamid!!!"); end
+		if not attr.id then
+			log("error", "Stream response did not give us a stream id!");
+			session:close({ condition = "undefined-condition", text = "Missing stream ID" });
+			return;
+		end
 		session.streamid = attr.id;
 
 		if session.secure and not session.cert_chain_status then