diff options
Diffstat (limited to 'server/server/config.h')
| -rwxr-xr-x | server/server/config.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/server/server/config.h b/server/server/config.h index 5f2ea40..318831e 100755 --- a/server/server/config.h +++ b/server/server/config.h @@ -120,13 +120,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); @@ -167,26 +161,13 @@ private: 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; - } - }; 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; |