[GNUnet-SVN] r541 - in GNUnet: . src/applications/fs src/include

[grothoff]

Author: grothoff
Date: 2005-03-31 18:39:52 -0800 (Thu, 31 Mar 2005)
New Revision: 541

Modified:
   GNUnet/ChangeLog
   GNUnet/src/applications/fs/ecrs_core.c
   GNUnet/src/include/ecrs_core.h
Log:
tagging pre1

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2005-04-01 02:37:48 UTC (rev 540)
+++ GNUnet/ChangeLog    2005-04-01 02:39:52 UTC (rev 541)
@@ -1,3 +1,6 @@
+Thu Mar 31 21:38:06 EST 2005
+       Releasing 0.7.0pre1.
+
 Tue Mar  8 14:45:55 EST 2005
        OpenSSL cannot fully support SHA-512.  Eliminated as an
        option (not necessary, GPL incompatible, trouble, work

Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c      2005-04-01 02:37:48 UTC (rev 
540)
+++ GNUnet/src/applications/fs/ecrs_core.c      2005-04-01 02:39:52 UTC (rev 
541)
@@ -43,7 +43,7 @@
  *  match the query
  */
 int fileBlockEncode(const DBlock * data,
-                   unsigned short len,
+                   unsigned int len,
                    const HashCode512 * query,
                    Datastore_Value ** value) {
   HashCode512 hc;
@@ -66,6 +66,7 @@
   val->expirationTime = htonl(0);
   db = (DBlock*) &val[1];
   db->type = htonl(D_BLOCK);
+  GNUNET_ASSERT(len - sizeof(DBlock) < MAX_BUFFER_SIZE);
   GNUNET_ASSERT(len - sizeof(DBlock)
                == encryptBlock(&data[1],
                                len - sizeof(DBlock),
@@ -92,7 +93,7 @@
  * a certain block of data.
  */
 void fileBlockGetKey(const DBlock * data,
-                    unsigned short len,
+                    unsigned int len,
                     HashCode512 * key) {
   GNUNET_ASSERT(len >= sizeof(DBlock));
   hash(&data[1],
@@ -105,7 +106,7 @@
  * a certain block of data.
  */
 void fileBlockGetQuery(const DBlock * db,
-                      unsigned short len,
+                      unsigned int len,
                       HashCode512 * query) {
   char * tmp;
   const char * data;
@@ -131,7 +132,7 @@
   FREE(tmp);
 }
 
-unsigned int getTypeOfBlock(unsigned short size,
+unsigned int getTypeOfBlock(unsigned int size,
                            const DBlock * data) {
   if (size <= 4) {
     BREAK();
@@ -149,7 +150,7 @@
  * @return SYSERR if the content is invalid or
  *   the content type is not known
  */
-int getQueryFor(unsigned short size,
+int getQueryFor(unsigned int size,
                const DBlock * data,
                HashCode512 * query) {
   unsigned int type;
@@ -270,7 +271,7 @@
  *         query type
  */
 int isDatumApplicable(unsigned int type,
-                     unsigned short size,
+                     unsigned int size,
                      const DBlock * data,
                      unsigned int keyCount,
                      const HashCode512 * keys) {

Modified: GNUnet/src/include/ecrs_core.h
===================================================================
--- GNUnet/src/include/ecrs_core.h      2005-04-01 02:37:48 UTC (rev 540)
+++ GNUnet/src/include/ecrs_core.h      2005-04-01 02:39:52 UTC (rev 541)
@@ -162,7 +162,7 @@
  *  match the query
  */
 int fileBlockEncode(const DBlock * data,
-                   unsigned short len,
+                   unsigned int len,
                    const HashCode512 * query,
                    Datastore_Value ** value);
 
@@ -171,7 +171,7 @@
  * a certain block of data.
  */
 void fileBlockGetQuery(const DBlock * data,
-                      unsigned short len,
+                      unsigned int len,
                       HashCode512 * query);
 
 
@@ -180,13 +180,13 @@
  * a certain block of data.
  */
 void fileBlockGetKey(const DBlock * data,
-                    unsigned short len,
+                    unsigned int len,
                     HashCode512 * key);
 
 /**
  * What is the type of the given block of data?
  */
-unsigned int getTypeOfBlock(unsigned short size,
+unsigned int getTypeOfBlock(unsigned int size,
                            const DBlock * data);
 
 /**
@@ -200,7 +200,7 @@
  * @return SYSERR if the content is invalid or
  *   the content type is not known
  */
-int getQueryFor(unsigned short size,
+int getQueryFor(unsigned int size,
                const DBlock * data,
                HashCode512 * query);
 
@@ -218,7 +218,7 @@
  *         query type
  */
 int isDatumApplicable(unsigned int type,
-                     unsigned short size,
+                     unsigned int size,
                      const DBlock * data,
                      unsigned int keyCount,
                      const HashCode512 * keys);