forked from I2P_Developers/i2p.i2p
* 2005-08-03 0.6.0.1 released
2005-08-03 jrandom * Backed out an inadvertant change to the netDb store redundancy factor. * Verify tunnel participant caching. * Logging cleanup
This commit is contained in:
@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
|
||||
*
|
||||
*/
|
||||
public class RouterVersion {
|
||||
public final static String ID = "$Revision: 1.209 $ $Date: 2005/07/27 14:03:43 $";
|
||||
public final static String VERSION = "0.6";
|
||||
public final static long BUILD = 1;
|
||||
public final static String ID = "$Revision: 1.210 $ $Date: 2005/07/31 16:35:27 $";
|
||||
public final static String VERSION = "0.6.0.1";
|
||||
public final static long BUILD = 0;
|
||||
public static void main(String args[]) {
|
||||
System.out.println("I2P Router version: " + VERSION);
|
||||
System.out.println("Router ID: " + RouterVersion.ID);
|
||||
|
@ -74,8 +74,8 @@ public class SendMessageDirectJob extends JobImpl {
|
||||
long now = getContext().clock().now();
|
||||
|
||||
if (_expiration < now) {
|
||||
if (_log.shouldLog(Log.ERROR))
|
||||
_log.error("Timed out sending message " + _message + " directly (expiration = "
|
||||
if (_log.shouldLog(Log.WARN))
|
||||
_log.warn("Timed out sending message " + _message + " directly (expiration = "
|
||||
+ new Date(_expiration) + ") to " + _targetHash.toBase64(), getAddedBy());
|
||||
if (_onFail != null)
|
||||
getContext().jobQueue().addJob(_onFail);
|
||||
|
@ -39,7 +39,7 @@ class StoreJob extends JobImpl {
|
||||
private PeerSelector _peerSelector;
|
||||
|
||||
private final static int PARALLELIZATION = 3; // how many sent at a time
|
||||
private final static int REDUNDANCY = 3; // we want the data sent to 6 peers
|
||||
private final static int REDUNDANCY = 10; // we want the data sent to 10 peers
|
||||
/**
|
||||
* additionally send to 1 outlier(s), in case all of the routers chosen in our
|
||||
* REDUNDANCY set are attacking us by accepting DbStore messages but dropping
|
||||
|
@ -179,8 +179,8 @@ public class UDPReceiver {
|
||||
if (_log.shouldLog(Log.INFO))
|
||||
_log.info("Changing ports...");
|
||||
} else {
|
||||
if (_log.shouldLog(Log.ERROR))
|
||||
_log.error("Error receiving", ioe);
|
||||
if (_log.shouldLog(Log.WARN))
|
||||
_log.warn("Error receiving", ioe);
|
||||
}
|
||||
packet.release();
|
||||
}
|
||||
|
@ -142,14 +142,18 @@ public class TunnelParticipant {
|
||||
}
|
||||
public String getName() { return "forward a tunnel message"; }
|
||||
public void runJob() {
|
||||
RouterInfo ri = _context.netDb().lookupRouterInfoLocally(_config.getSendTo());
|
||||
if (ri != null) {
|
||||
_nextHopCache = ri;
|
||||
send(_config, _msg, ri);
|
||||
if (_nextHopCache != null) {
|
||||
send(_config, _msg, _nextHopCache);
|
||||
} else {
|
||||
if (_log.shouldLog(Log.ERROR))
|
||||
_log.error("Lookup the nextHop (" + _config.getSendTo().toBase64().substring(0,4)
|
||||
+ " failed! where do we go for " + _config + "? msg dropped: " + _msg);
|
||||
RouterInfo ri = _context.netDb().lookupRouterInfoLocally(_config.getSendTo());
|
||||
if (ri != null) {
|
||||
_nextHopCache = ri;
|
||||
send(_config, _msg, ri);
|
||||
} else {
|
||||
if (_log.shouldLog(Log.ERROR))
|
||||
_log.error("Lookup the nextHop (" + _config.getSendTo().toBase64().substring(0,4)
|
||||
+ " failed! where do we go for " + _config + "? msg dropped: " + _msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -162,6 +166,9 @@ public class TunnelParticipant {
|
||||
}
|
||||
public String getName() { return "timeout looking for next hop info"; }
|
||||
public void runJob() {
|
||||
if (_nextHopCache != null)
|
||||
return;
|
||||
|
||||
RouterInfo ri = _context.netDb().lookupRouterInfoLocally(_config.getSendTo());
|
||||
if (ri != null) {
|
||||
_nextHopCache = ri;
|
||||
|
Reference in New Issue
Block a user