Multi-pool final version (#90)

* Multi-pool first draft

* Fix wspace from new IDE

* Better TLS error message

* Fix TLS bug

* Don't put dev pool on stats + pool change-back

* bug fixes

* Error message work

* fix win build

* add per-pool nicehash setting

* Fix bugs

* rm debug msg

* Multipool guided setup

* Support TLS and Nicehash in config

* prelim jconf changes

* final multipool changes

* increase default retry_time to 30, fix mac erro

* rm debug dev pool settings

* Fix another source of connect runaway

1 files changed, 17 insertions, 14 deletions

diff --git a/xmrstak/jconf.hpp b/xmrstak/jconf.hpp
index 48b47b5..b68ef38 100644
--- a/xmrstak/jconf.hpp
+++ b/xmrstak/jconf.hpp
@@ -19,12 +19,23 @@ public:
 	};
 
 	bool parse_config(const char* sFilename = xmrstak::params::inst().configFile.c_str());
-
-	struct thd_cfg {
-		bool bDoubleMode;
-		bool bNoPrefetch;
-		long long iCpuAff;
+	
+	struct pool_cfg {
+		const char* sPoolAddr;
+		const char* sWalletAddr;
+		const char* sPasswd;
+		bool nicehash;
+		bool tls;
+		const char* tls_fingerprint;
+		size_t raw_weight;
+		double weight;
 	};
+	
+	size_t wt_max;
+	size_t wt_min;
+	
+	uint64_t GetPoolCount();
+	bool GetPoolConfig(size_t id, pool_cfg& cfg);
 
 	enum slow_mem_cfg {
 		always_use,
@@ -34,13 +45,8 @@ public:
 		unknown_value
 	};
 
-	bool GetTlsSetting();
 	bool TlsSecureAlgos();
-	const char* GetTlsFingerprint();
-
-	const char* GetPoolAddress();
-	const char* GetPoolPwd();
-	const char* GetWalletAddress();
+	
 	const std::string GetCurrency();
 	bool IsCurrencyMonero();
 
@@ -59,9 +65,6 @@ public:
 
 	bool PreferIpv4();
 
-
-	bool NiceHashMode();
-
 	inline bool HaveHardwareAes() { return bHaveAes; }
 
 	static void cpuid(uint32_t eax, int32_t ecx, int32_t val[4]);