Merge branch 'master' of ssh://sss.chaoslab.ru//home/private_git/proxy_ui

1 files changed, 11 insertions, 3 deletions

diff --git a/client/Config.h b/client/Config.h
index f7653e0..a6e9e6a 100644
--- a/client/Config.h
+++ b/client/Config.h
@@ -166,7 +166,7 @@ public:
 	 * @param	city		name of city to get list of proxies for
 	 * @return	Alphabetically sorted vector<string> with unique proxy names
 	 */
-	vector<string> GetProxies(string &country, string &city);
+	vector<Proxy> GetProxies(string &country, string &city);
 	
 	/**
 	 * @brief	Get list of proxy server addresses in particular country, state and city<br/>
@@ -176,16 +176,24 @@ public:
 	 * @param	city		name of city to get list of proxies for
 	 * @return	Alphabetically sorted vector<string> with unique proxy names
 	 */
-	vector<string> GetProxies(string &country, string &state, string &city);
+	vector<Proxy> GetProxies(string &country, string &state, string &city);
 	
 	/**
 	 * @brief	Get static proxy entry by name
 	 * @param	name	static proxy name
-	 * @return	ProxyEntryStatic object on success or false otherwise
+	 * @return	pointer to ProxyEntryStatic object on success or NULL otherwise
 	 */
 	ProxyEntryStatic* GetStaticProxy(string& name);
 	
 	/**
+	 * @brief	Getgeneric proxy entry by host name and port values
+	 * @param	host	host name of proxy to check for
+	 * 			port	port value of proxy to check for
+	 * @return	pointer to ProxyEntryGeneric object on success or NULL otherwise
+	 */
+	ProxyEntryGeneric* GetGenericProxy(string host, short port);
+	
+	/**
 	 * @brief	Get list of static proxy entries
 	 * @param	line		number of GUI line proxy list associated with
 	 * @return	List of static proxy entries sorted by speed in descending order