X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fxmppserver_listener.lua;h=831f7c3caacc0e6cb3d330270b1badee9c79aeec;hb=f7f712f889b15132b3466806f337df7a9a427010;hp=6a196446d44e8b35d8db0a1c834e045ff2d1f233;hpb=1fcbec749479d8e6f4be2c336e3711fe3d191bde;p=prosody.git

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 6a196446..831f7c3c 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -61,14 +61,14 @@ local function session_reset_stream(session)
 		function session.data(conn, data)
 			local ok, err = parser:parse(data);
 			if ok then return; end
-			log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
+			session.log("warn", "Received invalid XML: %s", data);
+			session.log("warn", "Problem was: %s", err);
 			session:close("xml-not-well-formed");
 		end
 		
 		return true;
 end
 
-
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
 local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:gsub("%|[^|]+$", ""), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
 local function session_close(session, reason)
@@ -114,6 +114,12 @@ function xmppserver.listener(conn, data)
 		session = s2s_new_incoming(conn);
 		sessions[conn] = session;
 
+		-- Logging functions --
+
+		
+		local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$");
+		session.log = logger.init(conn_name);
+		
 		session.log("info", "Incoming s2s connection");
 		
 		session.reset_stream = session_reset_stream;
@@ -128,6 +134,17 @@ function xmppserver.listener(conn, data)
 	end
 end
 	
+function xmppserver.status(conn, status)
+	if status == "ssl-handshake-complete" then
+		local session = sessions[conn];
+		if session and session.direction == "outgoing" then
+			local format, to_host, from_host = string.format, session.to_host, session.from_host;
+			session.log("debug", "Sending stream header...");
+			session.sends2s(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0'>]], from_host, to_host));
+		end
+	end
+end
+
 function xmppserver.disconnect(conn, err)
 	local session = sessions[conn];
 	if session then