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

2004-11-06 jrandom

Browse Source 
* Fix for a long standing synchronization bug in the SDK that in rare
      instances can add a few seconds of lag.
This commit is contained in:
jrandom
2004-11-06 07:59:54 +00:00
committed by zzz
parent 9cf663063e
commit 314316cee0
6 changed files with 138 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
public final static String ID = "$Revision: 1.68 $ $Date: 2004/11/02 06:57:08 $";
public final static String ID = "$Revision: 1.69 $ $Date: 2004/11/05 05:53:40 $";
public final static String VERSION = "0.4.1.3";
public final static long BUILD = 9;
public final static long BUILD = 10;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID);

17
router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
View File

@ -186,6 +186,7 @@ public class SendTunnelMessageJob extends JobImpl {
_state = 12;
// we're the gateway, so sign, encrypt, and forward to info.getNextHop()
TunnelMessage msg = prepareMessage(info);
_state = 66;
if (msg == null) {
if (_log.shouldLog(Log.ERROR))
_log.error("wtf, unable to prepare a tunnel message to the next hop, when we're the gateway and hops remain? tunnel: " + info);
@ -212,13 +213,17 @@ public class SendTunnelMessageJob extends JobImpl {
_log.warn("Adding a tunnel message that will expire shortly ["
+ new Date(_expiration) + "]", getAddedBy());
}
_state = 67;
msg.setMessageExpiration(new Date(_expiration));
getContext().jobQueue().addJob(new SendMessageDirectJob(getContext(), msg,
info.getNextHop(), _onSend,
_onReply, _onFailure,
_selector,
(int)(_expiration - getContext().clock().now()),
_priority));
_state = 68;
Job j = new SendMessageDirectJob(getContext(), msg,
info.getNextHop(), _onSend,
_onReply, _onFailure,
_selector,
(int)(_expiration - getContext().clock().now()),
_priority);
_state = 69;
getContext().jobQueue().addJob(j);
_state = 15;
}
}