summaryrefslogtreecommitdiff
path: root/server/server/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'server/server/config.h')
-rwxr-xr-xserver/server/config.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/server/server/config.h b/server/server/config.h
index 86c3988..0f6a695 100755
--- a/server/server/config.h
+++ b/server/server/config.h
@@ -14,6 +14,7 @@ public:
std::string host, login, password, country, state, city;
int port;
size_t speed;
+ std::list<size_t> speed_list;
proxy_type type;
proxy_entry(): port(0), speed(0), type(UNKNOWN)
{}
@@ -29,7 +30,7 @@ public:
type = t;
}
};
- struct p_proxy_entry
+/* struct p_proxy_entry
{
std::string host, login, password;
int port, id, options;
@@ -64,12 +65,13 @@ public:
{
id = 100;
}
- };
+ };*/
struct static_proxy_entry
{
int port, position;
size_t speed;
+ std::list<size_t> speed_list;
std::string host, login, password, label;
proxy_type type;
static_proxy_entry(): port(0), position(0), speed(0), type(UNKNOWN)
@@ -178,7 +180,7 @@ public:
std::list<std::string> *get_deleted_list();
std::list<upload_entry> *get_upload_list();
std::list<conn_server> *get_server_list();
- std::list<p_proxy_entry> *make_p_proxy_list();
+// std::list<p_proxy_entry> *make_p_proxy_list();
private:
struct cfg_data
{
@@ -222,7 +224,7 @@ private:
std::list<std::string> firewall_list, deleted_list;
std::list<upload_entry> upload_list;
std::list<conn_server> servers_list;
- std::list<p_proxy_entry> p_proxy_list;
+// std::list<p_proxy_entry> p_proxy_list;
boost::thread *cfg_reload_thr, *speed_test_thr;
boost::mutex lists_mutex;
};