linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2888
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2012-03-22 20:20:44 +0100
message:
  v4only was never actually applied
modified:
  changelog.txt
  dcpp/BufferedSocket.cpp
  dcpp/Socket.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'changelog.txt'
--- changelog.txt	2012-03-21 22:50:43 +0000
+++ changelog.txt	2012-03-22 19:20:44 +0000
@@ -2,7 +2,7 @@
 * Apply ADL searches in partial file lists (poy)
 * Heuristics to send additional levels of info in partial file lists (poy)
 * Add a "Download full list" button in the file list toolbar (poy)
-* "Browse file list" is now available everywhere (works for peers with ADC partial file list support only) (poy)
+* Partial file lists in NMDC hubs (poy)
 * Reclaim memory after a file list match
 * Improve file reading operations
 * [L#678432] Context-sensitive help tooltips in the settings dialog (poy)
@@ -26,7 +26,6 @@
 * Update boost to version 1.49
 * [L#947895] Move the "follow redirect" command to inline chat links (poy)
 * Format chat links (poy)
-* [L#931560] Correctly hash empty files when using asynchronous file reading (cologic)
 
 -- 0.791 2012-01-14 --
 * Update translations

=== modified file 'dcpp/BufferedSocket.cpp'
--- dcpp/BufferedSocket.cpp	2012-01-13 20:55:20 +0000
+++ dcpp/BufferedSocket.cpp	2012-03-22 19:20:44 +0000
@@ -77,6 +77,7 @@
 void BufferedSocket::setSocket(unique_ptr<Socket>&& s) {
 	dcassert(!sock.get());
 	sock = move(s);
+	sock->setV4only(v4only);
 }
 
 void BufferedSocket::setOptions() {
@@ -106,7 +107,8 @@
 
 void BufferedSocket::connect(const string& aAddress, const string& aPort, const string& localPort, NatRoles natRole, bool secure, bool allowUntrusted, bool proxy) {
 	dcdebug("BufferedSocket::connect() %p\n", (void*)this);
-	unique_ptr<Socket> s(secure ? (natRole == NAT_SERVER ? CryptoManager::getInstance()->getServerSocket(allowUntrusted) : CryptoManager::getInstance()->getClientSocket(allowUntrusted)) : new Socket(Socket::TYPE_TCP));
+	unique_ptr<Socket> s(secure ? (natRole == NAT_SERVER ? CryptoManager::getInstance()->getServerSocket(allowUntrusted) :
+		CryptoManager::getInstance()->getClientSocket(allowUntrusted)) : new Socket(Socket::TYPE_TCP));
 
 	s->setLocalIp4(CONNSETTING(BIND_ADDRESS));
 	s->setLocalIp6(CONNSETTING(BIND_ADDRESS6));

=== modified file 'dcpp/Socket.h'
--- dcpp/Socket.h	2012-01-13 20:55:20 +0000
+++ dcpp/Socket.h	2012-03-22 19:20:44 +0000
@@ -89,7 +89,7 @@
 		TYPE_UDP = IPPROTO_UDP
 	};
 
-	explicit Socket(SocketType type, bool v4only = false) : type(type), v4only(v4only) { }
+	explicit Socket(SocketType type) : type(type) { }
 
 	virtual ~Socket() { }
 
@@ -183,6 +183,8 @@
 	GETSET(string, ip, Ip);
 	GETSET(string, localIp4, LocalIp4);
 	GETSET(string, localIp6, LocalIp6);
+	GETSET(bool, v4only, V4only);
+
 protected:
 	typedef union {
 		sockaddr sa;
@@ -198,8 +200,6 @@
 
 	SocketType type;
 
-	bool v4only;
-
 	class Stats {
 	public:
 		uint64_t totalDown;