prosody: comparison plugins/mod

equal deleted inserted replaced

-:a6c2b8933507
+:bd0ff8ae98a8
 			if r == request then
 				t_remove(requests, i);
 				break;
 			end
 		end
 		-- If this session now has no requests open, mark it as inactive
 		local max_inactive = session.bosh_max_inactive;
 		if max_inactive and #requests == 0 then
 			inactive_sessions[session] = os_time() + max_inactive;
 			(session.log or log)("debug", "BOSH session marked as inactive (for %ds)", max_inactive);
 	headers.content_type = "text/xml; charset=utf-8";
 	if cross_domain and event.request.headers.origin then
 		set_cross_domain_headers(response);
 	end
 	-- stream:feed() calls the stream_callbacks, so all stanzas in
 	-- the body are processed in this next line before it returns.
 	-- In particular, the streamopened() stream callback is where
 	-- much of the session logic happens, because it's where we first
 	-- get to see the 'sid' of this request.
 	if not stream:feed(body) then
 		module:log("warn", "Error parsing BOSH payload")
 		return 400;
 	end
 	-- Stanzas (if any) in the request have now been processed, and
 	-- we take care of the high-level BOSH logic here, including
 	-- giving a response or putting the request "on hold".
 	local session = sessions[context.sid];
 	if session then
 			log("debug", "Session has data in the send buffer, will send now..");
 			local resp = t_concat(session.send_buffer);
 			session.send_buffer = {};
 			session.send(resp);
 		end
 		if not response.finished then
 			-- We're keeping this request open, to respond later
 			log("debug", "Have nothing to say, so leaving request unanswered for now");
 			if session.bosh_wait then
 				waiting_requests[response] = os_time() + session.bosh_wait;
 			end
 		end
 		if session.bosh_terminate then
 			session.log("debug", "Closing session with %d requests open", #session.requests);
 			session:close();
 			return nil;
 		else
 local stream_xmlns_attr = { xmlns = "urn:ietf:params:xml:ns:xmpp-streams" };
 local function bosh_close_stream(session, reason)
 	(session.log or log)("info", "BOSH client disconnected");
 	local close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate",
 		["xmlns:stream"] = xmlns_streams });
 	if reason then
 		close_reply.attr.condition = "remote-stream-error";
 		if type(reason) == "string" then -- assume stream error
 			close_reply:tag("stream:error")
 	local sid = attr.sid;
 	log("debug", "BOSH body open (sid: %s)", sid or "<none>");
 	if not sid then
 		-- New session request
 		context.notopen = nil; -- Signals that we accept this opening tag
 		-- TODO: Sanity checks here (rid, to, known host, etc.)
 		if not hosts[attr.to] then
 			-- Unknown host
 			log("debug", "BOSH client tried to connect to unknown host: %s", tostring(attr.to));
 			local close_reply = st.stanza("body", { xmlns = xmlns_bosh, type = "terminate",
 				["xmlns:stream"] = xmlns_streams, condition = "host-unknown" });
 			response:send(tostring(close_reply));
 			return;
 		end
 		-- New session
 		sid = new_uuid();
 		local session = {
 			type = "c2s_unauthed", conn = {}, sid = sid, rid = tonumber(attr.rid)-1, host = attr.to,
 			bosh_version = attr.ver, bosh_wait = math_min(attr.wait, bosh_max_wait), streamid = sid,
 			close = bosh_close_stream, dispatch_stanza = core_process_stanza, notopen = true,
 			log = logger.init("bosh"..sid),	secure = consider_bosh_secure or request.secure,
 			ip = get_ip_from_request(request);
 		};
 		sessions[sid] = session;
 		local filter = initialize_filters(session);
 		session.log("debug", "BOSH session created for request from %s", session.ip);
 		log("info", "New BOSH session, assigned it sid '%s'", sid);
 		-- Send creation response
 		local creating_session = true;
 			end
 			return true;
 		end
 		request.sid = sid;
 	end
 	local session = sessions[sid];
 	if not session then
 		-- Unknown sid
 		log("info", "Client tried to use sid '%s' which we don't know about", sid);
 		response:send(tostring(st.stanza("body", { xmlns = xmlns_bosh, type = "terminate", condition = "item-not-found" })));
 		context.notopen = nil;
 		return;
 	end
 	if session.rid then
 		local rid = tonumber(attr.rid);
 		local diff = rid - session.rid;
 		if diff > 1 then
 			session.log("warn", "rid too large (means a request was lost). Last rid: %d New rid: %s", session.rid, attr.rid);
 			t_insert(session.requests, response);
 			return;
 		end
 		session.rid = rid;
 	end
 	if attr.type == "terminate" then
 		-- Client wants to end this session, which we'll do
 		-- after processing any stanzas in this request
 		session.bosh_terminate = true;
 	end
 		local response = context.response;
 		response.status_code = 400;
 		response:send();
 		return;
 	end
 	local session = sessions[context.sid];
 	if error == "stream-error" then -- Remote stream error, we close normally
 		session:close();
 	else
 		session:close({ condition = "bad-format", text = "Error processing stream" });
 			if request.conn then
 				sessions[request.context.sid].send("");
 			end
 		end
 	end
 	now = now - 3;
 	local n_dead_sessions = 0;
 	for session, close_after in pairs(inactive_sessions) do
 		if close_after < now then
 			(session.log or log)("debug", "BOSH client inactive too long, destroying session at %d", now);

changeset 5776	bd0ff8ae98a8
parent 5748	cef2a1122b43
child 6531	f0687c313cf1