[freenet-cvs] r12743 - trunk/freenet/src/freenet/node/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-15 12:31:30 +0000 (Sun, 15 Apr 2007)
New Revision: 12743

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
Log:
tell the client the salt the node used.

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-15 00:15:16 UTC 
(rev 12742)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-15 12:31:30 UTC 
(rev 12743)
@@ -30,10 +30,6 @@
 import freenet.support.io.FileBucket;
 import freenet.support.io.SerializableToFieldSetBucketUtil;

-/**
- * 
- * TODO: move hash stuffs into ClientPutBase ... and enforce hash verification 
at a lower level
- */
 public class ClientPut extends ClientPutBase {

        final ClientPutter putter;
@@ -228,13 +224,13 @@
                        } catch (IOException e) {
                                SHA256.returnMessageDigest(md);
                                Logger.error(this, "Got IOE: " +e.getMessage(), 
e);
-                               throw new 
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "Unable 
to access file: "+e, identifier, global);
+                               throw new 
MessageInvalidException(ProtocolErrorMessage.COULD_NOT_READ_FILE, "Unable to 
access file: "+e, identifier, global);
                        }
                        final byte[] foundHash = md.digest();
                        SHA256.returnMessageDigest(md);

                        if(!foundHash.equals(saltedHash))
-                               throw new 
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "The 
hash doesn't match!", identifier, global);
+                               throw new 
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "The 
hash doesn't match! (salt used : \""+salt+"\")", identifier, global);
                }

                if(logMINOR) Logger.minor(this, "data = "+data+", uploadFrom = 
"+ClientPutMessage.uploadFromString(uploadFrom));