[freenet-cvs] r8691 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2006-05-13 14:14:58 +0000 (Sat, 13 May 2006)
New Revision: 8691

Modified:
   trunk/freenet/src/freenet/node/PacketSender.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/Version.java
Log:
705: Revert potentially catastrophic changes by Zothar.

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2006-05-13 12:56:35 UTC 
(rev 8690)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2006-05-13 14:14:58 UTC 
(rev 8691)
@@ -124,11 +124,6 @@
                 }

                 if(node.packetMangler == null) continue;
-                if(pn.isBackedOff()) {
-                    if(pn.hasQueuedMessageItems() || (now - 
pn.lastSentPacketTime() > Node.KEEPALIVE_INTERVAL))
-                        Logger.debug(this, pn.getPeer()+" is backed off; Won't 
try to send queued messages and/or keepalive packet");
-                    continue;
-                }
                 // Any messages to send?
                 MessageItem[] messages = null;
                 messages = pn.grabQueuedMessageItems();

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-05-13 12:56:35 UTC 
(rev 8690)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-05-13 14:14:58 UTC 
(rev 8691)
@@ -468,13 +468,6 @@
        disconnected();
     }

-    public boolean hasQueuedMessageItems() {
-        synchronized(messagesToSendNow) {
-            if(messagesToSendNow.size() == 0) return false;
-            return true;
-        }
-    }
-
     /**
      * Grab all queued Message's.
      * @return Null if no messages are queued, or an array of

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-13 12:56:35 UTC (rev 
8690)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-13 14:14:58 UTC (rev 
8691)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 704;
+       private static final int buildNumber = 705;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 591;