summaryrefslogtreecommitdiff
path: root/server/server/config.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'server/server/config.cpp')
-rwxr-xr-xserver/server/config.cpp44
1 files changed, 0 insertions, 44 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp
index cc972c6..d8a9cfa 100755
--- a/server/server/config.cpp
+++ b/server/server/config.cpp
@@ -64,7 +64,6 @@ void config::load_vars()
vars.bind_ip = get_string(cfg_str, "BindAddress=", "0.0.0.0");
vars.log_path = get_string(cfg_str, "LogPath=", "");
vars.dos_log_path = get_string(cfg_str, "DosLogPath=", "");
-// vars.proxifier_path = get_string(cfg_str, "ProxifierPath=", "c:/proxifier");
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);
@@ -473,45 +472,6 @@ void config::load_deleted_list(char* pth)
}
}
-/*std::list<config::p_proxy_entry> *config::make_p_proxy_list()
-{
- if(!p_proxy_list.empty())
- p_proxy_list.clear();
- if(!static_proxy_list.empty())
- {
- for(std::list<config::static_proxy_entry>::iterator i = static_proxy_list.begin(), end = static_proxy_list.end(); i != end; ++i)
- {
- p_proxy_entry e;
- e.enable_auth = (!i->login.empty())?true:false;
- e.host = i->host;
- e.id = !p_proxy_list.empty()?p_proxy_list.back().id+1:100;
- e.login = i->login;
- e.options = 0;
- e.password = i->password;
- e.port = i->port;
- e.type = i->type;
- p_proxy_list.push_back(e);
- }
- }
-
- if(!proxy_list.empty())
- {
- for(std::list<config::proxy_entry>::iterator i = proxy_list.begin(), end = proxy_list.end(); i != end; ++i)
- {
- p_proxy_entry e;
- e.enable_auth = (!i->login.empty())?true:false;
- e.host = i->host;
- e.id = !p_proxy_list.empty()?p_proxy_list.back().id+1:100;
- e.login = i->login;
- e.options = 0;
- e.password = i->password;
- e.port = i->port;
- e.type = i->type;
- p_proxy_list.push_back(e);
- }
- }
- return &p_proxy_list;
-}*/
const int config::ban_time()
{
@@ -549,10 +509,6 @@ const std::string& config::dos_log_path()
{
return vars.dos_log_path;
}
-/*const std::string& config::proxifier_path()
-{
- return vars.proxifier_path;
-}*/
std::list<config::proxy_entry> *config::get_proxy_list()
{
return &proxy_list;