-file renaming stream->mesh

9 files changed, 21 insertions, 21 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 842da5d47..f0fa73143 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -186,7 +186,7 @@ gnunet_service_fs_SOURCES =  \
  gnunet-service-fs_pr.c gnunet-service-fs_pr.h \
  gnunet-service-fs_push.c gnunet-service-fs_push.h \
  gnunet-service-fs_put.c gnunet-service-fs_put.h \
- gnunet-service-fs_stream.c gnunet-service-fs_stream.h 
+ gnunet-service-fs_mesh.c gnunet-service-fs_mesh.h 
 gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/fs/libgnunetfs.la \
  $(top_builddir)/src/dht/libgnunetdht.la \
@@ -239,7 +239,7 @@ check_PROGRAMS = \
  test_plugin_block_fs \
  test_fs_directory \
  test_fs_download \
- test_fs_download_stream \
+ test_fs_download_mesh \
  test_fs_download_indexed \
  test_fs_download_persistence \
  test_fs_file_information \
@@ -260,7 +260,7 @@ check_PROGRAMS = \
  test_fs_uri \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
- test_gnunet_service_fs_p2p_stream \
+ test_gnunet_service_fs_p2p_mesh \
  $(FS_BENCHMARKS)
 
 test_plugin_block_fs_SOURCES = \
@@ -306,7 +306,7 @@ TESTS = \
  test_fs_test_lib \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
- test_gnunet_service_fs_p2p_stream \
+ test_gnunet_service_fs_p2p_mesh \
  perf_gnunet_service_fs_p2p \
  perf_gnunet_service_fs_p2p_index \
  perf_gnunet_service_fs_p2p_respect \
@@ -343,9 +343,9 @@ test_fs_download_indexed_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
-test_fs_download_stream_SOURCES = \
+test_fs_download_mesh_SOURCES = \
  test_fs_download.c
-test_fs_download_stream_LDADD = \
+test_fs_download_mesh_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la  \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
@@ -469,9 +469,9 @@ test_gnunet_service_fs_p2p_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
-test_gnunet_service_fs_p2p_stream_SOURCES = \
+test_gnunet_service_fs_p2p_mesh_SOURCES = \
  test_gnunet_service_fs_p2p.c
-test_gnunet_service_fs_p2p_stream_LDADD = \
+test_gnunet_service_fs_p2p_mesh_LDADD = \
   $(top_builddir)/src/fs/libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
@@ -547,7 +547,7 @@ EXTRA_DIST = \
   test_fs_data.conf \
   test_fs_download_data.conf \
   test_fs_download_indexed.conf \
-  test_fs_download_stream.conf \
+  test_fs_download_mesh.conf \
   test_fs_file_information_data.conf \
   fs_test_lib_data.conf \
   test_fs_list_indexed_data.conf \
@@ -557,7 +557,7 @@ EXTRA_DIST = \
   test_fs_unindex_data.conf \
   test_fs_uri_data.conf \
   test_gnunet_service_fs_migration_data.conf \
-  test_gnunet_service_fs_p2p_stream.conf \
+  test_gnunet_service_fs_p2p_mesh.conf \
   test_gnunet_fs_idx_data.conf \
   test_gnunet_fs_ns_data.conf \
   test_gnunet_fs_psd_data.conf \
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index fd3a7073d..2041103a1 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -43,7 +43,7 @@
 #include "gnunet-service-fs_pr.h"
 #include "gnunet-service-fs_push.h"
 #include "gnunet-service-fs_put.h"
-#include "gnunet-service-fs_stream.h"
+#include "gnunet-service-fs_mesh.h"
 #include "fs.h"
 
 /**
diff --git a/src/fs/gnunet-service-fs_stream.c b/src/fs/gnunet-service-fs_mesh.c
index 31a202d50..80d53ab8c 100644
--- a/src/fs/gnunet-service-fs_stream.c
+++ b/src/fs/gnunet-service-fs_mesh.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file fs/gnunet-service-fs_stream.c
+ * @file fs/gnunet-service-fs_mesh.c
  * @brief non-anonymous file-transfer
  * @author Christian Grothoff
  *
@@ -46,7 +46,7 @@
 #include "gnunet_applications.h"
 #include "gnunet-service-fs.h"
 #include "gnunet-service-fs_indexing.h"
-#include "gnunet-service-fs_stream.h"
+#include "gnunet-service-fs_mesh.h"
 
 /**
  * After how long do we termiante idle connections?
diff --git a/src/fs/gnunet-service-fs_stream.h b/src/fs/gnunet-service-fs_mesh.h
index 982766763..90cb8e5d8 100644
--- a/src/fs/gnunet-service-fs_stream.h
+++ b/src/fs/gnunet-service-fs_mesh.h
@@ -19,12 +19,12 @@
 */
 
 /**
- * @file fs/gnunet-service-fs_stream.h
+ * @file fs/gnunet-service-fs_mesh.h
  * @brief non-anonymous file-transfer
  * @author Christian Grothoff
  */
-#ifndef GNUNET_SERVICE_FS_STREAM_H
-#define GNUNET_SERVICE_FS_STREAM_H
+#ifndef GNUNET_SERVICE_FS_MESH_H
+#define GNUNET_SERVICE_FS_MESH_H
 
 /**
  * Handle for a request that is going out via stream API.
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 2ab4771b5..8bcc96b05 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -30,7 +30,7 @@
 #include "gnunet-service-fs_indexing.h"
 #include "gnunet-service-fs_pe.h"
 #include "gnunet-service-fs_pr.h"
-#include "gnunet-service-fs_stream.h"
+#include "gnunet-service-fs_mesh.h"
 
 
 /**
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index a62cf23a0..519923450 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -329,10 +329,10 @@ main (int argc, char *argv[])
     binary_name = "test-fs-download-indexed";
     config_name = "test_fs_download_indexed.conf";
   }
-  if (NULL != strstr (argv[0], "stream"))
+  if (NULL != strstr (argv[0], "mesh"))
   {
-    binary_name = "test-fs-download-stream";
-    config_name = "test_fs_download_stream.conf";
+    binary_name = "test-fs-download-mesh";
+    config_name = "test_fs_download_mesh.conf";
   }
   if (0 != GNUNET_TESTING_peer_run (binary_name,
                                     config_name,
diff --git a/src/fs/test_fs_download_stream.conf b/src/fs/test_fs_download_mesh.conf
index 3ee0b4152..3ee0b4152 100644
--- a/src/fs/test_fs_download_stream.conf
+++ b/src/fs/test_fs_download_mesh.conf
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 108b4e6c9..ddaff544f 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
 
   progname = argv[0];
   if (NULL != strstr (progname, "stream"))
-    config = "test_gnunet_service_fs_p2p_stream.conf";
+    config = "test_gnunet_service_fs_p2p_mesh.conf";
   else
     config = "fs_test_lib_data.conf";
   (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p",
diff --git a/src/fs/test_gnunet_service_fs_p2p_stream.conf b/src/fs/test_gnunet_service_fs_p2p_mesh.conf
index 9d01208cb..9d01208cb 100644
--- a/src/fs/test_gnunet_service_fs_p2p_stream.conf
+++ b/src/fs/test_gnunet_service_fs_p2p_mesh.conf