summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2012-03-22 10:12:23 +0200
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2012-03-22 10:12:23 +0200
commit3c4dd23396553bb8cadb668ebf9624be335b3019 (patch)
treeb13c51ef4f16a98e8acadf0578dc2a0b2563cc87 /server
parentd14df4141a0a881875ae5b36b481508612469fde (diff)
fixed static_proxy_entry class
Diffstat (limited to 'server')
-rwxr-xr-xserver/server/config.cpp6
-rwxr-xr-xserver/server/config.h6
2 files changed, 2 insertions, 10 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp
index ad5e3e0..cf218f4 100755
--- a/server/server/config.cpp
+++ b/server/server/config.cpp
@@ -94,12 +94,6 @@ void config::load_cvars()
p2 = cfg_str.find(';', p1);
}
}
-/* cvars.config_update_interval = get_int(cfg_str, "config_update_interval=", 300);
- cvars.client_update_interval = get_int(cfg_str, "client_update_interval=", 60000);
- cvars.welcome_msg = get_string(cfg_str, "welcome_msg=", "");
- cvars.top_text = get_string(cfg_str, "top_panel_text=", "");
- cvars.bottom_text = get_string(cfg_str, "bottom_panel_text=", "");
- cvars.speed_visibility = get_int(cfg_str, "speed_visibility=", 1); */
}
config::config(const char *pth): cfg_reload_thr(NULL), speed_test_thr(NULL)
diff --git a/server/server/config.h b/server/server/config.h
index 318831e..edf6d1c 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)
{}
@@ -158,7 +156,7 @@ private:
debug = 0;
dos_conn_count = 200;
bind_ip = "0.0.0.0";
- speed_test_file_url = "http://localhost/speed.test";
+ speed_test_file_url = "http://google.com";
}
};
std::string config_path, cli_config_path;