I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

(zzz)

Browse Source 
* i2psnark: Add some synchronization to prevent rare problem
      after restoring orphan piece
This commit is contained in:
zzz
2006-09-24 18:30:22 +00:00
committed by zzz
parent e8e8bac694
commit 373934c6e0
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/i2psnark/java/src/org/klomp/snark/PeerState.java
View File

@ -523,22 +523,25 @@ class PeerState
// Check for adopting an orphaned partial piece // Check for adopting an orphaned partial piece
Request r = listener.getPeerPartial(bitfield); Request r = listener.getPeerPartial(bitfield);
if (r != null) { if (r != null) {
// Check that r not already in outstandingRequests synchronized(this)
int[] arr = getRequestedPieces(); {
boolean found = false; // Check that r not already in outstandingRequests
for (int i = 0; arr[i] >= 0; i++) { int[] arr = getRequestedPieces();
if (arr[i] == r.piece) { boolean found = false;
found = true; for (int i = 0; arr[i] >= 0; i++) {
break; if (arr[i] == r.piece) {
found = true;
break;
}
}
if (!found) {
outstandingRequests.add(r);
if (!choked)
out.sendRequest(r);
lastRequest = r;
return true;
}
} }
}
if (!found) {
outstandingRequests.add(r);
if (!choked)
out.sendRequest(r);
lastRequest = r;
return true;
}
} }
int nextPiece = listener.wantPiece(peer, bitfield); int nextPiece = listener.wantPiece(peer, bitfield);
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))

6
history.txt
View File

@ -1,4 +1,8 @@
$Id: history.txt,v 1.522 2006-09-16 16:07:30 zzz Exp $ $Id: history.txt,v 1.523 2006-09-20 17:39:26 zzz Exp $
2006-09-24 zzz
* i2psnark: Add some synchronization to prevent rare problem
after restoring orphan piece
2006-09-20 zzz 2006-09-20 zzz
* i2psnark: Eliminate duplicate requests caused by i2p-bt's * i2psnark: Eliminate duplicate requests caused by i2p-bt's

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.459 $ $Date: 2006-09-16 16:07:28 $"; public final static String ID = "$Revision: 1.460 $ $Date: 2006-09-20 17:39:24 $";
public final static String VERSION = "0.6.1.25"; public final static String VERSION = "0.6.1.25";
public final static long BUILD = 6; public final static long BUILD = 7;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);