[Dcplusplus-commit] SF.net SVN: dcplusplus: [593] dcplusplus/trunk/client

[<arn...@us...>]

Revision: 593
Author:   arnetheduck
Date:     2006-03-18 11:40:59 -0800 (Sat, 18 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/dcplusplus/?rev=593&view=rev

Log Message:
-----------
More stuff before release

Modified Paths:
--------------
    dcplusplus/trunk/client/Client.h
    dcplusplus/trunk/client/ClientManager.cpp
    dcplusplus/trunk/client/File.h
    dcplusplus/trunk/client/version.h
Modified: dcplusplus/trunk/client/Client.h
===================================================================
--- dcplusplus/trunk/client/Client.h	2006-03-18 19:34:20 UTC (rev 592)
+++ dcplusplus/trunk/client/Client.h	2006-03-18 19:40:59 UTC (rev 593)
@@ -107,7 +107,7 @@
 	short getPort() const { return port; }
 	const string& getAddress() const { return address; }
 
-	const string& getIp() const { return (!socket || socket->getIp().empty()) ? getAddress() : socket->getIp(); }
+	const string& getIp() const { return ip; }
 	string getIpPort() const { return getIp() + ':' + Util::toString(port); }
 	string getLocalIp() const;
 
@@ -192,6 +192,7 @@
 
 	string hubUrl;
 	string address;
+	string ip;
 	u_int16_t port;
 	char separator;
 	bool secure;
@@ -200,7 +201,7 @@
 
 	// BufferedSocketListener
 	virtual void on(Connecting) throw() { fire(ClientListener::Connecting(), this); }
-	virtual void on(Connected) throw() { updateActivity(); fire(ClientListener::Connected(), 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-03-18 19:34:20 UTC (rev 592)
+++ dcplusplus/trunk/client/ClientManager.cpp	2006-03-18 19:40:59 UTC (rev 593)
@@ -427,7 +427,7 @@
 		string& client = *it;
 		for(Client::Iter j = clients.begin(); j != clients.end(); ++j) {
 			Client* c = *j;
-			if(c->isConnected() && c->getIpPort() == client) {
+			if(c->isConnected() && c->getHubUrl() == client) {
 				c->search(aSizeMode, aSize, aFileType, aString, aToken);
 			}
 		}

Modified: dcplusplus/trunk/client/File.h
===================================================================
--- dcplusplus/trunk/client/File.h	2006-03-18 19:34:20 UTC (rev 592)
+++ dcplusplus/trunk/client/File.h	2006-03-18 19:40:59 UTC (rev 593)
@@ -287,7 +287,7 @@
 	virtual size_t read(void* buf, size_t& len) throw(FileException) {
 		ssize_t x = ::read(h, buf, len);
 		if(x == -1)
-			throw("Read error");
+			throw FileException("Read error");
 		len = x;
 		return (size_t)x;
 	}

Modified: dcplusplus/trunk/client/version.h
===================================================================
--- dcplusplus/trunk/client/version.h	2006-03-18 19:34:20 UTC (rev 592)
+++ dcplusplus/trunk/client/version.h	2006-03-18 19:40:59 UTC (rev 593)
@@ -17,8 +17,8 @@
  */
 
 #define APPNAME "DC++"
-#define VERSIONSTRING "0.6875"
-#define VERSIONFLOAT 0.6875
+#define VERSIONSTRING "0.688"
+#define VERSIONFLOAT 0.688
 
 /* Update the .rc file as well... */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.