[GNUnet-SVN] r537 - in GNUnet: . contrib src/applications/fs src/applications/fs/ecrs src/include

[grothoff]

Author: grothoff
Date: 2005-03-31 12:47:19 -0800 (Thu, 31 Mar 2005)
New Revision: 537

Modified:
   GNUnet/README
   GNUnet/UPDATING
   GNUnet/configure.ac
   GNUnet/contrib/doxygen
   GNUnet/contrib/gnunet.root
   GNUnet/src/applications/fs/ecrs/directorytest.c
   GNUnet/src/applications/fs/ecrs_core.c
   GNUnet/src/include/ecrs_core.h
Log:
bump

Modified: GNUnet/README
===================================================================
--- GNUnet/README       2005-03-31 19:51:58 UTC (rev 536)
+++ GNUnet/README       2005-03-31 20:47:19 UTC (rev 537)
@@ -66,10 +66,10 @@
 For file sharing GNUnet needs to store data in a database. We
 currently support MySQL and SQLite.
 
-libextractor >= 0.4.0 is required.
-autoconf >= 2.59 is recommended for compiling the CVS version.
-automake >= 1.9.4 is recommended for compiling the CVS version.
-libtool >= 1.5.8 is recommended for compiling the CVS version.
+libextractor >= 0.4.2 is required
+autoconf >= 2.59 is recommended for compiling the SVN version.
+automake >= 1.9.4 is recommended for compiling the SVN version.
+libtool >= 1.5.8 is recommended for compiling the SVN version.
 
 
 Configuration

Modified: GNUnet/UPDATING
===================================================================
--- GNUnet/UPDATING     2005-03-31 19:51:58 UTC (rev 536)
+++ GNUnet/UPDATING     2005-03-31 20:47:19 UTC (rev 537)
@@ -5,21 +5,24 @@
 # gnunetd --version
 
 If no migration procedure is listed for your version, a
-data-preserving migration may not be possible.  For CVS versions,
+data-preserving migration may not be possible.  For SVN versions,
 you're on your own.
 
-before 0.7.0pre0 to 0.7.0pre0
+before 0.7.0pre1 to 0.7.0pre1
 =============================
 
 Migration is NOT possible, we're breaking compatibility big time.
-Note that 0.7.0pre0 is a pre-release for 0.7.0, so hands-off if you do
-not want to deal with a ton of bugs and lots of migration problems.
-If you dare to venture here anyway, remember:
+Note that 0.7.0pre1 is a pre-release for 0.7.0, so hands-off if you do
+not want to deal with a few bugs and the lack of documentation and
+user interfaces.  Generally, you want to do
 
 $ rm -rf .gnunet
 
-is your friend.
+before starting 0.7.0pre1.  Also, while it maybe possible that 
+migration from 0.7.0pre1 to 0.7.0 will be painless, there's no
+guarantee for that.
 
 Note that many things have changed in this version, so please read
 the documentation very carefully, but also keep in mind that not
 all of the documentation is up-to-date with the code at this point.
+

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2005-03-31 19:51:58 UTC (rev 536)
+++ GNUnet/configure.ac 2005-03-31 20:47:19 UTC (rev 537)
@@ -21,8 +21,8 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.7.0pre0],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.7.0pre0])
+AC_INIT([GNUnet], [0.7.0pre1],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.7.0pre1])
 AM_CONFIG_HEADER([config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: GNUnet/contrib/doxygen
===================================================================
--- GNUnet/contrib/doxygen      2005-03-31 19:51:58 UTC (rev 536)
+++ GNUnet/contrib/doxygen      2005-03-31 20:47:19 UTC (rev 537)
@@ -23,7 +23,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.7.0pre0
+PROJECT_NUMBER         = 0.7.0pre1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

Modified: GNUnet/contrib/gnunet.root
===================================================================
--- GNUnet/contrib/gnunet.root  2005-03-31 19:51:58 UTC (rev 536)
+++ GNUnet/contrib/gnunet.root  2005-03-31 20:47:19 UTC (rev 537)
@@ -104,10 +104,8 @@
 #
 # If you do not specify a HOSTLISTURL, you must copy valid hostkeys to
 # data/hosts manually.
-# Default: HOSTLISTURL = "http://ovmj.org/GNUnet/download/hostlist 
http://www.woodtick.co.uk/hostlist";
-# The above are currently hostlists for 0.6.x, we'll have to have new ones for
-# 0.7.x -- once we're a bit further along.
-# HOSTLISTURL = "http://gnunet.org/hostlist"; # not yet on 0.7, will not yet 
work
+# Default: HOSTLISTURL = "http://gnunet.org/hostlist";
+HOSTLISTURL = "http://gnunet.org/hostlist";
 
 # If you have to use a proxy for outbound HTTP connections,
 # specify the proxy configuration here.  Default is no proxy.
@@ -159,8 +157,8 @@
 #
 # Usually, the default is just fine for most people.
 # Choices are: "udp tcp udp6 tcp6 nat http smtp"
-# Default: TRANSPORTS = "udp tcp nat"
-TRANSPORTS = "udp tcp nat"
+# Default: TRANSPORTS = "udp tcp http nat"
+TRANSPORTS = "udp tcp http nat"
 
 
 ###########################################

Modified: GNUnet/src/applications/fs/ecrs/directorytest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directorytest.c     2005-03-31 19:51:58 UTC 
(rev 536)
+++ GNUnet/src/applications/fs/ecrs/directorytest.c     2005-03-31 20:47:19 UTC 
(rev 537)
@@ -126,7 +126,7 @@
   int failureCount = 0;
   int i;
 
-  for (i=17;i<10000;i*=2) {
+  for (i=17;i<2000;i*=2) {
     fprintf(stderr, ".");
     failureCount += testDirectory(i);
   }

Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c      2005-03-31 19:51:58 UTC (rev 
536)
+++ GNUnet/src/applications/fs/ecrs_core.c      2005-03-31 20:47:19 UTC (rev 
537)
@@ -43,7 +43,7 @@
  *  match the query
  */
 int fileBlockEncode(const DBlock * data,
-                   unsigned int len,
+                   unsigned short len,
                    const HashCode512 * query,
                    Datastore_Value ** value) {
   HashCode512 hc;
@@ -92,7 +92,7 @@
  * a certain block of data.
  */
 void fileBlockGetKey(const DBlock * data,
-                    unsigned int len,
+                    unsigned short len,
                     HashCode512 * key) {
   GNUNET_ASSERT(len >= sizeof(DBlock));
   hash(&data[1],
@@ -105,7 +105,7 @@
  * a certain block of data.
  */
 void fileBlockGetQuery(const DBlock * db,
-                      unsigned int len,
+                      unsigned short len,
                       HashCode512 * query) {
   char * tmp;
   const char * data;
@@ -131,7 +131,7 @@
   FREE(tmp);
 }
 
-unsigned int getTypeOfBlock(unsigned int size,
+unsigned int getTypeOfBlock(unsigned short size,
                            const DBlock * data) {
   if (size <= 4) {
     BREAK();
@@ -149,7 +149,7 @@
  * @return SYSERR if the content is invalid or
  *   the content type is not known
  */
-int getQueryFor(unsigned int size,
+int getQueryFor(unsigned short size,
                const DBlock * data,
                HashCode512 * query) {
   unsigned int type;
@@ -270,7 +270,7 @@
  *         query type
  */
 int isDatumApplicable(unsigned int type,
-                     unsigned int size,
+                     unsigned short size,
                      const DBlock * data,
                      unsigned int keyCount,
                      const HashCode512 * keys) {

Modified: GNUnet/src/include/ecrs_core.h
===================================================================
--- GNUnet/src/include/ecrs_core.h      2005-03-31 19:51:58 UTC (rev 536)
+++ GNUnet/src/include/ecrs_core.h      2005-03-31 20:47:19 UTC (rev 537)
@@ -162,7 +162,7 @@
  *  match the query
  */
 int fileBlockEncode(const DBlock * data,
-                   unsigned int len,
+                   unsigned short len,
                    const HashCode512 * query,
                    Datastore_Value ** value);
 
@@ -171,7 +171,7 @@
  * a certain block of data.
  */
 void fileBlockGetQuery(const DBlock * data,
-                      unsigned int len,
+                      unsigned short len,
                       HashCode512 * query);
 
 
@@ -180,13 +180,13 @@
  * a certain block of data.
  */
 void fileBlockGetKey(const DBlock * data,
-                    unsigned int len,
+                    unsigned short len,
                     HashCode512 * key);
 
 /**
  * What is the type of the given block of data?
  */
-unsigned int getTypeOfBlock(unsigned int size,
+unsigned int getTypeOfBlock(unsigned short 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 int size,
+int getQueryFor(unsigned short size,
                const DBlock * data,
                HashCode512 * query);
 
@@ -218,7 +218,7 @@
  *         query type
  */
 int isDatumApplicable(unsigned int type,
-                     unsigned int size,
+                     unsigned short size,
                      const DBlock * data,
                      unsigned int keyCount,
                      const HashCode512 * keys);