1 files changed, 13 insertions, 39 deletions

diff --git a/server/server/config.h b/server/server/config.h
index 5f2ea40..4afa63d 100755
--- a/server/server/config.h
+++ b/server/server/config.h
@@ -37,9 +37,7 @@ public:
 
 	struct static_proxy_entry : public proxy_entry_base
 	{
-		int port, position;
-		size_t speed;
-		std::list<size_t> speed_list;
+		int position;
 		std::string label;
 		static_proxy_entry(): position(0)
 		{}
@@ -120,13 +118,7 @@ public:
 	const int check_interval();
 	const int debug();
 	const int dos_conn_count();
-	const int c_cfg_upd_int();
-	const int c_cli_upd_int();
-	bool c_speed_visibility();
-	const std::string& c_welcome_msg();
-	const std::string& c_cfg_download_msg();
-	const std::string& c_top_text();
-	const std::string& c_bottom_text();
+	std::list<std::string>* cli_cfg();
 	void load_vars();
 	void load_cvars();
 	void load_proxy_list(char* pth = NULL);
@@ -136,6 +128,7 @@ public:
 	void load_deleted_list(char* pth = NULL);
 	void load_servers_list(char* pth = NULL);
 	bool ignore_ssl_errors();
+	bool log_speed();
 	const std::string& bind_ip();
 	const std::string& log_path();
 	const std::string& proxifier_path();
@@ -147,46 +140,27 @@ public:
 	std::list<std::string> *get_deleted_list();
 	std::list<upload_entry> *get_upload_list();
 	std::list<conn_server> *get_server_list();
+	boost::mutex &get_lists_mutex()
+	{
+		return lists_mutex;
+	}
 private:
 	struct cfg_data
 	{
-		int ban_time, conn_count, check_interval, debug, dos_conn_count, conn_time, config_reload_interval, proxy_check_interval;
-		bool ignore_ssl_errors;
+		int ban_time, conn_count, check_interval, dos_conn_count, conn_time, config_reload_interval, proxy_check_interval;
+		bool ignore_ssl_errors, log_speed, debug;
 		std::string log_path, bind_ip, dos_log_path, speed_test_file_url;
-		cfg_data()
-		{
-			ignore_ssl_errors = false;
-			ban_time = conn_time = 60;
-			config_reload_interval = 600;
-			proxy_check_interval = 3600;
-			conn_count = 30;
-			check_interval = 30;
-			debug = 0;
-			dos_conn_count = 200;
-			bind_ip = "0.0.0.0";
-			speed_test_file_url = "http://localhost/speed.test";
-		}
-	};
-	struct cli_cfg_data
-	{
-		int config_update_interval, client_update_interval;
-		std::string welcome_msg, cfg_downloaded_msg, top_text, bottom_text;
-		bool speed_visibility;
-		cli_cfg_data()
-		{
-			config_update_interval = 300;
-			client_update_interval = 60000;
-			speed_visibility = false;
-		}
+		cfg_data(): ban_time(60), check_interval(30), dos_conn_count(200), conn_time(60), config_reload_interval(600), proxy_check_interval(3600),
+			ignore_ssl_errors(false), log_speed(false), debug(false)
+		{}
 	};
 	std::string config_path, cli_config_path;
 	const int get_int(const std::string& data, const char* var, int default_);
 	const std::string get_string(const std::string& data, const char* var, const std::string& default_);
 	cfg_data vars;
-	cli_cfg_data cvars;
 	std::list<proxy_entry> proxy_list;
 	std::list<static_proxy_entry> static_proxy_list;
-	std::list<std::string> firewall_list, deleted_list;
+	std::list<std::string> firewall_list, deleted_list, cvars;
 	std::list<upload_entry> upload_list;
 	std::list<conn_server> servers_list;
 	boost::thread *cfg_reload_thr, *speed_test_thr;