echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UDP: Fix peer test NPE (ticket # 748)

Browse Source
This commit is contained in:
zzz
2012-10-19 22:03:41 +00:00
parent 580c940d42
commit 5a964dacbb
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
history.txt
View File

@@ -1,3 +1,6 @@
2012-10-19 zzz
* UDP: Fix peer test NPE (ticket # 748)
2012-10-18 kytv
* Portuguese and Spanish updates from Transifex
* Update geoip.txt based on Maxmind GeoLite Country database from 2012-10-02

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

@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 15;
public final static long BUILD = 16;
/** for example "-test" */
public final static String EXTRA = "";
public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);

8
router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
View File

@@ -734,7 +734,13 @@ class PeerTestManager {
return;
}
UDPAddress addr = new UDPAddress(raddr);
SessionKey charlieIntroKey = new SessionKey(addr.getIntroKey());
byte[] ikey - addr.getIntroKey();
if (ikey == null) {
if (_log.shouldLog(Log.WARN))
_log.warn("Unable to pick a charlie");
return;
}
SessionKey charlieIntroKey = new SessionKey(ikey);
//UDPPacket packet = _packetBuilder.buildPeerTestToAlice(aliceIP, from.getPort(), aliceIntroKey, charlieIntroKey, nonce);
//_transport.send(packet);