From: Matthias Wachs <wachs@net.in.tum.de>
Date: Fri, 30 Apr 2010 08:19:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: initial-import-from-subversion-38251~21948
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=169bd4349f810b79f65bd3b671900653fe775af7;p=oweals%2Fgnunet.git

---

diff --git a/src/hostlist/.libs/gnunet-daemon-hostlist b/src/hostlist/.libs/gnunet-daemon-hostlist
new file mode 100755
index 000000000..32df3a663
Binary files /dev/null and b/src/hostlist/.libs/gnunet-daemon-hostlist differ
diff --git a/src/hostlist/.libs/test_gnunet_daemon_hostlist b/src/hostlist/.libs/test_gnunet_daemon_hostlist
new file mode 100755
index 000000000..3946c21b1
Binary files /dev/null and b/src/hostlist/.libs/test_gnunet_daemon_hostlist differ
diff --git a/src/hostlist/.libs/test_gnunet_daemon_hostlist_learning b/src/hostlist/.libs/test_gnunet_daemon_hostlist_learning
new file mode 100755
index 000000000..a72af6476
Binary files /dev/null and b/src/hostlist/.libs/test_gnunet_daemon_hostlist_learning differ
diff --git a/src/hostlist/hostlists_adv_peer.file b/src/hostlist/hostlists_adv_peer.file
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/hostlist/hostlists_learn_peer2.file b/src/hostlist/hostlists_learn_peer2.file
new file mode 100644
index 000000000..79df4dfe8
Binary files /dev/null and b/src/hostlist/hostlists_learn_peer2.file differ
diff --git a/src/hostlist/learning_peer1.conf b/src/hostlist/learning_peer1.conf
deleted file mode 100644
index fe02e1964..000000000
--- a/src/hostlist/learning_peer1.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-1/
-DEFAULTCONFIG = learning_peer1.conf
-
-[resolver]
-PORT = 12964
-
-[transport]
-PORT = 12965
-PLUGINS = tcp
-DEBUG = YES
-
-[arm]
-PORT = 12966
-DEFAULTSERVICES = resolver transport core statistics topology
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
-#DEBUG=NO
-
-[statistics]
-PORT = 12967
-
-[transport-tcp]
-PORT = 12968
-
-[peerinfo]
-PORT = 12969
-
-[core]
-PORT = 12970
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
-
-[hostlist]
-HTTPPORT = 12980
-SERVERS = http://localhost:12981/
-OPTIONS = -b -p -e -a
-DEBUG = YES
-HOSTLISTFILE = hostlists_peer1.file
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
-
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
diff --git a/src/hostlist/learning_peer2.conf b/src/hostlist/learning_peer2.conf
deleted file mode 100644
index 125516082..000000000
--- a/src/hostlist/learning_peer2.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-2/
-DEFAULTCONFIG = learning_peer2.conf
-
-[resolver]
-PORT = 22964
-
-[transport]
-PORT = 22965
-PLUGINS = tcp
-DEBUG = YES
-
-[arm]
-PORT = 22966
-DEFAULTSERVICES = resolver transport core statistics topology
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args
-#DEBUG=NO
-
-[statistics]
-PORT = 22967
-
-[transport-tcp]
-PORT = 22968
-
-[peerinfo]
-PORT = 22969
-
-[core]
-PORT = 22970
-DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
-
-[hostlist]
-HTTPPORT = 12981
-SERVERS = http://localhost:12980/
-OPTIONS = -b -p -e -a
-DEBUG = YES
-HOSTLISTFILE = hostlists_peer2.file
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 25456908a..e502a7175 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -506,6 +506,12 @@ main (int argc, char *argv[])
   ret = check ();
   GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
   GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
+  if ( GNUNET_YES == GNUNET_DISK_file_test ("hostlists_learn_peer.file") )
+    {
+      if ( remove ("hostlists_learn_peer.file")  == 0)
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+            _("Hostlist file hostlists_learn_peer.file was removed\n"));
+    }
   return ret; 
 }
 
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index fdf3095d5..ff25d0109 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -38,7 +38,7 @@ HTTPPORT = 12981
 SERVERS = http://localhost:12981/
 OPTIONS = -p -a
 #OPTIONS = -b -p -a
-DEBUG = YES
+#DEBUG = YES
 HOSTLISTFILE = hostlists_adv_peer.file
 #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
 
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 01873e6d6..19e73b5f3 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -37,7 +37,7 @@ HTTPPORT = 12980
 SERVERS = http://localhost:12981/
 OPTIONS = -b -e
 #OPTIONS = -b -p
-DEBUG = YES
+#DEBUG = YES
 HOSTLISTFILE = hostlists_learn_peer.file
 #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist