linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3359
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2013-09-29 16:47:02 +0200
message:
  Don't disconnect CCPM conns after 3 minutes of inactivity
modified:
  changelog.txt
  dcpp/ConnectionManager.cpp


--
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	2013-09-22 14:15:28 +0000
+++ changelog.txt	2013-09-29 14:47:02 +0000
@@ -1,3 +1,5 @@
+* [ADC] Don't disconnect CCPM conns after 3 minutes of inactivity (poy)
+
 -- 0.830 2013-09-22 --
 * [L#1010996] Correct search responses (maksis, poy)
 * [L#1206658] Fix transfer painting issues (poy)

=== modified file 'dcpp/ConnectionManager.cpp'
--- dcpp/ConnectionManager.cpp	2013-09-22 13:51:20 +0000
+++ dcpp/ConnectionManager.cpp	2013-09-29 14:47:02 +0000
@@ -244,9 +244,9 @@
 	}
 
 	// disconnect connections that have timed out.
-	for(auto& j: userConnections) {
-		if((j->getLastActivity() + 180*1000) < aTick) {
-			j->disconnect(true);
+	for(auto& conn: userConnections) {
+		if(!conn->isSet(UserConnection::FLAG_PM) && (conn->getLastActivity() + 180*1000) < aTick) {
+			conn->disconnect(true);
 		}
 	}
 }