[GNUnet-SVN] r3521 - GNUnet/src/applications/fs/fsui

[grothoff]

Author: grothoff
Date: 2006-10-20 22:32:29 -0700 (Fri, 20 Oct 2006)
New Revision: 3521

Modified:
   GNUnet/src/applications/fs/fsui/downloadtest.c
   GNUnet/src/applications/fs/fsui/fsui.c
   GNUnet/src/applications/fs/fsui/fsuitest.c
   GNUnet/src/applications/fs/fsui/fsuitest2.c
Log:
fx

Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c      2006-10-21 05:19:15 UTC 
(rev 3520)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c      2006-10-21 05:32:29 UTC 
(rev 3521)
@@ -35,7 +35,7 @@
 #include "gnunet_util_network_client.h"
 #include "gnunet_util_crypto.h"
 
-#define DEBUG_VERBOSE YES
+#define DEBUG_VERBOSE NO
 
 #define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
 
@@ -210,7 +210,7 @@
 
 #define FILESIZE (1024 * 1024 * 2)
 
-#define START_DAEMON 0
+#define START_DAEMON 1
 
 int main(int argc, char * argv[]){
 #if START_DAEMON

Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c      2006-10-21 05:19:15 UTC (rev 
3520)
+++ GNUnet/src/applications/fs/fsui/fsui.c      2006-10-21 05:32:29 UTC (rev 
3521)
@@ -384,7 +384,7 @@
       shared = list->shared;
       EXTRACTOR_removeAll(shared->extractors);
       ECRS_freeUri(shared->global_keywords);
-      FREE(shared->extractor_config);
+      FREENONNULL(shared->extractor_config);
       FREE(shared);
     }
     FREE(list);

Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c  2006-10-21 05:19:15 UTC (rev 
3520)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c  2006-10-21 05:32:29 UTC (rev 
3521)
@@ -30,7 +30,7 @@
 #include "gnunet_util_config_impl.h"
 #include "gnunet_util_network_client.h"
 
-#define DEBUG_VERBOSE NO
+#define DEBUG_VERBOSE YES
 
 #define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(NULL, 0); goto FAILURE; }
 
@@ -104,9 +104,12 @@
   return NULL;
 }
 
+#define START_DAEMON 0
 
 int main(int argc, char * argv[]){
+#if START_DAEMON
   pid_t daemon;
+#endif
   int ok;
   struct ECRS_URI * uri;
   char * filename = NULL;
@@ -130,11 +133,13 @@
     GC_free(cfg);
     return -1;  
   }
+#if START_DAEMON
   daemon  = os_daemon_start(NULL,
                            cfg,
                            "peer.conf",
                            NO);
   GE_ASSERT(NULL, daemon > 0);
+#endif
   GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
                                                    cfg,
                                                    30 * cronSECONDS));
@@ -234,7 +239,9 @@
   UNLINK(filename);
   FREE(filename);
 
+#if START_DAEMON
   GE_ASSERT(NULL, OK == os_daemon_stop(NULL, daemon));
+#endif
   GC_free(cfg);
 
   return (ok == YES) ? 0 : 1;

Modified: GNUnet/src/applications/fs/fsui/fsuitest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest2.c 2006-10-21 05:19:15 UTC (rev 
3520)
+++ GNUnet/src/applications/fs/fsui/fsuitest2.c 2006-10-21 05:32:29 UTC (rev 
3521)
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file applications/fs/fsui/fsuitest.c
+ * @file applications/fs/fsui/fsuitest2.c
  * @brief testcase for fsui (upload-download)
  * @author Christian Grothoff
  */
@@ -40,9 +40,12 @@
   return NULL;
 }
 
+#define START_DAEMON 1
 
 int main(int argc, char * argv[]){
+#if START_DAEMON
   pid_t daemon;
+#endif
   int ok;
   struct GC_Configuration * cfg;
 
@@ -52,11 +55,13 @@
     GC_free(cfg);
     return -1;  
   }
+#if START_DAEMON
   daemon  = os_daemon_start(NULL,
                            cfg,
                            "peer.conf",
                            NO);
   GE_ASSERT(NULL, daemon > 0);
+#endif
   ok = YES;
   GE_ASSERT(NULL, OK == connection_wait_for_running(NULL,
                                                    cfg,
@@ -84,8 +89,9 @@
  FAILURE:
   if (ctx != NULL)
     FSUI_stop(ctx);
-
+#if START_DAEMON
   GE_ASSERT(NULL, OK == os_daemon_stop(NULL, daemon));
+#endif
   GC_free(cfg);
 
   return (ok == YES) ? 0 : 1;