gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r6372 - GNUnet/src/applications/hostlist


From: gnunet
Subject: [GNUnet-SVN] r6372 - GNUnet/src/applications/hostlist
Date: Mon, 18 Feb 2008 19:04:32 -0700 (MST)

Author: grothoff
Date: 2008-02-18 19:04:32 -0700 (Mon, 18 Feb 2008)
New Revision: 6372

Modified:
   GNUnet/src/applications/hostlist/Makefile.am
   GNUnet/src/applications/hostlist/check.conf
   GNUnet/src/applications/hostlist/hostlisttest.c
Log:
fixes

Modified: GNUnet/src/applications/hostlist/Makefile.am
===================================================================
--- GNUnet/src/applications/hostlist/Makefile.am        2008-02-19 01:51:41 UTC 
(rev 6371)
+++ GNUnet/src/applications/hostlist/Makefile.am        2008-02-19 02:04:32 UTC 
(rev 6372)
@@ -19,13 +19,13 @@
 
 
 check_PROGRAMS = \
-  hostlisttest_tcp 
+  hostlisttest 
 
 TESTS = $(check_PROGRAMS)
 
-hostlisttest_tcp_SOURCES = \
+hostlisttest_SOURCES = \
   hostlisttest.c 
-hostlisttest_tcp_LDADD = \
+hostlisttest_LDADD = \
   $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
   $(top_builddir)/src/applications/testing/libgnunettesting_api.la \
   $(top_builddir)/src/util/libgnunetutil.la 

Modified: GNUnet/src/applications/hostlist/check.conf
===================================================================
--- GNUnet/src/applications/hostlist/check.conf 2008-02-19 01:51:41 UTC (rev 
6371)
+++ GNUnet/src/applications/hostlist/check.conf 2008-02-19 02:04:32 UTC (rev 
6372)
@@ -1,6 +1,6 @@
 # General settings
 [GNUNET]
-GNUNET_HOME = "/tmp/gnunet-session-test-driver"
+GNUNET_HOME = "/tmp/gnunet-hostlist-test-driver"
 LOGLEVEL = "WARNING"
 LOGFILE = ""
 PROCESS-PRIORITY = "NORMAL"

Modified: GNUnet/src/applications/hostlist/hostlisttest.c
===================================================================
--- GNUnet/src/applications/hostlist/hostlisttest.c     2008-02-19 01:51:41 UTC 
(rev 6371)
+++ GNUnet/src/applications/hostlist/hostlisttest.c     2008-02-19 02:04:32 UTC 
(rev 6372)
@@ -46,21 +46,17 @@
 }
 
 /**
- * Testcase to test p2p session key exchange.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0: ok, -1: error
+ * Testcase to test hostlist. 
  */
 int
 main (int argc, char **argv)
 {
 #if START_PEERS
-  struct GNUNET_TESTING_DaemonContext *peers;
+  pid_t peer1;
+  pid_t peer2;
 #endif
   int ret;
   struct GNUNET_ClientServerConnection *sock1;
-  struct GNUNET_ClientServerConnection *sock2;
   int left;
   struct GNUNET_GC_Configuration *cfg;
 
@@ -71,12 +67,18 @@
       return -1;
     }
 #if START_PEERS
-  peers = GNUNET_TESTING_start_daemons (strstr (argv[0], "_") + 1,      /* 
tcp, udp or http */
-                                        "advertising stats",
-                                        "/tmp/gnunet-session-test", 2087,
-                                        10000, 2);
-  if (peers == NULL)
+  GNUNET_disk_directory_remove(NULL, "/tmp/gnunet-hostlist-test-server");
+  GNUNET_disk_directory_remove(NULL, "/tmp/gnunet-hostlist-test-client");
+  peer1 = GNUNET_daemon_start (NULL, cfg, "tcp-peer.conf", GNUNET_NO);
+  if (peer1 == -1)
     {
+      GNUNET_GC_free (cfg);  
+      return -1;
+    }
+  peer2 = GNUNET_daemon_start (NULL, cfg, "nat-peer.conf", GNUNET_NO);
+  if (peer2 == -1)
+    {
+      GNUNET_daemon_stop (NULL, peer1);
       GNUNET_GC_free (cfg);
       return -1;
     }
@@ -84,15 +86,11 @@
   if (GNUNET_OK ==
       GNUNET_wait_for_daemon_running (NULL, cfg, 30 * GNUNET_CRON_SECONDS))
     {
+      GNUNET_thread_sleep(GNUNET_CRON_SECONDS); /* give stats time to load!*/
       sock1 = GNUNET_client_connection_create (NULL, cfg);
-      GNUNET_GC_set_configuration_value_string (cfg,
-                                                NULL,
-                                                "NETWORK",
-                                                "HOST", "localhost:12087");
-      sock2 = GNUNET_client_connection_create (NULL, cfg);
       left = 30;                /* how many iterations should we wait? */
       while (GNUNET_OK ==
-             GNUNET_STATS_get_statistics (NULL, sock1, &waitForConnect, NULL))
+            GNUNET_STATS_get_statistics (NULL, sock1, &waitForConnect, NULL))
         {
           printf ("Waiting for peers to connect (%u iterations left)...\n",
                   left);
@@ -105,15 +103,15 @@
             }
         }
       GNUNET_client_connection_destroy (sock1);
-      GNUNET_client_connection_destroy (sock2);
-    }
+     }
   else
     {
       printf ("Could not establish connection with peer.\n");
       ret = 1;
     }
 #if START_PEERS
-  GNUNET_TESTING_stop_daemons (peers);
+  GNUNET_daemon_stop (NULL, peer1);
+  GNUNET_daemon_stop (NULL, peer2);
 #endif
   GNUNET_GC_free (cfg);
   return (ok == 0) ? 1 : 0;





reply via email to

[Prev in Thread] Current Thread [Next in Thread]