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

[sl...@freenetproject.org]

Author: sleon
Date: 2006-01-05 23:12:57 +0000 (Thu, 05 Jan 2006)
New Revision: 7765

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/TestnetStatusUploader.java
   trunk/freenet/src/freenet/node/Version.java
Log:
added additional informational output which was missing for me

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-01-05 20:46:44 UTC (rev 
7764)
+++ trunk/freenet/src/freenet/node/Node.java    2006-01-05 23:12:57 UTC (rev 
7765)
@@ -967,6 +967,17 @@
        sb.append(this.transferringRequestSenders.size());
        return sb.toString();
     }
+    
+    /**
+     * @return Some identity information.
+     */
+    public String getIdentity() {
+       StringBuffer sb = new StringBuffer();
+       if (peers != null)
+               sb.append(peers.getIdentity());
+                                       
+       return sb.toString();
+    }

     /**
      * @return Our reference, compressed

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2006-01-05 20:46:44 UTC 
(rev 7764)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2006-01-05 23:12:57 UTC 
(rev 7765)
@@ -394,6 +394,21 @@
         }
         return sb.toString();
     }
+    public String getIdentity() {
+        StringBuffer sb = new StringBuffer();
+        PeerNode[] peers = myPeers;
+        String[] identity = new String[peers.length];
+        for(int i=0;i<myPeers.length;i++) {
+            PeerNode pn = myPeers[i];
+            identity[i] = pn.getIdentity();
+        }
+        Arrays.sort(identity);
+        for(int i=0;i<identity.length;i++) {
+            sb.append(identity[i]);
+            sb.append('\n');
+        }
+        return sb.toString();
+    }

     final Object writePeersSync = new Object();


Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-01-05 20:46:44 UTC 
(rev 7764)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-01-05 23:12:57 UTC 
(rev 7765)
@@ -857,7 +857,11 @@
         return 
                (isConnected ? "CONNECTED   " : "DISCONNECTED") + " " + 
getPeer().toString()+" "+myName+" "+currentLocation.getValue()+" 
"+getVersion()+" backoff: "+backoffLength+" ("+(Math.max(backedOffUntil - 
System.currentTimeMillis(),0))+")";
     }
-       
+    
+    public String getIdentity() {
+       return
+                       myName+"|"+ HexUtil.bytesToHex(identity);
+    }
     public String getVersion(){
            return version;
     }

Modified: trunk/freenet/src/freenet/node/TestnetStatusUploader.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetStatusUploader.java   2006-01-05 
20:46:44 UTC (rev 7764)
+++ trunk/freenet/src/freenet/node/TestnetStatusUploader.java   2006-01-05 
23:12:57 UTC (rev 7765)
@@ -66,6 +66,7 @@
                    output.println(node.exportFieldSet().toString());
                    output.println();
                                output.println(node.getStatus());
+                               output.println(node.getIdentity());
                                output.close();

                                client.close();

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-05 20:46:44 UTC (rev 
7764)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-05 23:12:57 UTC (rev 
7765)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 318;
+       public static final int buildNumber = 319;

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