Changeset de07705

Timestamp:

Sep 2, 2009 3:02:19 PM (11 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

58e960c

Parents:

1571907

Message:

deliver more tags as the available number gets low

File:

• core/java/src/net/i2p/crypto/TransientSessionKeyManager.java (modified) (5 diffs)

core/java/src/net/i2p/crypto/TransientSessionKeyManager.java

@@ -57 +57 @@
  * If a single TagSet is not delivered, there will be no stall as long as the
  * current window size is smaller than the minimum tag threshold.
- * A second consecutive TagSet delivery failure will cause a complete stall, as
+ * Additional TagSets will be sent before the acked tags completely run out. See below.
  * all subsequent messages will fail to decrypt.
  * See ConnectionOptions in streaming for more information.
@@ -421 +421 @@
         if ( (sessionTags.size() <= 0) && (_log.shouldLog(Log.DEBUG)) )
             _log.debug("Received 0 tags for key " + key);
-        if (false) aggressiveExpire();
+        //if (false) aggressiveExpire();
     }
     
@@ -811 +811 @@
                 for (int i = 0; i < _tagSets.size(); i++) {
                     TagSet set = _tagSets.get(i);
-                    if (set.getDate() + SESSION_TAG_DURATION_MS > now)
-                        tags += set.getTags().size();
+                    if (set.getDate() + SESSION_TAG_DURATION_MS > now) {
+                        int sz = set.getTags().size();
+                        // so tags are sent when the acked tags are below
+                        // 30, 17, and 4.
+                        if (!set.getAcked())
+                            sz /= 3;
+                        tags += sz;
+                    }
                 }
             }
@@ -861 +867 @@
         private long _date;
         //private Exception _createdBy;
-        /** only used in renderStatusHTML() for debugging */
+        /** did we get an ack for this tagset? */
         private boolean _acked;
 
@@ -919 +925 @@
 
         public void setAcked() { _acked = true; }
-        /** only used in renderStatusHTML() for debugging */
         public boolean getAcked() { return _acked; }