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

Streaming: Fix sending messages with expired times (ticket #2451)

Browse Source
This commit is contained in:
zzz
2019-03-01 18:00:54 +00:00
parent d1617dd0b6
commit 82d187438f
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ class PacketQueue implements SendMessageStatusListener, Closeable {
private static final int FINAL_TAG_THRESHOLD = 2;
private static final long REMOVE_EXPIRED_TIME = 67*1000;
private static final boolean ENABLE_STATUS_LISTEN = true;
private static final long I2CP_EXPIRATION_ADJUST = Math.min(25, Connection.MIN_RESEND_DELAY / 4);
public PacketQueue(I2PAppContext context, SimpleTimer2 timer) {
_context = context;
@ -117,10 +118,15 @@ class PacketQueue implements SendMessageStatusListener, Closeable {
begin = _context.clock().now();
long expires = 0;
Connection.ResendPacketEvent rpe = (Connection.ResendPacketEvent) packet.getResendEvent();
if (rpe != null)
if (rpe != null) {
// we want the router to expire it a little before we do,
// so if we retransmit it will use a new tunnel/lease combo
expires = rpe.getNextSendTime() - 500;
// If we are really close to the timeout already,
// give this packet a chance to be sent,
// but it's likely to be dropped on the router side if we're
// running this far behind.
expires = Math.max(rpe.getNextSendTime() - I2CP_EXPIRATION_ADJUST, begin + 25);
}
SendMessageOptions options = new SendMessageOptions();
if (expires > 0)
options.setDate(expires);