[GNUnet-SVN] r268 - in GNUnet: . src/applications/gap src/applications/sqstore_mysql src/server

[grothoff]

Author: grothoff
Date: 2005-02-14 22:17:28 -0800 (Mon, 14 Feb 2005)
New Revision: 268

Modified:
   GNUnet/src/applications/gap/gap.c
   GNUnet/src/applications/sqstore_mysql/mysql.c
   GNUnet/src/server/gnunetd.c
   GNUnet/src/server/startup.c
   GNUnet/todo
Log:
various bugfixes

Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c   2005-02-15 05:13:40 UTC (rev 267)
+++ GNUnet/src/applications/gap/gap.c   2005-02-15 06:17:28 UTC (rev 268)
@@ -1505,6 +1505,7 @@
       
       FREE(cls.values[perm[i]]);
     }
+    FREE(perm);
   }
 
 
@@ -2039,6 +2040,7 @@
     coreAPI->releaseService(traffic);
     traffic = NULL;
   }
+  FREE(ROUTING_indTable_);
   lock = NULL;
   coreAPI = NULL;
   bs = NULL;

Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c       2005-02-15 05:13:40 UTC 
(rev 267)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c       2005-02-15 06:17:28 UTC 
(rev 268)
@@ -20,13 +20,12 @@
 
 /**
  * @file applications/sqstore_mysql/mysql.c
- * @author Igor Wronsky
+ * @author Igor Wronsky and Christian Grothoff
  *
  * Database: MySQL
  *
- * NOTE: This db module does NOT work with mysql v3.23.49 due to a bug
- * in mysql.  All later versions should be fine, including the 4.0.x
- * series. Current devel version is 4.0.22 on debian/unstable.
+ * NOTE: This db module does NOT work with mysql prior to 4.1 since
+ * it uses prepared statements.
  *
  * HIGHLIGHTS
  *
@@ -979,14 +978,14 @@
             "DELETE FROM gn070 WHERE hash='%s'",       
             escapedHash);
   } else {
-    /* FIXME: type=%d since the value is a
+    /* FIXME: type/prio/anon=%d since the value is a
        signed int here; it would be clean(er) if
        we were to use prepared statements here, too */
     SNPRINTF(scratch, 
             n,
             "DELETE FROM gn070 WHERE hash='%s'"
-            " AND size=%u AND type=%d AND prio=%u"
-            " AND anonLevel=%u AND expire=%lld"
+            " AND size=%u AND type=%d AND prio=%d"
+            " AND anonLevel=%d AND expire=%lld"
             " AND value='%s'",
             escapedHash,
             ntohl(value->size),
@@ -1089,7 +1088,6 @@
   MUTEX_LOCK(&dbh->DATABASE_Lock_);
 
   /* find out average row length in bytes */
-  /* FIXME: probably unnecessary to check avg row length every time */
   mysql_query(dbh->dbf,
              "SHOW TABLE STATUS FROM gnunet LIKE 'gn070'");
   if (mysql_error(dbh->dbf)[0]) {
@@ -1263,7 +1261,6 @@
       FREE(cnffile);
       return NULL;
     }
-    /* FIXME: mysql manual doesn't mention if sql_fields should be freed?*/
   } else {
     LOG(LOG_ERROR, "ERROR: couldn't store res row for SHOW TABLE STATUS\n");
     BREAK();

Modified: GNUnet/src/server/gnunetd.c
===================================================================
--- GNUnet/src/server/gnunetd.c 2005-02-15 05:13:40 UTC (rev 267)
+++ GNUnet/src/server/gnunetd.c 2005-02-15 06:17:28 UTC (rev 268)
@@ -137,6 +137,7 @@
   LOG(LOG_MESSAGE,
       _("'%s' startup complete.\n"),
       "gnunetd");
+  
   waitForSignalHandler();
   LOG(LOG_MESSAGE,
       _("'%s' is shutting down.\n"),

Modified: GNUnet/src/server/startup.c
===================================================================
--- GNUnet/src/server/startup.c 2005-02-15 05:13:40 UTC (rev 267)
+++ GNUnet/src/server/startup.c 2005-02-15 06:17:28 UTC (rev 268)
@@ -220,8 +220,8 @@
 
   /* mechanism to stop gnunetd after a certain
      time without a signal -- to debug with valgrind*/
-  valgrind = getConfigurationInt("GNUNETD",
-                                "VALGRIND");
+  valgrind = 240; //getConfigurationInt("GNUNETD",
+  //    "VALGRIND");
   if (valgrind > 0)
     addCronJob(&semaphore_up,
               valgrind * cronSECONDS,

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-02-15 05:13:40 UTC (rev 267)
+++ GNUnet/todo 2005-02-15 06:17:28 UTC (rev 268)
@@ -14,13 +14,15 @@
   generated public keys are fishy 
   (far to many 0-values in N!)
 - Need testing:
-  * FS/ECRS upload/download: automated tests!
+  * ECRS upload/download: automated tests!
   * ECRS-directories (build, iterate)
   * gnunet-directory
   * gnunet-pseudonym
 - Resolve "@todo [WIN]" (Nils)
 
 0.7.0pre1 [4'05] (aka "preview"):
+- fslibtest: implement verify result
+- fslibtest/ecrstest: make GNUnet use 'check' database (not main DB!)
 - topology: do aggressive bootstrap on first start (Christian) [ easy ]
 - sqlite sqstore implementation does not compile yet (Nils)
 - gnunet-search: