summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2011-12-18 04:02:18 +0200
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2011-12-18 04:02:18 +0200
commitd0a81023e011a943bc2b58dc7c5ee0c287ec2992 (patch)
treea5b8e7af4cce24683ecf35eead10c3d9a1ba9655
parent198ddceba5c220197a954db17bd18c0fa99ff558 (diff)
added "SpeedTestFileUrl=" option
-rwxr-xr-xserver/server/config.cpp5
-rwxr-xr-xserver/server/config.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp
index 688d818..fafa1ad 100755
--- a/server/server/config.cpp
+++ b/server/server/config.cpp
@@ -39,6 +39,7 @@ void config::load_vars()
vars.ignore_ssl_errors = get_int(cfg_str, "IgnoreSslErrors=", 0);
vars.config_reload_interval = get_int(cfg_str, "ConfigReloadInterval=", 600);
vars.proxy_check_interval = get_int(cfg_str, "ProxyCheckInterval=", 6000);
+ vars.speed_test_file_url = get_string(cfg_str, "SpeedTestFileUrl=", "http://localhost/speed.test");
}
}
@@ -593,6 +594,10 @@ const std::string& config::c_bottom_text()
{
return cvars.bottom_text;
}
+const std::string& config::speed_test_file_url()
+{
+ return vars.speed_test_file_url;
+}
std::list<config::conn_server> *config::get_server_list()
{
diff --git a/server/server/config.h b/server/server/config.h
index efbd1cc..ba56357 100755
--- a/server/server/config.h
+++ b/server/server/config.h
@@ -170,6 +170,7 @@ public:
const std::string& log_path();
const std::string& proxifier_path();
const std::string& dos_log_path();
+ const std::string& speed_test_file_url();
std::list<proxy_entry> *get_proxy_list();
std::list<static_proxy_entry> *get_static_proxy_list();
std::list<std::string> *get_firewall_list();
@@ -182,7 +183,7 @@ private:
{
int ban_time, conn_count, check_interval, debug, dos_conn_count, conn_time, config_reload_interval, proxy_check_interval;
bool ignore_ssl_errors;
- std::string log_path, bind_ip, dos_log_path, proxifier_path;
+ std::string log_path, bind_ip, dos_log_path, proxifier_path, speed_test_file_url;
cfg_data()
{
ignore_ssl_errors = false;
@@ -195,6 +196,7 @@ private:
dos_conn_count = 200;
bind_ip = "0.0.0.0";
proxifier_path = "c:/proxifier";
+ speed_test_file_url = "http://localhost/speed.test";
}
};
struct cli_cfg_data