From 1eb58a84dfa6d89ec4662c3dc7c63c90784f9d66 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 28 May 2011 20:11:52 +0000
Subject: [PATCH] * i2psnark: Fix bug preventing Robert from connecting to
snark (thx sponge)
---
apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java | 5 +++--
history.txt | 3 +++
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java
index 0adb13d9b..1bd49c25a 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java
@@ -130,7 +130,8 @@ public class PeerAcceptor
}
}
- private static final int LOOKAHEAD_SIZE = "19".length() +
+ /** 48 */
+ private static final int LOOKAHEAD_SIZE = 1 + // chr(19)
"BitTorrent protocol".length() +
8 + // blank, reserved
20; // infohash
@@ -144,7 +145,7 @@ public class PeerAcceptor
if (read != buf.length)
throw new IOException("Unable to read the hash (read " + read + ")");
byte rv[] = new byte[20];
- System.arraycopy(buf, buf.length-rv.length-1, rv, 0, rv.length);
+ System.arraycopy(buf, buf.length-rv.length, rv, 0, rv.length);
return rv;
}
}
diff --git a/history.txt b/history.txt
index 31218b962..fe4744abf 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2011-05-28 zzz
+ * i2psnark: Fix bug preventing Robert from connecting to snark (thx sponge)
+
2011-05-27 zzz
* Console: Fix router.updateThroughProxy being set to false after saving
change on /configupdate when install dir is read-only.
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7ca1a3ec2..5a58b19bc 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 10;
+ public final static long BUILD = 11;
/** for example "-test" */
public final static String EXTRA = "";
--
GitLab