summaryrefslogtreecommitdiff
path: root/client/Config.h
diff options
context:
space:
mode:
authorAlex Borisov <borisov.alexandr@rambler.ru>2011-11-12 00:42:46 +0200
committerAlex Borisov <borisov.alexandr@rambler.ru>2011-11-12 00:42:46 +0200
commit348104dd920480815504c28eaf12e193fd3e9ce9 (patch)
treeee2766908b00a36797204c0747300fc6f787ca37 /client/Config.h
parentd9a7ccf4eb0fe6d44cf1a7361b331889a98ff85b (diff)
Read all configs from server, everywhere. Docs. Code to represent server reconnection problem
Diffstat (limited to 'client/Config.h')
-rw-r--r--client/Config.h28
1 files changed, 22 insertions, 6 deletions
diff --git a/client/Config.h b/client/Config.h
index 8640d1e..26ee56c 100644
--- a/client/Config.h
+++ b/client/Config.h
@@ -10,11 +10,8 @@ using std::vector;
using std::string;
/**
- * @brief Singleton class that represents client configuration<br/>
- * At the first time this object is accessed config.cfg is read to
- * determine initial settings, server addresses, etc.<br/>
- * Then retries is made to connect to server and acqire actual config,
- * firewall list, etc.
+ * @brief represents client configuration<br/>
+ * When vreated config.cfg is read to determine basic settings, server addresses, etc.<br/>
*/
class Config
{
@@ -72,7 +69,7 @@ public:
/**
* @brief Update client configuration
- * @todo update config periodically on timer events
+ * @deprecated config is updated periodically on timer events now
*/
void AcquireConfig();
@@ -197,9 +194,28 @@ protected:
*/
Config();
+ /**
+ * @brief parse client configuration
+ * @param data string containing configuration parameters
+ */
void ParseConfig(string data);
+
+ /**
+ * @brief parse list of generic proxies
+ * @param data string containing list of ProxyEntryGeneric records
+ */
void ParseGenericProxies(string data);
+
+ /**
+ * @brief parse list of static proxies
+ * @param data string containing list of ProxyEntryStatic records
+ */
void ParseStaticPorxies(string data);
+
+ /**
+ * @brief parse firewall configuration
+ * @param data string containing list of FirewallEntry records
+ */
void ParseFirewalls(string data);
unsigned updateInterval;