From 348104dd920480815504c28eaf12e193fd3e9ce9 Mon Sep 17 00:00:00 2001 From: Alex Borisov Date: Sat, 12 Nov 2011 00:42:46 +0200 Subject: Read all configs from server, everywhere. Docs. Code to represent server reconnection problem --- client/Config.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'client/Config.h') 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
- * At the first time this object is accessed config.cfg is read to - * determine initial settings, server addresses, etc.
- * Then retries is made to connect to server and acqire actual config, - * firewall list, etc. + * @brief represents client configuration
+ * When vreated config.cfg is read to determine basic settings, server addresses, etc.
*/ 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; -- cgit v1.2.3