fix leak, rename

5 files changed, 175 insertions, 3 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 743d93e14..6ac789c38 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -42,7 +42,7 @@ libgnunetfs_la_LDFLAGS = \
 
 
 libgnunetfstest_a_SOURCES = \
-  test_fs_lib.c test_fs_lib.h
+  fs_test_lib.c fs_test_lib.h
 
 libgnunetfstest_a_LIBADD = \
   $(top_builddir)/src/fs/libgnunetfs.la \
@@ -138,6 +138,7 @@ TESTS = \
  test_fs_start_stop \
  test_fs_unindex \
  test_fs_uri \
+ test_fs_test_lib \
  test_gnunet_service_fs_p2p
 # $(check_PROGRAMS)
 
@@ -220,6 +221,14 @@ test_fs_uri_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
+test_fs_test_lib_SOURCES = \
+ test_fs_test_lib.c
+test_fs_test_lib_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfstest.a \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/fs/libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
 test_gnunet_service_fs_p2p_SOURCES = \
  test_gnunet_service_fs_p2p.c
 test_gnunet_service_fs_p2p_LDADD = \
diff --git a/src/fs/test_fs_lib.c b/src/fs/fs_test_lib.c
index 8b8f3db06..1687aa7e9 100644
--- a/src/fs/test_fs_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -27,7 +27,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "test_fs_lib.h"
+#include "fs_test_lib.h"
 #include "gnunet_testing_lib.h"
 
 
@@ -443,6 +443,7 @@ GNUNET_FS_TEST_daemons_stop (struct GNUNET_SCHEDULER_Handle *sched,
   GNUNET_TESTING_daemons_stop (daemons[0]->group);
   for (i=0;i<total;i++)
     {
+      GNUNET_FS_stop (daemons[i]->fs);
       GNUNET_CONFIGURATION_destroy (daemons[i]->cfg);
       GNUNET_free (daemons[i]);
       daemons[i] = NULL;
diff --git a/src/fs/test_fs_lib.h b/src/fs/fs_test_lib.h
index b9bbf7480..b9bbf7480 100644
--- a/src/fs/test_fs_lib.h
+++ b/src/fs/fs_test_lib.h
diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c
new file mode 100644
index 000000000..3118d685d
--- /dev/null
+++ b/src/fs/test_fs_test_lib.c
@@ -0,0 +1,162 @@
+/*
+     This file is part of GNUnet.
+     (C) 2010 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file fs/test_fs_test_lib.c
+ * @brief test fs test library
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "test_fs_lib.h"
+
+#define VERBOSE GNUNET_YES
+
+/**
+ * File-size we use for testing.
+ */
+#define FILESIZE (1024 * 1024 * 2)
+
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
+#define NUM_DAEMONS 2
+
+#define SEED 42
+
+static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS];
+
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+
+static void
+do_stop (void *cls,
+         const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Finished download, shutting down\n",
+              (unsigned long long) FILESIZE);
+  GNUNET_FS_TEST_daemons_stop (sched,
+                               NUM_DAEMONS,
+                               daemons);
+}
+
+
+static void
+do_download (void *cls,
+             const struct GNUNET_FS_Uri *uri)
+{
+  GNUNET_assert (NULL != uri);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Downloading %llu bytes\n",
+              (unsigned long long) FILESIZE);
+  GNUNET_FS_TEST_download (sched,
+                           daemons[0],
+                           TIMEOUT,
+                           1, SEED, uri, 
+                           VERBOSE, 
+                           &do_stop, NULL);
+}
+
+
+static void
+do_publish (void *cls,
+            const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Publishing %llu bytes\n",
+              (unsigned long long) FILESIZE);
+  GNUNET_FS_TEST_publish (sched,
+                          daemons[0],
+                          TIMEOUT,
+                          1, GNUNET_NO, FILESIZE, SEED, 
+                          VERBOSE, 
+                          &do_download, NULL);
+}
+
+
+static void
+do_connect (void *cls,
+            const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Daemons started, will now try to connect them\n");
+  GNUNET_FS_TEST_daemons_connect (sched,
+                                  daemons[0],
+                                  daemons[1],
+                                  TIMEOUT,
+                                  &do_publish,
+                                  NULL);  
+}
+
+
+static void
+run (void *cls,
+     struct GNUNET_SCHEDULER_Handle *s,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  sched = s;
+  GNUNET_FS_TEST_daemons_start (sched,
+                                TIMEOUT,
+                                NUM_DAEMONS,
+                                daemons,
+                                &do_connect,
+                                NULL);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  char *const argvx[] = { 
+    "test-gnunet-service-fs-p2p",
+    "-c",
+    "test_fs_lib_data.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  GNUNET_log_setup ("test_gnunet_service_fs_p2p", 
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
+                      argvx, "test-gnunet-service-fs-p2p",
+                      "nohelp", options, &run, NULL);
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+  return 0;
+}
+
+/* end of test_gnunet_service_fs_p2p.c */
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 6b95221d1..aff5d7b9a 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -87,7 +87,7 @@ do_publish (void *cls,
               "Publishing %llu bytes\n",
               (unsigned long long) FILESIZE);
   GNUNET_FS_TEST_publish (sched,
-                          daemons[0],
+                          daemons[1],
                           TIMEOUT,
                           1, GNUNET_NO, FILESIZE, SEED, 
                           VERBOSE,