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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-12-04 22:27:48 +0000 (Tue, 04 Dec 2007)
New Revision: 16289

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
isRoutingDisabledRemotely => disableRoutingHasBeenSetRemotely

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-12-04 22:20:15 UTC 
(rev 16288)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-12-04 22:27:48 UTC 
(rev 16289)
@@ -314,9 +314,9 @@
                        if(localRequest)
                                disableRoutingHasBeenSetLocally = !shouldRoute;
                        else
-                               isRoutingDisabledRemotely = !shouldRoute;
+                               disableRoutingHasBeenSetRemotely = !shouldRoute;

-                       disableRouting = disableRoutingHasBeenSetLocally || 
isRoutingDisabledRemotely;
+                       disableRouting = disableRoutingHasBeenSetLocally || 
disableRoutingHasBeenSetRemotely;
                }

                if(localRequest) {

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-12-04 22:20:15 UTC 
(rev 16288)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-12-04 22:27:48 UTC 
(rev 16289)
@@ -90,7 +90,7 @@
        protected boolean verifiedIncompatibleNewerVersion;
        protected boolean disableRouting;
        protected boolean disableRoutingHasBeenSetLocally;
-       protected boolean isRoutingDisabledRemotely;
+       protected boolean disableRoutingHasBeenSetRemotely;
        /*
        * Buffer of Ni,Nr,g^i,g^r,ID
        */
@@ -334,7 +334,7 @@
                }

                disableRouting = disableRoutingHasBeenSetLocally = false;
-               isRoutingDisabledRemotely = false; // Assume so
+               disableRoutingHasBeenSetRemotely = false; // Assume so

                // FIXME make mandatory once everyone has upgraded
                lastGoodVersion = fs.get("lastGoodVersion");
@@ -1557,7 +1557,7 @@
                        } else
                                wasARekey = true;
                        isConnected = true;
-                       disableRouting = disableRoutingHasBeenSetLocally || 
isRoutingDisabledRemotely;
+                       disableRouting = disableRoutingHasBeenSetLocally || 
disableRoutingHasBeenSetRemotely;
                        isRoutable = routable;
                        verifiedIncompatibleNewerVersion = newer;
                        verifiedIncompatibleOlderVersion = older;