[Thaw-dev] r12746 - in trunk/apps/Thaw/src/thaw: core fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-15 14:03:55 +0000 (Sun, 15 Apr 2007)
New Revision: 12746

Modified:
   trunk/apps/Thaw/src/thaw/core/Logger.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
Log:
Just add a comment and two log messages

Modified: trunk/apps/Thaw/src/thaw/core/Logger.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Logger.java   2007-04-15 13:14:13 UTC (rev 
12745)
+++ trunk/apps/Thaw/src/thaw/core/Logger.java   2007-04-15 14:03:55 UTC (rev 
12746)
@@ -22,7 +22,7 @@
         * 2 or more is recommanded.
         * 4 or more is unhealthy
         */
-       public final static int LOG_LEVEL = 5;
+       public final static int LOG_LEVEL = 3;

        private static Vector logListeners = null;


Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java    2007-04-15 13:14:13 UTC 
(rev 12745)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java    2007-04-15 14:03:55 UTC 
(rev 12746)
@@ -118,6 +118,10 @@
                                Logger.info(this, "Received a nodeHello");

                                connectionId = 
answer.getValue("ConnectionIdentifier");
+
+                               if (connectionId == null)
+                                       Logger.error(this, "** no connection 
identifier **");
+
                                nodeFCPVersion = answer.getValue("FCPVersion");
                                nodeVersion = answer.getValue("Version");
                                nodeName = answer.getValue("Node");

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-04-15 13:14:13 UTC 
(rev 12745)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-04-15 14:03:55 UTC 
(rev 12746)
@@ -207,8 +207,9 @@
                        status = "Computing hash to get approval from the node 
...";

                        String salt = 
queueManager.getQueryManager().getConnection().getClientHello().getConnectionId()
-                                                +"-"+ localFile.getPath()
-                                                +"-";
+                               +"-"+ localFile.getPath() /* Client token */
+                               +"-";
+                       Logger.info(this, "Salt used for this transfer: ~" + 
salt+ "~");

                        sha = new SHA256Computer(salt, localFile.getPath());
                        sha.addObserver(this);