1 files changed, 94 insertions, 48 deletions

diff --git a/src/site_comm.cpp b/src/site_comm.cpp
index 5294d01..0df4b5c 100644
--- a/src/site_comm.cpp
+++ b/src/site_comm.cpp
@@ -2,7 +2,12 @@
 #include <istream>
 #include <ostream>
 #include <string>
+#include <sstream>
+#include <queue>
 #include <boost/asio.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/locks.hpp>
 
 #include "config.h"
 #include "site_comm.h"
@@ -12,64 +17,105 @@ using boost::asio::ip::tcp;
 site_comm::site_comm(config &config)
 {
 	conf = config;
+	t_active = false;
 }
 
-bool site_comm::expire_token(int torrent, int user)
+bool site_comm::all_clear() {
+	return (token_queue.size() == 0);
+}
+
+void site_comm::expire_token(int torrent, int user)
+{
+	std::stringstream token_pair;
+	token_pair << user << ':' << torrent;
+	if (expire_token_buffer != "") {
+		expire_token_buffer += ",";
+	}
+	expire_token_buffer += token_pair.str();
+	if (expire_token_buffer.length() > 350) {
+		std::cout << "Flushing overloaded token buffer" << std::endl;
+		boost::mutex::scoped_lock lock(expire_queue_lock);
+		token_queue.push(expire_token_buffer);
+		expire_token_buffer.clear();
+	}
+}
+
+void site_comm::flush_tokens()
+{
+	boost::mutex::scoped_lock lock(expire_queue_lock);
+	size_t qsize = token_queue.size();
+	if (verbose_flush || qsize > 0) {
+		std::cout << "Token expire queue size: " << qsize << std::endl;
+	}
+	if (expire_token_buffer == "") {
+		return;
+	}
+	token_queue.push(expire_token_buffer);
+	expire_token_buffer.clear();
+	if (t_active == false) {
+		boost::thread thread(&site_comm::do_flush_tokens, this);
+	}
+}
+
+void site_comm::do_flush_tokens()
 {
+	t_active = true;
 	try {
-		boost::asio::io_service io_service;
-	
-		tcp::resolver resolver(io_service);
-	 	tcp::resolver::query query(conf.site_host, "http");
-		tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
-		tcp::resolver::iterator end;
-
-		tcp::socket socket(io_service);
-		boost::system::error_code error = boost::asio::error::host_not_found;
-		while (error && endpoint_iterator != end) {
-			socket.close();
-			socket.connect(*endpoint_iterator++, error);
-		}
-		if (error) {
-			throw boost::system::system_error(error);
-		}
+		while (token_queue.size() > 0) {
+			boost::asio::io_service io_service;
 
-		boost::asio::streambuf request;
-		std::ostream request_stream(&request);
-		request_stream << "GET /tools.php?key=" << conf.site_password << "&type=expiretoken&action=ocelot&torrentid=" << torrent << "&userid=" << user << " HTTP/1.0\r\n";
-		request_stream << "Host: " << conf.site_host << "\r\n";
-		request_stream << "Accept: */*\r\n";
-		request_stream << "Connection: close\r\n\r\n";
-
-		boost::asio::write(socket, request);
-
-		boost::asio::streambuf response;
-		boost::asio::read_until(socket, response, "\r\n");
-
-		std::istream response_stream(&response);
-		std::string http_version;
-		response_stream >> http_version;
-		unsigned int status_code;
-		response_stream >> status_code;
-		std::string status_message;
-		std::getline(response_stream, status_message);
-
-		if (!response_stream || http_version.substr(0, 5) != "HTTP/") {
-			std::cout << "Invalid response" << std::endl;
-			return false;
-		}
+			tcp::resolver resolver(io_service);
+			tcp::resolver::query query(conf.site_host, "http");
+			tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
+			tcp::resolver::iterator end;
+
+			tcp::socket socket(io_service);
+			boost::system::error_code error = boost::asio::error::host_not_found;
+			while (error && endpoint_iterator != end) {
+				socket.close();
+				socket.connect(*endpoint_iterator++, error);
+			}
+			if (error) {
+				throw boost::system::system_error(error);
+			}
+
+			boost::asio::streambuf request;
+			std::ostream request_stream(&request);
+			request_stream << "GET " << conf.site_path << "/tools.php?key=" << conf.site_password;
+			request_stream << "&type=expiretoken&action=ocelot&tokens=" << token_queue.front() << " HTTP/1.0\r\n";
+			request_stream << "Host: " << conf.site_host << "\r\n";
+			request_stream << "Accept: */*\r\n";
+			request_stream << "Connection: close\r\n\r\n";
+
+			boost::asio::write(socket, request);
+
+			boost::asio::streambuf response;
+			boost::asio::read_until(socket, response, "\r\n");
+
+			std::istream response_stream(&response);
+			std::string http_version;
+			response_stream >> http_version;
+			unsigned int status_code;
+			response_stream >> status_code;
+			std::string status_message;
+			std::getline(response_stream, status_message);
+
+			if (!response_stream || http_version.substr(0, 5) != "HTTP/") {
+				std::cout << "Invalid response" << std::endl;
+				continue;
+			}
 
-		if (status_code == 200) {
-			return true;
-		} else {
-			std::cout << "Response returned with status code " << status_code << " when trying to expire a token!" << std::endl;;
-			return false;
+			if (status_code == 200) {
+				boost::mutex::scoped_lock lock(expire_queue_lock);
+				token_queue.pop();
+			} else {
+				std::cout << "Response returned with status code " << status_code << " when trying to expire a token!" << std::endl;;
+			}
 		}
 	} catch (std::exception &e) {
 		std::cout << "Exception: " << e.what() << std::endl;
-		return false;
 	}
-	return true;
+	t_active = false;
 }
 
 site_comm::~site_comm()