[GNUnet-SVN] r3826 - in GNUnet/src: applications/fs/fsui server util/network_client util/os

[grothoff]

Author: grothoff
Date: 2006-11-29 20:38:46 -0800 (Wed, 29 Nov 2006)
New Revision: 3826

Modified:
   GNUnet/src/applications/fs/fsui/downloadtest.c
   GNUnet/src/applications/fs/fsui/searchtest.c
   GNUnet/src/server/gnunetd.c
   GNUnet/src/util/network_client/tcpio.c
   GNUnet/src/util/os/daemon.c
Log:
fixes

Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c      2006-11-30 04:13:55 UTC 
(rev 3825)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c      2006-11-30 04:38:46 UTC 
(rev 3826)
@@ -22,10 +22,6 @@
  * @file applications/fs/fsui/downloadtest.c
  * @brief testcase for fsui download persistence (upload-download)
  * @author Christian Grothoff
- *
- * Todo:
- * - test more features of download (recursive, multiple files
- *   in parallel, etc.)
  */
 
 #include "platform.h"
@@ -85,6 +81,15 @@
 #endif
     download = event->data.DownloadResumed.dc.pos;
     break;
+  case FSUI_search_completed:
+#if DEBUG_VERBOSE
+    printf("Search completed\n");
+#endif
+    if (download == NULL) {
+      fprintf(stderr,
+             "ERROR: Search completed but download not started!\n");
+    }
+    break;
   case FSUI_search_result:
 #if DEBUG_VERBOSE
     printf("Received search result\n");

Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c        2006-11-30 04:13:55 UTC 
(rev 3825)
+++ GNUnet/src/applications/fs/fsui/searchtest.c        2006-11-30 04:38:46 UTC 
(rev 3826)
@@ -208,6 +208,11 @@
   prog = 0;
   while (lastEvent != FSUI_upload_completed) {
     prog++;
+    if (prog == 10000) {
+      fprintf(stderr,
+             "Upload failed to complete -- last event: %u\n",
+             lastEvent);
+    }
     CHECK(prog < 10000)
     PTHREAD_SLEEP(50 * cronMILLIS);
     if (GNUNET_SHUTDOWN_TEST() == YES)

Modified: GNUnet/src/server/gnunetd.c
===================================================================
--- GNUnet/src/server/gnunetd.c 2006-11-30 04:13:55 UTC (rev 3825)
+++ GNUnet/src/server/gnunetd.c 2006-11-30 04:38:46 UTC (rev 3826)
@@ -48,6 +48,8 @@
 
 static int debug_flag;
 
+static int quiet_flag;
+
 #ifndef WINDOWS
 /**
  * Cron job that triggers re-reading of the configuration.
@@ -174,6 +176,9 @@
   { 'p', "padding-disable", "YES/NO",
     gettext_noop("disable padding with random data (experimental)"), 0,
     &gnunet_getopt_configure_set_option, "GNUNETD-EXPERIMENTAL:PADDING" },
+  { 'q', "quiet", NULL,
+    gettext_noop("run in quiet mode"),
+    0, &gnunet_getopt_configure_set_one, &quiet_flag },
 #ifndef MINGW
   { 'u', "user", "USERNAME",
     gettext_noop("specify username as which gnunetd should run"), 1,
@@ -210,12 +215,14 @@
     return 1;
   }
   if (YES == debug_flag) {
-    ectx = GE_create_context_multiplexer(ectx,
-                                        GE_create_context_stderr(NO,
-                                                                 GE_USERKIND |
-                                                                 GE_EVENTKIND |
-                                                                 GE_BULK |
-                                                                 
GE_IMMEDIATE));
+    if (quiet_flag == 0) {
+      ectx = GE_create_context_multiplexer(ectx,
+                                          GE_create_context_stderr(NO,
+                                                                   GE_USERKIND 
|
+                                                                   
GE_EVENTKIND |
+                                                                   GE_BULK |
+                                                                   
GE_IMMEDIATE));
+    }
   }
   if (OK != changeUser(ectx, cfg)) {
     GNUNET_fini(ectx, cfg);

Modified: GNUnet/src/util/network_client/tcpio.c
===================================================================
--- GNUnet/src/util/network_client/tcpio.c      2006-11-30 04:13:55 UTC (rev 
3825)
+++ GNUnet/src/util/network_client/tcpio.c      2006-11-30 04:38:46 UTC (rev 
3826)
@@ -161,6 +161,8 @@
     sock->dead = YES;
     MUTEX_UNLOCK(sock->writelock);
     MUTEX_UNLOCK(sock->readlock);
+  } else {
+    sock->dead = YES;
   }
   MUTEX_UNLOCK(sock->destroylock);
 }

Modified: GNUnet/src/util/os/daemon.c
===================================================================
--- GNUnet/src/util/os/daemon.c 2006-11-30 04:13:55 UTC (rev 3825)
+++ GNUnet/src/util/os/daemon.c 2006-11-30 04:38:46 UTC (rev 3826)
@@ -43,7 +43,7 @@
 
   pid = fork();
   if (pid == 0) {
-    const char * args[5];
+    const char * args[6];
     char * path;
     char * cp;
     int i;
@@ -67,7 +67,8 @@
       args[2] = cfgFile;
       if (NO == daemonize) {
        args[3] = "-d";
-       args[4] = NULL;
+       args[4] = "-q";
+       args[5] = NULL;
       } else
        args[3] = NULL;
     } else {