[GNUnet-SVN] r4818 - GNUnet/src/applications/dht/tools

[gnunet]

Author: grothoff
Date: 2007-05-27 21:30:16 -0600 (Sun, 27 May 2007)
New Revision: 4818

Removed:
   GNUnet/src/applications/dht/tools/peer1.conf
   GNUnet/src/applications/dht/tools/peer1/
   GNUnet/src/applications/dht/tools/peer2.conf
Modified:
   GNUnet/src/applications/dht/tools/Makefile.am
   GNUnet/src/applications/dht/tools/dhttest2.c
Log:
bye

Modified: GNUnet/src/applications/dht/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/tools/Makefile.am       2007-05-28 02:44:36 UTC 
(rev 4817)
+++ GNUnet/src/applications/dht/tools/Makefile.am       2007-05-28 03:30:16 UTC 
(rev 4818)
@@ -40,8 +40,4 @@
   $(top_builddir)/src/util/libgnunetutil.la 
 
 EXTRA_DIST = \
-  check.conf \
-  peer1.conf \
-  peer2.conf \
-  peer1/.hostkey \
-  peer2/.hostkey 
+  check.conf 

Modified: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c        2007-05-28 02:44:36 UTC 
(rev 4817)
+++ GNUnet/src/applications/dht/tools/dhttest2.c        2007-05-28 03:30:16 UTC 
(rev 4818)
@@ -45,10 +45,7 @@
 int main(int argc,
         const char ** argv) {
 #if START_PEERS
-  pid_t daemon1;
-  pid_t daemon2;
-  PeerIdentity peer1;
-  PeerIdentity peer2;
+  struct DaemonContext * peers;
 #endif
   int ret;
   HashCode512 key;
@@ -64,28 +61,19 @@
     return -1;
   }
 #if START_PEERS
-  if ( (OK != gnunet_testing_start_daemon(12087,
-                                         10000,
-                                         "/tmp/dht-test-1",
-                                         "tcp",
-                                         "advertising dht",
-                                         &daemon1,
-                                         &peer1)) ||
-       (OK != gnunet_testing_start_daemon(22087,
-                                         20000,
-                                         "/tmp/dht-test-2",
-                                         "tcp",
-                                         "advertising dht",
-                                         &daemon2,
-                                         &peer2)) ||
-       (OK != gnunet_testing_connect_daemons(12087,
-                                            22087)) ) {
-    gnunet_testing_stop_daemon(12087, daemon1);
-    gnunet_testing_stop_daemon(12087, daemon2);
+  peers = gnunet_testing_start_daemons("tcp",
+                                      "advertising dht stats",                 
               
+                                      "/tmp/dht-test",
+                                      2087,
+                                      10000,
+                                      2);
+  if (peers == NULL) {
     GC_free(cfg);
     return -1;
   }
 #endif
+  gnunet_testing_connect_daemons(2087,
+                                12087);
 
   /* actual test code */
   hash("key2", 4, &key);
@@ -169,8 +157,7 @@
 
  FAILURE:
 #if START_PEERS
-  gnunet_testing_stop_daemon(12087, daemon1);
-  gnunet_testing_stop_daemon(12087, daemon2);
+  gnunet_testing_stop_daemons(peers);
 #endif
   GC_free(cfg);
   return ret;

Deleted: GNUnet/src/applications/dht/tools/peer1.conf
===================================================================
--- GNUnet/src/applications/dht/tools/peer1.conf        2007-05-28 02:44:36 UTC 
(rev 4817)
+++ GNUnet/src/applications/dht/tools/peer1.conf        2007-05-28 03:30:16 UTC 
(rev 4818)
@@ -1,62 +0,0 @@
-# This is the configuration for the GNUnet daemon when running
-# the test in this directory (make check).
-
-[PATHS]
-GNUNETD_HOME     = peer1
-
-[GNUNETD]
-GNUNETD_HOME     = peer1
-# VALGRIND        = 300
-HELLOEXPIRES     = 60
-LOGLEVEL        = DEBUG
-LOGFILE         = $GNUNETD_HOME/log
-KEEPLOG         = 0
-PIDFILE         = $GNUNETD_HOME/gnunetd.pid
-HOSTS          = $GNUNETD_HOME/data/hosts/
-APPLICATIONS = "advertising topology dht stats"
-TRANSPORTS = "tcp"
-
-[MODULES]
-topology = "topology_default"
-
-[NETWORK]
-PORT = 2087
-INTERFACE = eth0
-HELOEXCHANGE = NO
-TRUSTED = 127.0.0.0/8;
-IP = 127.0.0.1
-
-[LOAD]
-INTERFACES          = eth0
-BASICLIMITING       = YES
-MAXNETUPBPSTOTAL    = 50000
-MAXNETDOWNBPSTOTAL  = 50000
-MAXCPULOAD         = 100
-
-[TCP]
-PORT = 2086
-# BLACKLIST = 
-
-[UDP]
-PORT = 2086
-# BLACKLIST = 
-MTU = 1472
-
-[UDP6]
-# Default port is 2088 and MTU is 1452.
-PORT = 2088
-# BLACKLIST = 
-MTU = 1452
-
-[TCP6]
-
-# Default port is 2088 and MTU is 1440.
-PORT = 2088
-# BLACKLIST = 
-MTU = 1440
-
-[HTTP]
-# Default port is 1080 and MTU is 1400.
-PORT = 1080
-# BLACKLIST =
-

Deleted: GNUnet/src/applications/dht/tools/peer2.conf
===================================================================
--- GNUnet/src/applications/dht/tools/peer2.conf        2007-05-28 02:44:36 UTC 
(rev 4817)
+++ GNUnet/src/applications/dht/tools/peer2.conf        2007-05-28 03:30:16 UTC 
(rev 4818)
@@ -1,62 +0,0 @@
-# This is the configuration for the GNUnet daemon when running
-# the test in this directory (make check).
-
-[PATHS]
-GNUNETD_HOME     = peer2
-
-[GNUNETD]
-GNUNETD_HOME     = peer2
-# VALGRIND        = 300
-HELLOEXPIRES    = 60
-LOGLEVEL        = DEBUG
-LOGFILE         = $GNUNETD_HOME/log
-KEEPLOG         = 0
-PIDFILE         = $GNUNETD_HOME/gnunetd.pid
-HOSTS          = $GNUNETD_HOME/data/hosts/
-APPLICATIONS = "advertising topology dht"
-TRANSPORTS  = "tcp"
-
-[MODULES]
-topology = "topology_default"
-
-[NETWORK]
-PORT = 12087
-INTERFACE = eth0
-HELOEXCHANGE = NO
-TRUSTED = 127.0.0.0/8;
-IP = 127.0.0.1
-
-[LOAD]
-INTERFACES          = eth0
-BASICLIMITING       = YES
-MAXNETUPBPSTOTAL    = 50000
-MAXNETDOWNBPSTOTAL  = 50000
-MAXCPULOAD         = 100
-
-[TCP]
-PORT = 12086
-# BLACKLIST = 
-
-[UDP]
-PORT = 12086
-# BLACKLIST = 
-MTU = 1472
-
-[UDP6]
-# Default port is 2088 and MTU is 1452.
-PORT = 12088
-# BLACKLIST = 
-MTU = 1452
-
-[TCP6]
-
-# Default port is 2088 and MTU is 1440.
-PORT = 12088
-# BLACKLIST = 
-MTU = 1440
-
-[HTTP]
-# Default port is 1080 and MTU is 1400.
-PORT = 11080
-# BLACKLIST =
-