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

* limit the resend delay to a max of 60s between resends

Browse Source 
* reduce the max # resends to 5
* if the session.sendMessage fails, we're fucked, so kill the socket
This commit is contained in:
jrandom
2004-11-06 08:02:02 +00:00
committed by zzz
parent 314316cee0
commit 592e9dc3ff
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/streaming/java/src/net/i2p/client/streaming/Connection.java
View File

@ -54,6 +54,8 @@ public class Connection {
/** set to an error cause if the connection could not be established */ /** set to an error cause if the connection could not be established */
private String _connectionError; private String _connectionError;
public static final long MAX_RESEND_DELAY = 60*1000;
public Connection(I2PAppContext ctx, ConnectionManager manager, SchedulerChooser chooser, PacketQueue queue, ConnectionPacketHandler handler) { public Connection(I2PAppContext ctx, ConnectionManager manager, SchedulerChooser chooser, PacketQueue queue, ConnectionPacketHandler handler) {
this(ctx, manager, chooser, queue, handler, null); this(ctx, manager, chooser, queue, handler, null);
} }
@ -175,9 +177,14 @@ public class Connection {
_log.debug("Requesting ack delay of " + delay + "ms for packet " + packet); _log.debug("Requesting ack delay of " + delay + "ms for packet " + packet);
} }
packet.setFlag(Packet.FLAG_DELAY_REQUESTED); packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
long timeout = (_options.getRTT() < 10000 ? 10000 : _options.getRTT());
if (timeout > MAX_RESEND_DELAY)
timeout = MAX_RESEND_DELAY;
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Resend in " + (_options.getRTT()*2) + " for " + packet); _log.debug("Resend in " + timeout + " for " + packet);
SimpleTimer.getInstance().addEvent(new ResendPacketEvent(packet), (_options.getRTT()*2 < 5000 ? 5000 : _options.getRTT()*2));
SimpleTimer.getInstance().addEvent(new ResendPacketEvent(packet), timeout);
} }
_lastSendTime = _context.clock().now(); _lastSendTime = _context.clock().now();
@ -439,6 +446,8 @@ public class Connection {
} }
public void timeReached() { public void timeReached() {
if (!_connected) return;
//if (_log.shouldLog(Log.DEBUG)) //if (_log.shouldLog(Log.DEBUG))
// _log.debug("Resend period reached for " + _packet); // _log.debug("Resend period reached for " + _packet);
boolean resend = false; boolean resend = false;
@ -477,6 +486,8 @@ public class Connection {
} else { } else {
//long timeout = _options.getResendDelay() << numSends; //long timeout = _options.getResendDelay() << numSends;
long timeout = _options.getRTT() << (numSends-1); long timeout = _options.getRTT() << (numSends-1);
if ( (timeout > MAX_RESEND_DELAY) || (timeout <= 0) )
timeout = MAX_RESEND_DELAY;
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Scheduling resend in " + timeout + "ms for " + _packet); _log.debug("Scheduling resend in " + timeout + "ms for " + _packet);
SimpleTimer.getInstance().addEvent(ResendPacketEvent.this, timeout); SimpleTimer.getInstance().addEvent(ResendPacketEvent.this, timeout);

2
apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
View File

@ -57,7 +57,7 @@ public class ConnectionOptions extends I2PSocketOptions {
setResendDelay(5*1000); setResendDelay(5*1000);
setSendAckDelay(2*1000); setSendAckDelay(2*1000);
setWindowSize(1); setWindowSize(1);
setMaxResends(10); setMaxResends(5);
setWriteTimeout(-1); setWriteTimeout(-1);
} }
} }

3
apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java
View File

@ -48,6 +48,8 @@ class PacketQueue {
if (packet.getAckTime() > 0) { if (packet.getAckTime() > 0) {
_log.debug("Not resending " + packet); _log.debug("Not resending " + packet);
return; return;
} else {
_log.debug("Sending... " + packet);
} }
// this should not block! // this should not block!
long begin = _context.clock().now(); long begin = _context.clock().now();
@ -56,6 +58,7 @@ class PacketQueue {
if (!sent) { if (!sent) {
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("Send failed for " + packet); _log.warn("Send failed for " + packet);
packet.getConnection().disconnect(false);
} else { } else {
packet.setKeyUsed(keyUsed); packet.setKeyUsed(keyUsed);
packet.setTagsSent(tagsSent); packet.setTagsSent(tagsSent);