Thread: [Dcplusplus-commit] SF.net SVN: dcplusplus: [617] dcplusplus/trunk (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 617
Author:   arnetheduck
Date:     2006-06-17 15:24:01 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/dcplusplus/?rev=617&view=rev

Log Message:
-----------
Partial commit, more to come in a few minutes

Modified Paths:
--------------
    dcplusplus/trunk/Example.xml
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/client/AdcHub.cpp
    dcplusplus/trunk/client/AdcHub.h
    dcplusplus/trunk/client/BufferedSocket.cpp
    dcplusplus/trunk/client/Client.cpp
    dcplusplus/trunk/client/Client.h
    dcplusplus/trunk/client/ClientManager.cpp
    dcplusplus/trunk/client/ClientManager.h
    dcplusplus/trunk/client/CryptoManager.cpp
    dcplusplus/trunk/client/CryptoManager.h
    dcplusplus/trunk/client/DCPlusPlus.cpp
    dcplusplus/trunk/client/FavoriteUser.h
    dcplusplus/trunk/client/NmdcHub.cpp
    dcplusplus/trunk/client/NmdcHub.h
    dcplusplus/trunk/client/QueueManager.cpp
    dcplusplus/trunk/client/SSLSocket.cpp
    dcplusplus/trunk/client/SSLSocket.h
    dcplusplus/trunk/client/SettingsManager.cpp
    dcplusplus/trunk/client/SettingsManager.h
    dcplusplus/trunk/client/StringDefs.cpp
    dcplusplus/trunk/client/StringDefs.h
    dcplusplus/trunk/client/User.cpp
    dcplusplus/trunk/client/User.h
    dcplusplus/trunk/client/Util.cpp
    dcplusplus/trunk/client/Util.h
    dcplusplus/trunk/windows/CommandDlg.cpp
    dcplusplus/trunk/windows/CommandDlg.h
    dcplusplus/trunk/windows/HubFrame.cpp
    dcplusplus/trunk/windows/MainFrm.cpp
    dcplusplus/trunk/windows/QueuePage.cpp
    dcplusplus/trunk/windows/UPnP.cpp
    dcplusplus/trunk/windows/UPnP.h
Modified: dcplusplus/trunk/Example.xml
===================================================================

--- dcplusplus/trunk/Example.xml	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/Example.xml	2006-06-17 22:24:01 UTC (rev 617)
@@ -130,6 +130,7 @@
 		<String Name="File">File</String>
 		<String Name="Files">Files</String>
 		<String Name="FileHasNoTth">This file has no TTH</String>
+		<String Name="FileIsAlreadyQueued">This file is already queued</String>
 		<String Name="FileListDiff">Subtract list</String>
 		<String Name="FileListRefreshFailed">File list refresh failed: </String>
 		<String Name="FileListRefreshFinished">File list refresh finished</String>
@@ -406,6 +407,7 @@
 		<String Name="SettingsDefaultAwayMsg">Default away message</String>
 		<String Name="SettingsDirect">Direct connection</String>
 		<String Name="SettingsDirectories">Directories</String>
+		<String Name="SettingsDontDlAlreadyQueued">Don't download files already in the queue</String>
 		<String Name="SettingsDontDlAlreadyShared">Don't download files already in share</String>
 		<String Name="SettingsDownloadDirectory">Default download directory</String>
 		<String Name="SettingsDownloadLimits">Limits</String>

Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/changelog.txt	2006-06-17 22:24:01 UTC (rev 617)
@@ -14,8 +14,11 @@
 * [bug 959] Code cleanup (thanks pothead)
 * [bug 966] Max hash speed fixed when fast hashing method is not used (thanks steven sheehy)
 * [bug 967] Fixed path case-sensitivity issue (thanks steven sheehy)
+* Fixed auto-reconnect
+* [bug 936] Fixed duplicate entries in search hubs
+* Fixed some hub title display issues
+* Some code spring cleanup
 
-
 -- 0.691 2006-06-03 -- 
 * Links to bugzilla in html changelog
 * [bug 122] Added userlist filter (thanks trem)

Modified: dcplusplus/trunk/client/AdcHub.cpp
===================================================================
--- dcplusplus/trunk/client/AdcHub.cpp	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/AdcHub.cpp	2006-06-17 22:24:01 UTC (rev 617)
@@ -29,7 +29,7 @@
 #include "Util.h"
 #include "UserCommand.h"
 #include "FavoriteManager.h"
-#include "SSLSocket.h"
+#include "CryptoManager.h"
 
 const string AdcHub::CLIENT_PROTOCOL("ADC/0.10");
 const string AdcHub::SECURE_CLIENT_PROTOCOL("ADCS/0.10");
@@ -453,8 +453,8 @@
 
 	ADDPARAM("ID", ClientManager::getInstance()->getMyCID().toBase32());
 	ADDPARAM("PD", ClientManager::getInstance()->getMyPID().toBase32());
-	ADDPARAM("NI", getMyIdentity().getNick());
-	ADDPARAM("DE", getMyIdentity().getDescription());
+	ADDPARAM("NI", getCurrentNick());
+	ADDPARAM("DE", getCurrentDescription());
 	ADDPARAM("SL", Util::toString(SETTING(SLOTS)));
 	ADDPARAM("SS", ShareManager::getInstance()->getShareSizeString());
 	ADDPARAM("SF", Util::toString(ShareManager::getInstance()->getSharedFiles()));
@@ -478,7 +478,7 @@
 	}
 
 	string su;
-	if(SSLSocketFactory::getInstance()->hasCerts()) {
+	if(CryptoManager::getInstance()->hasCerts()) {
 		su += ADCS_FEATURE + ",";
 	} 
 	
@@ -548,17 +548,6 @@
 	fire(ClientListener::Failed(), this, aLine);
 }
 
-void AdcHub::on(TimerManagerListener::Second, u_int32_t aTick) throw() {
-	if(socket && (getLastActivity() + getReconnDelay() * 1000) < aTick) {
-		// Nothing's happened for ~120 seconds, check if we're connected, if not, try to connect...
-		if(!isConnected()) {
-			// Try to reconnect...
-			if(reconnect && !getAddress().empty())
-				Client::connect();
-		}
-	}
-}
-
 void AdcHub::send(const AdcCommand& cmd) {
 	dcassert(socket);
 	if(!socket)

Modified: dcplusplus/trunk/client/AdcHub.h
===================================================================
--- dcplusplus/trunk/client/AdcHub.h	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/AdcHub.h	2006-06-17 22:24:01 UTC (rev 617)
@@ -30,7 +30,7 @@
 
 class ClientManager;
 
-class AdcHub : public Client, public CommandHandler<AdcHub>, private TimerManagerListener {
+class AdcHub : public Client, public CommandHandler<AdcHub> {
 public:
 	using Client::send;
 
@@ -119,7 +119,6 @@
 	virtual void on(Connected) throw();
 	virtual void on(Line, const string& aLine) throw();
 	virtual void on(Failed, const string& aLine) throw();
-	virtual void on(TimerManagerListener::Second, u_int32_t aTick) throw();
 };
 
 #endif // !defined(ADC_HUB_H)

Modified: dcplusplus/trunk/client/BufferedSocket.cpp
===================================================================
--- dcplusplus/trunk/client/BufferedSocket.cpp	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/BufferedSocket.cpp	2006-06-17 22:24:01 UTC (rev 617)
@@ -27,6 +27,7 @@
 
 #include "Streams.h"
 #include "SSLSocket.h"
+#include "CryptoManager.h"
 
 // Polling is used for tasks...should be fixed...
 #define POLL_TIMEOUT 250
@@ -75,7 +76,7 @@
 	dcassert(!sock);
 	
 	dcdebug("BufferedSocket::accept() %p\n", (void*)this);
-	sock = secure ? SSLSocketFactory::getInstance()->getClientSocket() : new Socket;
+	sock = secure ? CryptoManager::getInstance()->getClientSocket() : new Socket;
 
 	sock->accept(srv);
 	if(SETTING(SOCKET_IN_BUFFER) > 0)
@@ -103,7 +104,7 @@
 	dcassert(!sock);
 
 	dcdebug("BufferedSocket::connect() %p\n", (void*)this);
-	sock = secure ? SSLSocketFactory::getInstance()->getClientSocket() : new Socket;
+	sock = secure ? CryptoManager::getInstance()->getClientSocket() : new Socket;
 
 	sock->create();
 	if(SETTING(SOCKET_IN_BUFFER) >= 1024)

Modified: dcplusplus/trunk/client/Client.cpp
===================================================================
--- dcplusplus/trunk/client/Client.cpp	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/Client.cpp	2006-06-17 22:24:01 UTC (rev 617)
@@ -29,20 +29,31 @@
 Client::Counts Client::counts;
 
 Client::Client(const string& hubURL, char separator_, bool secure_) : 
-	reconnDelay(120), lastActivity(0), registered(false), socket(NULL), 
+	myIdentity(ClientManager::getInstance()->getMe(), 0),
+	reconnDelay(120), lastActivity(GET_TICK()), registered(false), autoReconnect(true), socket(0), 
 	hubUrl(hubURL), port(0), separator(separator_),
 	secure(secure_), countType(COUNT_UNCOUNTED)
 {
 	string file;
 	Util::decodeUrl(hubURL, address, port, file);
+
+	TimerManager::getInstance()->addListener(this);
 }
 
 Client::~Client() throw() {
 	dcassert(!socket);
+	TimerManager::getInstance()->removeListener(this);
 	updateCounts(true);
 }
 
+void Client::reconnect() {
+	disconnect(true);
+	setAutoReconnect(true);
+	resetActivtiy();
+}
+
 void Client::shutdown() {
+
 	if(socket) {
 		BufferedSocket::putSocket(socket);
 		socket = 0;
@@ -52,29 +63,32 @@
 void Client::reloadSettings(bool updateNick) {
 	FavoriteHubEntry* hub = FavoriteManager::getInstance()->getFavoriteHubEntry(getHubUrl());
 	if(hub) {
-		if(updateNick)
-			getMyIdentity().setNick(checkNick(hub->getNick(true)));
+		if(updateNick) {
+			setCurrentNick(checkNick(hub->getNick(true)));
+		}
+
 		if(!hub->getUserDescription().empty()) {
-			getMyIdentity().setDescription(hub->getUserDescription());
+			setCurrentDescription(hub->getUserDescription());
 		} else {
-			getMyIdentity().setDescription(SETTING(DESCRIPTION));
+			setCurrentDescription(SETTING(DESCRIPTION));
 		}
 		setPassword(hub->getPassword());
 	} else {
-		getMyIdentity().setNick(checkNick(SETTING(NICK)));
-		getMyIdentity().setDescription(SETTING(DESCRIPTION));
+		setCurrentNick(checkNick(SETTING(NICK)));
+		setCurrentDescription(SETTING(DESCRIPTION));
 	}
-	getMyIdentity().setUser(ClientManager::getInstance()->getMe());
-	getMyIdentity().setHubUrl(getHubUrl());
 }
 
 void Client::connect() {
 	if(socket)
 		BufferedSocket::putSocket(socket);
 
+	setAutoReconnect(true);
 	setReconnDelay(120 + Util::rand(0, 60));
 	reloadSettings(true);
 	setRegistered(false);
+	setMyIdentity(Identity());
+	setHubIdentity(Identity());
 
 	try {
 		socket = BufferedSocket::getSocket(separator);
@@ -97,10 +111,6 @@
 	socket->disconnect(graceLess);
 }
 
-void Client::updateActivity() {
-	lastActivity = GET_TICK();
-}
-
 void Client::updateCounts(bool aRemove) {
 	// We always remove the count and then add the correct one if requested...
 	if(countType == COUNT_NORMAL) {
@@ -117,7 +127,7 @@
 		if(getMyIdentity().isOp()) {
 			Thread::safeInc(counts.op);
 			countType = COUNT_OP;
-		} else if(registered) {
+		} else if(getMyIdentity().isRegistered()) {
 			Thread::safeInc(counts.registered);
 			countType = COUNT_REGISTERED;
 		} else {
@@ -145,3 +155,10 @@
 		return Util::getLocalIp();
 	return lip;
 }
+
+void Client::on(Second, u_int32_t aTick) throw() {
+	if(getAutoReconnect() && !isConnected() && (getLastActivity() + getReconnDelay() * 1000) < aTick) {
+		// Try to reconnect...
+		connect();
+	}
+}

Modified: dcplusplus/trunk/client/Client.h
===================================================================
--- dcplusplus/trunk/client/Client.h	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/Client.h	2006-06-17 22:24:01 UTC (rev 617)
@@ -26,6 +26,7 @@
 #include "User.h"
 #include "BufferedSocket.h"
 #include "SettingsManager.h"
+#include "TimerManager.h"
 
 class Client;
 class AdcCommand;
@@ -77,7 +78,7 @@
 };
 
 /** Yes, this should probably be called a Hub */
-class Client : public Speaker<ClientListener>, public BufferedSocketListener {
+class Client : public Speaker<ClientListener>, public BufferedSocketListener, protected TimerManagerListener {
 public:
 	typedef Client* Ptr;
 	typedef list<Ptr> List;
@@ -125,6 +126,8 @@
 		return sm;
 	}
 
+	void reconnect();
+
 	void shutdown();
 
 	void send(const string& aMessage) { send(aMessage.c_str(), aMessage.length()); }
@@ -140,7 +143,6 @@
 	const string& getHubName() const { return getHubIdentity().getNick().empty() ? getHubUrl() : getHubIdentity().getNick(); }
 	const string& getHubDescription() const { return getHubIdentity().getDescription(); }
 
-	Identity& getMyIdentity() { return myIdentity; }
 	Identity& getHubIdentity() { return hubIdentity; }
 
 	const string& getHubUrl() const { return hubUrl; }
@@ -152,7 +154,10 @@
 	GETSET(u_int32_t, reconnDelay, ReconnDelay);
 	GETSET(u_int32_t, lastActivity, LastActivity);
 	GETSET(bool, registered, Registered);
+	GETSET(bool, autoReconnect, AutoReconnect);
 
+	GETSET(string, currentNick, CurrentNick);
+	GETSET(string, currentDescription, CurrentDescription);
 protected:
 	friend class ClientManager;
 	Client(const string& hubURL, char separator, bool secure_);
@@ -171,13 +176,17 @@
 	Counts lastCounts;
 
 	void updateCounts(bool aRemove);
-	void updateActivity();
+	void updateActivity() { lastActivity = GET_TICK(); }
+	void resetActivtiy() { lastActivity = 0; }
 
 	/** Reload details from favmanager or settings */
 	void reloadSettings(bool updateNick);
 
 	virtual string checkNick(const string& nick) = 0;
 
+	// TimerManagerListener
+	virtual void on(Second, u_int32_t aTick) throw();
+
 private:
 
 	enum CountType {
@@ -196,12 +205,13 @@
 	u_int16_t port;
 	char separator;
 	bool secure;
-
 	CountType countType;
 
 	// BufferedSocketListener
 	virtual void on(Connecting) throw() { fire(ClientListener::Connecting(), this); }
 	virtual void on(Connected) throw() { updateActivity(); ip = socket->getIp(); fire(ClientListener::Connected(), this); }
+
+
 };
 
 #endif // !defined(CLIENT_H)

Modified: dcplusplus/trunk/client/ClientManager.cpp
===================================================================
--- dcplusplus/trunk/client/ClientManager.cpp	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/ClientManager.cpp	2006-06-17 22:24:01 UTC (rev 617)
@@ -405,14 +405,6 @@
 	SearchManager::getInstance()->respond(adc, from);
 }
 
-Identity ClientManager::getIdentity(const User::Ptr& aUser) {
-	OnlineIter i = onlineUsers.find(aUser->getCID());
-	if(i != onlineUsers.end()) {
-		return i->second->getIdentity();
-	}
-	return Identity(aUser, Util::emptyString, 0);
-}
-
 void ClientManager::search(int aSizeMode, int64_t aSize, int aFileType, const string& aString, const string& aToken) {
 	Lock l(cs);
 	

Modified: dcplusplus/trunk/client/ClientManager.h
===================================================================
--- dcplusplus/trunk/client/ClientManager.h	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/ClientManager.h	2006-06-17 22:24:01 UTC (rev 617)
@@ -89,8 +89,6 @@
 	void lock() throw() { cs.enter(); }
 	void unlock() throw() { cs.leave(); }
 
-	Identity getIdentity(const User::Ptr& aUser);
-
 	Client::List& getClients() { return clients; }
 
 	string getCachedIp() const { Lock l(cs); return cachedIp; }

Modified: dcplusplus/trunk/client/CryptoManager.cpp
===================================================================
--- dcplusplus/trunk/client/CryptoManager.cpp	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/CryptoManager.cpp	2006-06-17 22:24:01 UTC (rev 617)
@@ -24,13 +24,118 @@
 #include "BitInputStream.h"
 #include "BitOutputStream.h"
 #include "ResourceManager.h"
+#include "LogManager.h"
 
+#include <openssl/ssl.h>
+
 #ifdef _WIN32
 #include "../bzip2/bzlib.h"
 #else
 #include <bzlib.h>
 #endif
 
+CryptoManager::CryptoManager() 
+:	
+	clientContext(SSL_CTX_new(TLSv1_client_method())), 
+	serverContext(SSL_CTX_new(TLSv1_server_method())), 
+	dh(DH_new()), 
+	certsLoaded(false), 
+	lock("EXTENDEDPROTOCOLABCABCABCABCABCABC"), 
+	pk("DCPLUSPLUS" VERSIONSTRING "ABCABC")
+{
+	static unsigned char dh512_p[] =
+	{
+		0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
+			0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
+			0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
+			0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
+			0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
+			0x47,0x74,0xE8,0x33,
+	};
+
+	static unsigned char dh512_g[] =
+	{
+		0x02,
+	};
+
+	if(dh) {
+		dh->p = BN_bin2bn(dh512_p, sizeof(dh512_p), 0);
+		dh->g = BN_bin2bn(dh512_g, sizeof(dh512_g), 0);
+
+		if (!dh->p || !dh->g) {
+			DH_free(dh);
+			dh = 0;
+		} else {
+			SSL_CTX_set_tmp_dh(serverContext, dh);
+		}
+	}
+}
+
+CryptoManager::~CryptoManager() {
+	if(serverContext)
+		SSL_CTX_free(serverContext);
+	if(clientContext)
+		SSL_CTX_free(clientContext);
+	if(dh)
+		DH_free(dh);
+}
+
+
+void CryptoManager::loadCertificates() throw() {
+	SSL_CTX_set_verify(serverContext, SSL_VERIFY_NONE, 0);
+	SSL_CTX_set_verify(clientContext, SSL_VERIFY_NONE, 0);
+
+	if(!SETTING(SSL_CERTIFICATE_FILE).empty()) {
+		if(SSL_CTX_use_certificate_file(serverContext, SETTING(SSL_CERTIFICATE_FILE).c_str(), SSL_FILETYPE_PEM) != SSL_SUCCESS) {
+			LogManager::getInstance()->message("Failed to load certificate file");
+			return;
+		}
+		if(SSL_CTX_use_certificate_file(clientContext, SETTING(SSL_CERTIFICATE_FILE).c_str(), SSL_FILETYPE_PEM) != SSL_SUCCESS) {
+			LogManager::getInstance()->message("Failed to load certificate file");
+			return;
+		}
+	}
+
+	if(!SETTING(SSL_PRIVATE_KEY_FILE).empty()) {
+		if(SSL_CTX_use_PrivateKey_file(serverContext, SETTING(SSL_PRIVATE_KEY_FILE).c_str(), SSL_FILETYPE_PEM) != SSL_SUCCESS) {
+			LogManager::getInstance()->message("Failed to load private key");
+			return;
+		}
+		if(SSL_CTX_use_PrivateKey_file(clientContext, SETTING(SSL_PRIVATE_KEY_FILE).c_str(), SSL_FILETYPE_PEM) != SSL_SUCCESS) {
+			LogManager::getInstance()->message("Failed to load private key");
+			return;
+		}
+	}
+
+#ifdef _WIN32
+	WIN32_FIND_DATA data;
+	HANDLE hFind;
+
+	hFind = FindFirstFile(Text::toT(SETTING(SSL_TRUSTED_CERTIFICATES_PATH) + "*.pem").c_str(), &data);
+	if(hFind != INVALID_HANDLE_VALUE) {
+		do {
+			if(SSL_CTX_load_verify_locations(clientContext, (SETTING(SSL_TRUSTED_CERTIFICATES_PATH) + Text::fromT(data.cFileName)).c_str(), NULL) != SSL_SUCCESS) {
+				LogManager::getInstance()->message("Failed to load trusted certificate from " + Text::fromT(data.cFileName));
+			}
+		} while(FindNextFile(hFind, &data));
+
+		FindClose(hFind);
+	}
+#else
+#error todo
+#endif
+	certsLoaded = true;
+}
+
+
+SSLSocket* CryptoManager::getClientSocket() throw(SocketException) {
+	return new SSLSocket(clientContext);
+}
+SSLSocket* CryptoManager::getServerSocket() throw(SocketException) {
+	return new SSLSocket(serverContext);
+}
+
+
 void CryptoManager::decodeBZ2(const u_int8_t* is, size_t sz, string& os) throw (CryptoException) {
 	bz_stream bs = { 0 };
 

Modified: dcplusplus/trunk/client/CryptoManager.h
===================================================================
--- dcplusplus/trunk/client/CryptoManager.h	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/CryptoManager.h	2006-06-17 22:24:01 UTC (rev 617)
@@ -29,6 +29,7 @@
 #include "Singleton.h"
 #include "FastAlloc.h"
 #include "version.h"
+#include "SSLSocket.h"
 
 STANDARD_EXCEPTION(CryptoException);
 
@@ -79,12 +80,18 @@
 
 	void decodeHuffman(const u_int8_t* /*is*/, string& /*os*/, const size_t /*len*/) throw(CryptoException);
 	void decodeBZ2(const u_int8_t* is, size_t sz, string& os) throw(CryptoException);
+
+	SSLSocket* getClientSocket() throw(SocketException);
+	SSLSocket* getServerSocket() throw(SocketException);
+
+	void loadCertificates() throw();
+	bool hasCerts() const { return certsLoaded; }
 private:
 
 	friend class Singleton<CryptoManager>;
 	
-	CryptoManager() : lock("EXTENDEDPROTOCOLABCABCABCABCABCABC"), pk("DCPLUSPLUS" VERSIONSTRING "ABCABC") { }
-	virtual ~CryptoManager() { }
+	CryptoManager();
+	virtual ~CryptoManager();
 
 	class Leaf : public FastAlloc<Leaf> {
 	public:
@@ -108,6 +115,11 @@
 		}
 	};
 	
+	SSL_CTX* clientContext;
+	SSL_CTX* serverContext;
+	DH* dh;
+	bool certsLoaded;
+
 	const string lock;
 	const string pk;
 

Modified: dcplusplus/trunk/client/DCPlusPlus.cpp
===================================================================
--- dcplusplus/trunk/client/DCPlusPlus.cpp	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/DCPlusPlus.cpp	2006-06-17 22:24:01 UTC (rev 617)
@@ -33,7 +33,6 @@
 #include "SettingsManager.h"
 #include "FinishedManager.h"
 #include "ADLSearch.h"
-#include "SSLSocket.h"
 
 #include "StringTokenizer.h"
 
@@ -61,7 +60,6 @@
 	QueueManager::newInstance();
 	FinishedManager::newInstance();
 	ADLSearchManager::newInstance();
-	SSLSocketFactory::newInstance();
 
 	SettingsManager::getInstance()->load();
 
@@ -70,7 +68,7 @@
 	}
 
 	FavoriteManager::getInstance()->load();
-	SSLSocketFactory::getInstance()->loadCertificates();
+	CryptoManager::getInstance()->loadCertificates();
 
 	if(f != NULL)
 		(*f)(p, STRING(HASH_DATABASE));
@@ -93,7 +91,6 @@
 
 	SettingsManager::getInstance()->save();
 	
-	SSLSocketFactory::deleteInstance();
 	ADLSearchManager::deleteInstance();
 	FinishedManager::deleteInstance();
 	ShareManager::deleteInstance();

Modified: dcplusplus/trunk/client/FavoriteUser.h
===================================================================
--- dcplusplus/trunk/client/FavoriteUser.h	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/FavoriteUser.h	2006-06-17 22:24:01 UTC (rev 617)
@@ -37,7 +37,7 @@
 
 	User::Ptr& getUser() { return user; }
 
-	void update(const OnlineUser& info) { setNick(info.getIdentity().getNick()); setUrl(info.getIdentity().getHubUrl()); }
+	void update(const OnlineUser& info);
 
 	GETSET(User::Ptr, user, User);
 	GETSET(string, nick, Nick);

Modified: dcplusplus/trunk/client/NmdcHub.cpp
===================================================================
--- dcplusplus/trunk/client/NmdcHub.cpp	2006-06-17 15:40:35 UTC (rev 616)
+++ dcplusplus/trunk/client/NmdcHub.cpp	2006-06-17 22:24:01 UTC (rev 617)
@@ -33,18 +33,15 @@
 #include "StringTokenizer.h"
 
 NmdcHub::NmdcHub(const string& aHubURL) : Client(aHubURL, '|', false), supportFlags(0), state(STATE_CONNECT),
-	reconnect(true), lastUpdate(0)
+	lastUpdate(0)
 {
-	TimerManager::getInstance()->addListener(this);
 }
 
 NmdcHub::~NmdcHub() throw() {
-	TimerManager::getInstance()->removeListener(this);
 	clearUsers();
 }
 
 void NmdcHub::connect() {
-	reconnect = true;
 	supportFlags = 0;
 	lastMyInfoA.clear();
  	lastMyInfoB.clear();
@@ -89,8 +86,6 @@
 	User::Ptr p;
 	if(aNick == getMyNick()) {
 		p = ClientManager::getInstance()->getMe();
-		getMyIdentity().setUser(p);
-		getMyIdentity().setHubUrl(getHubUrl());
 	} else {
 		p = ClientManager::getInstance()->getUser(aNick, getHubUrl());
 	}
@@ -99,6 +94,9 @@
 		Lock l(cs);
 		u = users.insert(make_pair(aNick, new OnlineUser(p, *this, 0))).first->second;
 		u->getIdentity().setNick(aNick);
+		if(u->getUser() == getMyIdentity().getUser()) {
+			setMyIdentity(u->getIdentity());
+		}
 	}
 
 	ClientManager::getInstance()->putOnline(*u);
@@ -190,12 +188,12 @@
 		// Check if we're being banned...
 		if(state != STATE_CONNECTED) {
 			if(Util::findSubString(aLine, "banned") != string::npos) {
-				reconnect = false;
+				setAutoReconnect(false);
 			}
 		}
-		string line = fromNmdc(aLine);
+		string line = fromAcp(aLine);
 		// @todo Decrypt who the message is from...
-		fire(ClientListener::StatusMessage(), this, Util::validateMessage(fromNmdc(aLine), true));
+		fire(ClientListener::StatusMessage(), this, unescape(fromAcp(aLine)));
 		return;
 	}
 
@@ -207,7 +205,7 @@
 		cmd = aLine;
 	} else {
 		cmd = aLine.substr(0, x);
-		param = fromNmdc(aLine.substr(x+1));
+		param = fromAcp(aLine.substr(x+1));
 	}
 
 	if(cmd == "$Search") {
@@ -321,7 +319,7 @@
 		if(j == string::npos)
 			return;
 
-		string tmpDesc = Util::validateMessage(param.substr(i, j-i), true);
+		string tmpDesc = unescape(param.substr(i, j-i));
 		// Look for a tag...
 		if(tmpDesc.size() > 0 && tmpDesc[tmpDesc.size()-1] == '>') {
 			x = tmpDesc.rfind('<');
@@ -353,7 +351,7 @@
 		if(j == string::npos)
 			return;
 
-		u.getIdentity().setEmail(Util::validateMessage(param.substr(i, j-i), true));
+		u.getIdentity().setEmail(unescape(param.substr(i, j-i));
 
 		i = j + 1;
 		j = param.find('$', i);
@@ -361,8 +359,9 @@
 			return;
 		u.getIdentity().setBytesShared(param.substr(i, j-i));
 
-		if(u.getUser() == getMyIdentity().getUser())
+		if(u.getUser() == getMyIdentity().getUser()) {
 			setMyIdentity(u.getIdentity());
+		}
 		
 		fire(ClientListener::UserUpdated(), this, u);
 	} else if(cmd == "$Quit") {
@@ -428,11 +427,11 @@
 		// Hack - first word goes to hub name, rest to description
 		string::size_type i = param.find(' ');
 		if(i == string::npos) {
-			getHubIdentity().setNick(param);
+			getHubIdentity().setNick(unescape(param));
 			getHubIdentity().setDescription(Util::emptyString);			
 		} else {
-			getHubIdentity().setNick(param.substr(0, i));
-			getHubIdentity().setDescription(param.substr(i+1));
+			getHubIdentity().setNick(unescape(param.substr(0, i)));
+			getHubIdentity().setDescription(unescape(param.substr(i+1)));
 		}
 		fire(ClientListener::HubUpdated(), this);
 	} else if(cmd == "$Supports") {
@@ -470,7 +469,7 @@
 			string name = param.substr(i, j-i);
 			i = j+1;
 			string command = param.substr(i, param.length() - i);
-			fire(ClientListener::UserCommand(), this, type, ctx, Util::validateMessage(name, true, false), Util::validateMessage(command, true, false));
+			fire(ClientListener::UserCommand(), this, type, ctx, unescape(name), unescape(command));
 		}
 	} else if(cmd == "$Lock") {
 		if(state != STATE_LOCK) {
@@ -478,7 +477,7 @@
 		}
 		state = STATE_HELLO;
 
-		// Param must not be fromNmdc'd...
+		// Param must not be fromAcp'd...
 		param = aLine.substr(6);
 
 		if(!param.empty()) {
@@ -562,6 +561,9 @@
 					continue;
 
 				u->getIdentity().setIp(it->substr(j+1));
+				if(u->getUser() == getMyIdentity().getUser()) {
+					setMyIdentity(u->getIdentity());
+				}
 				v.push_back(u);
 			}
 
@@ -584,10 +586,10 @@
 				string tmp;
 				// Let's assume 10 characters per nick...
 				tmp.reserve(v.size() * (11 + 10 + getMyNick().length())); 
-				string n = ' ' +  toNmdc(getMyNick()) + '|';
+				string n = ' ' +  toAcp(getMyNick()) + '|';
 				for(OnlineUser::List::const_iterator i = v.begin(); i != v.end(); ++i) {
 					tmp += "$GetINFO ";
-					tmp += toNmdc((*i)->getIdentity().getNick());
+					tmp += toAcp((*i)->getIdentity().getNick());
 					tmp += n;
 				}
 				if(!tmp.empty()) {
@@ -607,8 +609,9 @@
 					continue;
 				OnlineUser& ou = getUser(*it);
 				ou.getIdentity().setOp(true);
-				if(*it == getMyNick())
-					getMyIdentity().setOp(true);
+				if(ou.getUser() == getMyIdentity().getUser()) {
+					setMyIdentity(ou.getIdentity());
+				}
 				v.push_back(&ou);
 			}
 
@@ -650,13 +653,15 @@
 		OnlineUser* to = findUser(getMyNick());
 
 		if(replyTo == NULL || from == NULL || to == NULL) {
-			fire(ClientListener::StatusMessage(), this, Util::validateMessage(param.substr(i), true));
+			fire(ClientListener::StatusMessage(), this, unescape(param.substr(i)));
 		} else {
 			string msg = param.substr(j + 2);
-			fire(ClientListener::PrivateMessage(), this, *from, *to, *replyTo, Util::validateMessage(param.substr(j + 2), true));
+			fire(ClientListener::PrivateMessage(), this, *from, *to, *replyTo, unescape(param.substr(j + 2)));
 		}
 	} else if(cmd == "$GetPass") {
-		setRegistered(true);
+		OnlineUser& ou = getUser(getMyNick());
+		ou.getIdentity().set("RG", "1");
+		setMyIdentity(ou.getIdentity());
 		fire(ClientListener::GetPassword(), this);
 	} else if(cmd == "$BadPass") {
 		fire(ClientListener::BadPassword(), this);
@@ -681,18 +686,18 @@
 	checkstate(); 
 	dcdebug("NmdcHub::connectToMe %s\n", aUser.getIdentity().getNick().c_str());
 	ConnectionManager::getInstance()->nmdcExpect(aUser.getIdentity().getNick(), getMyNick(), getHubUrl());
-	send("$ConnectToMe " + toNmdc(aUser.getIdentity().getNick()) + " " + getLocalIp() + ":" + Util::toString(ConnectionManager::getInstance()->getPort()) + "|");
+	send("$ConnectToMe " + toAcp(aUser.getIdentity().getNick()) + " " + getLocalIp() + ":" + Util::toString(ConnectionManager::getInstance()->getPort()) + "|");
 }
 
 void NmdcHub::revConnectToMe(const OnlineUser& aUser) {
 	checkstate(); 
 	dcdebug("NmdcHub::revConnectToMe %s\n", aUser.getIdentity().getNick().c_str());
-	send("$RevConnectToMe " + toNmdc(getMyNick()) + " " + toNmdc(aUser.getIdentity().getNick()) + "|");
+	send("$RevConnectToMe " + toAcp(getMyNick()) + " " + toAcp(aUser.getIdentity().getNick()) + "|");
 }
 
 void NmdcHub::hubMessage(const string& aMessage) { 
 	checkstate(); 
-	send(toNmdc( "<" + getMyNick() + "> " + Util::validateMessage(aMessage, false) + "|" ) ); 
+	send(toAcp( "<" + getMyNick() + "> " + escape(aMessage) + "|" ) ); 
 }
 
 void NmdcHub::myInfo(bool alwaysSend) {
@@ -726,9 +731,9 @@
 	
 	string uMin = (SETTING(MIN_UPLOAD_SPEED) == 0) ? Util::emptyString : tmp5 + Util::toString(SETTING(MIN_UPLOAD_SPEED));
 	string myInfoA = 
-		"$MyINFO $ALL " + toNmdc(checkNick(getMyNick())) + " " + toNmdc(Util::validateMessage(getMyIdentity().getDescription(), false)) + 
+		"$MyINFO $ALL " + toAcp(getCurrentNick()) + " " + toAcp(NmdcHub::validateMessage(getCurrentDescription(), false)) + 
 		tmp1 + VERSIONSTRING + tmp2 + modeChar + tmp3 + getCounts() + tmp4 + Util::toString(SETTING(SLOTS)) + uMin + 
-		">$ $" + SETTING(UPLOAD_SPEED) + "\x01$" + toNmdc(Util::validateMessage(SETTING(EMAIL), false)) + '$'; 
+		">$ $" + SETTING(UPLOAD_SPEED) + "\x01$" + toAcp(NmdcHub::validateMessage(SETTING(EMAIL), false)) + '$'; 
 	string myInfoB = ShareManager::getInstance()->getShareSizeString() + "$|";
  	
  	if(lastMyInfoA != myInfoA || alwaysSend || (lastMyInfoB != myInfoB && lastUpdate + 15*60*1000 < GET_TICK()) ){
@@ -750,7 +755,7 @@
 	AutoArray<char> buf((char*)NULL);
 	char c1 = (aSizeType == SearchManager::SIZE_DONTCARE) ? 'F' : 'T';
 	char c2 = (aSizeType == SearchManager::SIZE_ATLEAST) ? 'F' : 'T';
-	string tmp = Util::validateMessage(toNmdc((aFileType == SearchManager::TYPE_TTH) ? "TTH:" + aString : aString), false);
+	string tmp = NmdcHub::validateMessage(toAcp((aFileType == SearchManager::TYPE_TTH) ? "TTH:" + aString : aString), false);
 	string::size_type i;
 	while((i = tmp.find(' ')) != string::npos) {
 		tmp[i] = '$';
@@ -762,15 +767,76 @@
 		chars = sprintf(buf, "$Search %s:%d %c?%c?%s?%d?%s|", x.c_str(), (int)SearchManager::getInstance()->getPort(), c1, c2, Util::toString(aSize).c_str(), aFileType+1, tmp.c_str());
 	} else {
 		buf = new char[getMyNick().length() + aString.length() + 64];
-		chars = sprintf(buf, "$Search Hub:%s %c?%c?%s?%d?%s|", toNmdc(getMyNick()).c_str(), c1, c2, Util::toString(aSize).c_str(), aFileType+1, tmp.c_str());
+		chars = sprintf(buf, "$Search Hub:%s %c?%c?%s?%d?%s|", toAcp(getMyNick()).c_str(), c1, c2, Util::toString(aSize).c_str(), aFileType+1, tmp.c_str());
 	}
 	send(buf, chars);
 }
 
+string NmdcHub::validateMessage(string tmp, bool reverse, bool checkNewLines) {
+	string::size_type i = 0;
+
+	if(reverse) {
+		while( (i = tmp.find("&#36...
 
[truncated message content]

Thread: [Dcplusplus-commit] SF.net SVN: dcplusplus: [617] dcplusplus/trunk (Page 2)

A Windows client for the Direct Connect networks

dcplusplus-commit