[GNUnet-SVN] r502 - in GNUnet/src/applications: dht/tools fs/ecrs

[grothoff]

Author: grothoff
Date: 2005-03-26 21:42:12 -0800 (Sat, 26 Mar 2005)
New Revision: 502

Modified:
   GNUnet/src/applications/dht/tools/Makefile.am
   GNUnet/src/applications/fs/ecrs/namespace.c
Log:
namespace bugfixes

Modified: GNUnet/src/applications/dht/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/tools/Makefile.am       2005-03-27 05:20:08 UTC 
(rev 501)
+++ GNUnet/src/applications/dht/tools/Makefile.am       2005-03-27 05:42:12 UTC 
(rev 502)
@@ -16,7 +16,7 @@
 gnunet_dht_join_SOURCES = \
   dht-join.c
 gnunet_dht_join_LDADD = \
-  
$(top_builddir)/src/applications/dht/module/libgnunetmodule_dht_datastore_memory.la
 \
+  $(top_builddir)/src/applications/dht/module/libgnunetdht_datastore_memory.la 
\
   $(top_builddir)/src/applications/dht/tools/libgnunetdht_api.la \
   $(top_builddir)/src/util/libgnunetutil.la
 

Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2005-03-27 05:20:08 UTC (rev 
501)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2005-03-27 05:42:12 UTC (rev 
502)
@@ -388,7 +388,7 @@
   /* THEN: construct SBlock */
   dstURI = ECRS_uriToString(dstU);
   mdsize = ECRS_sizeofMetaData(md);
-  size = mdsize + sizeof(SBlock);
+  size = mdsize + sizeof(SBlock) + strlen(dstURI) + 1;
   if (size > MAX_SBLOCK_SIZE) {
     size = MAX_SBLOCK_SIZE;
     value = MALLOC(sizeof(Datastore_Value) +
@@ -456,13 +456,17 @@
   ECRS_encryptInPlace(thisId,
                      &sb->creationTime,
                      size
+                     - sizeof(unsigned int)
                      - sizeof(Signature)
                      - sizeof(PublicKey)
                      - sizeof(HashCode512));
 
   /* FINALLY: sign & publish SBlock */
   GNUNET_ASSERT(OK == sign(hk,
-                          sizeof(SBlock) - sizeof(Signature) - 
sizeof(PublicKey) - sizeof(unsigned int),
+                          sizeof(SBlock) 
+                          - sizeof(Signature) 
+                          - sizeof(PublicKey)
+                          - sizeof(unsigned int),
                           &sb->identifier,
                           &sb->signature));
   freePrivateKey(hk);