[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 01/03: BUILD: Move fs to contrib/service
|
From: |
gnunet |
|
Subject: |
[gnunet] 01/03: BUILD: Move fs to contrib/service |
|
Date: |
Thu, 19 Oct 2023 12:26:15 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 579d9473bb75072303789599b23be9b0203336fc
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 11:55:21 2023 +0200
BUILD: Move fs to contrib/service
---
configure.ac | 6 +-
po/POTFILES.in | 80 +++++-----
src/Makefile.am | 1 -
src/cli/Makefile.am | 1 +
src/cli/fs/.gitignore | 8 +
src/cli/fs/Makefile.am | 107 +++++++++++++
src/{ => cli}/fs/gnunet-auto-share.c | 0
src/{ => cli}/fs/gnunet-directory.c | 0
src/{ => cli}/fs/gnunet-download.c | 0
src/{ => cli}/fs/gnunet-fs.c | 0
src/{ => cli}/fs/gnunet-publish.c | 0
src/{ => cli}/fs/gnunet-search.c | 0
src/{ => cli}/fs/gnunet-unindex.c | 0
src/fs/test_gnunet_fs_idx.py.in | 113 --------------
src/fs/test_gnunet_fs_idx_data.conf | 7 -
src/fs/test_gnunet_fs_psd.py.in | 149 ------------------
src/fs/test_gnunet_fs_psd_data.conf | 7 -
src/fs/test_gnunet_fs_rec.py.in | 171 ---------------------
src/fs/test_gnunet_fs_rec_data.conf | 7 -
src/plugin/Makefile.am | 3 +-
src/plugin/fs/Makefile.am | 36 +++++
src/{ => plugin}/fs/plugin_block_fs.c | 0
src/service/Makefile.am | 3 +-
src/{ => service}/fs/.gitignore | 7 -
src/{ => service}/fs/Makefile.am | 146 ------------------
src/{ => service}/fs/fs.conf.in | 0
src/{ => service}/fs/fs.h | 0
src/{ => service}/fs/fs_api.c | 0
src/{ => service}/fs/fs_api.h | 0
src/{ => service}/fs/fs_directory.c | 0
src/{ => service}/fs/fs_dirmetascan.c | 0
src/{ => service}/fs/fs_download.c | 0
src/{ => service}/fs/fs_file_information.c | 0
src/{ => service}/fs/fs_getopt.c | 0
src/{ => service}/fs/fs_list_indexed.c | 0
src/{ => service}/fs/fs_misc.c | 0
src/{ => service}/fs/fs_namespace.c | 0
src/{ => service}/fs/fs_publish.c | 0
src/{ => service}/fs/fs_publish_ksk.c | 0
src/{ => service}/fs/fs_publish_ublock.c | 0
src/{ => service}/fs/fs_publish_ublock.h | 0
src/{ => service}/fs/fs_search.c | 0
src/{ => service}/fs/fs_sharetree.c | 0
src/{ => service}/fs/fs_test_lib.c | 0
src/{ => service}/fs/fs_test_lib.h | 0
src/{ => service}/fs/fs_test_lib_data.conf | 0
src/{ => service}/fs/fs_tree.c | 0
src/{ => service}/fs/fs_tree.h | 0
src/{ => service}/fs/fs_unindex.c | 0
src/{ => service}/fs/fs_uri.c | 0
src/{ => service}/fs/gnunet-daemon-fsprofiler.c | 0
src/{ => service}/fs/gnunet-fs-profiler.c | 0
src/{ => service}/fs/gnunet-helper-fs-publish.c | 0
src/{ => service}/fs/gnunet-service-fs.c | 0
src/{ => service}/fs/gnunet-service-fs.h | 0
src/{ => service}/fs/gnunet-service-fs_cadet.h | 0
.../fs/gnunet-service-fs_cadet_client.c | 0
.../fs/gnunet-service-fs_cadet_server.c | 0
src/{ => service}/fs/gnunet-service-fs_cp.c | 0
src/{ => service}/fs/gnunet-service-fs_cp.h | 0
src/{ => service}/fs/gnunet-service-fs_indexing.c | 0
src/{ => service}/fs/gnunet-service-fs_indexing.h | 0
src/{ => service}/fs/gnunet-service-fs_pe.c | 0
src/{ => service}/fs/gnunet-service-fs_pe.h | 0
src/{ => service}/fs/gnunet-service-fs_pr.c | 0
src/{ => service}/fs/gnunet-service-fs_pr.h | 0
src/{ => service}/fs/gnunet-service-fs_push.c | 0
src/{ => service}/fs/gnunet-service-fs_push.h | 0
src/{ => service}/fs/gnunet-service-fs_put.c | 0
src/{ => service}/fs/gnunet-service-fs_put.h | 0
src/{ => service}/fs/meson.build | 0
src/{ => service}/fs/meta_data.c | 0
src/{ => service}/fs/perf_gnunet_service_fs_p2p.c | 0
.../fs/perf_gnunet_service_fs_p2p.conf | 0
.../fs/perf_gnunet_service_fs_p2p_respect.c | 0
src/{ => service}/fs/test_fs.c | 0
src/{ => service}/fs/test_fs_data.conf | 0
src/{ => service}/fs/test_fs_defaults.conf | 0
src/{ => service}/fs/test_fs_directory.c | 0
src/{ => service}/fs/test_fs_download.c | 0
src/{ => service}/fs/test_fs_download_data.conf | 0
src/{ => service}/fs/test_fs_download_indexed.conf | 0
.../fs/test_fs_download_persistence.c | 0
src/{ => service}/fs/test_fs_file_information.c | 0
.../fs/test_fs_file_information_data.conf | 0
src/{ => service}/fs/test_fs_getopt.c | 0
src/{ => service}/fs/test_fs_list_indexed.c | 0
.../fs/test_fs_list_indexed_data.conf | 0
src/{ => service}/fs/test_fs_meta_data.c | 0
src/{ => service}/fs/test_fs_namespace.c | 0
src/{ => service}/fs/test_fs_namespace_data.conf | 0
.../fs/test_fs_namespace_list_updateable.c | 0
src/{ => service}/fs/test_fs_publish.c | 0
src/{ => service}/fs/test_fs_publish_data.conf | 0
src/{ => service}/fs/test_fs_publish_persistence.c | 0
src/{ => service}/fs/test_fs_search.c | 0
src/{ => service}/fs/test_fs_search_data.conf | 0
src/{ => service}/fs/test_fs_search_persistence.c | 0
src/{ => service}/fs/test_fs_search_probes.c | 0
src/{ => service}/fs/test_fs_search_with_and.c | 0
src/{ => service}/fs/test_fs_start_stop.c | 0
src/{ => service}/fs/test_fs_test_lib.c | 0
src/{ => service}/fs/test_fs_unindex.c | 0
src/{ => service}/fs/test_fs_unindex_data.conf | 0
src/{ => service}/fs/test_fs_unindex_persistence.c | 0
src/{ => service}/fs/test_fs_uri.c | 0
src/{ => service}/fs/test_gnunet_fs_rec_data.tgz | Bin
.../fs/test_gnunet_service_fs_migration.c | 0
.../fs/test_gnunet_service_fs_migration_data.conf | 0
src/{ => service}/fs/test_gnunet_service_fs_p2p.c | 0
.../fs/test_gnunet_service_fs_p2p_cadet.conf | 0
src/{ => service}/fs/test_plugin_block_fs.c | 0
src/{ => service}/fs/test_pseudonym_data.conf | 0
113 files changed, 200 insertions(+), 652 deletions(-)
diff --git a/configure.ac b/configure.ac
index 36580913c..f97bd7a48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1240,6 +1240,7 @@ src/lib/sq/Makefile
src/plugin/Makefile
src/plugin/block/Makefile
src/plugin/dhtu/Makefile
+src/plugin/fs/Makefile
src/plugin/gns/Makefile
src/plugin/gnsrecord/Makefile
src/plugin/namecache/Makefile
@@ -1259,6 +1260,8 @@ src/service/dht/Makefile
src/service/dht/dht.conf
src/service/dns/Makefile
src/service/dns/dns.conf
+src/service/fs/Makefile
+src/service/fs/fs.conf
src/service/gns/Makefile
src/service/gns/gns.conf
src/service/gns/nss/Makefile
@@ -1307,6 +1310,7 @@ src/cli/cadet/Makefile
src/cli/core/Makefile
src/cli/datastore/Makefile
src/cli/dht/Makefile
+src/cli/fs/Makefile
src/cli/gns/Makefile
src/cli/namecache/Makefile
src/cli/namestore/Makefile
@@ -1337,8 +1341,6 @@ src/contrib/service/rps/rps.conf
src/contrib/service/template/Makefile
src/contrib/cli/template/Makefile
src/exit/Makefile
-src/fs/Makefile
-src/fs/fs.conf
src/lib/hello/Makefile
src/include/Makefile
src/include/gnunet_config.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c1e58aa2c..b16ab69bc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,6 +6,13 @@ src/cli/dht/gnunet-dht-get.c
src/cli/dht/gnunet-dht-hello.c
src/cli/dht/gnunet-dht-monitor.c
src/cli/dht/gnunet-dht-put.c
+src/cli/fs/gnunet-auto-share.c
+src/cli/fs/gnunet-directory.c
+src/cli/fs/gnunet-download.c
+src/cli/fs/gnunet-fs.c
+src/cli/fs/gnunet-publish.c
+src/cli/fs/gnunet-search.c
+src/cli/fs/gnunet-unindex.c
src/cli/gns/gnunet-gns.c
src/cli/identity/gnunet-identity.c
src/cli/namecache/gnunet-namecache.c
@@ -93,45 +100,6 @@ src/contrib/service/set/set_api.c
src/contrib/service/template/gnunet-service-template.c
src/exit/gnunet-daemon-exit.c
src/exit/gnunet-helper-exit.c
-src/fs/fs_api.c
-src/fs/fs_directory.c
-src/fs/fs_dirmetascan.c
-src/fs/fs_download.c
-src/fs/fs_file_information.c
-src/fs/fs_getopt.c
-src/fs/fs_list_indexed.c
-src/fs/fs_misc.c
-src/fs/fs_namespace.c
-src/fs/fs_publish.c
-src/fs/fs_publish_ksk.c
-src/fs/fs_publish_ublock.c
-src/fs/fs_search.c
-src/fs/fs_sharetree.c
-src/fs/fs_test_lib.c
-src/fs/fs_tree.c
-src/fs/fs_unindex.c
-src/fs/fs_uri.c
-src/fs/gnunet-auto-share.c
-src/fs/gnunet-daemon-fsprofiler.c
-src/fs/gnunet-directory.c
-src/fs/gnunet-download.c
-src/fs/gnunet-fs-profiler.c
-src/fs/gnunet-fs.c
-src/fs/gnunet-helper-fs-publish.c
-src/fs/gnunet-publish.c
-src/fs/gnunet-search.c
-src/fs/gnunet-service-fs.c
-src/fs/gnunet-service-fs_cadet_client.c
-src/fs/gnunet-service-fs_cadet_server.c
-src/fs/gnunet-service-fs_cp.c
-src/fs/gnunet-service-fs_indexing.c
-src/fs/gnunet-service-fs_pe.c
-src/fs/gnunet-service-fs_pr.c
-src/fs/gnunet-service-fs_push.c
-src/fs/gnunet-service-fs_put.c
-src/fs/gnunet-unindex.c
-src/fs/meta_data.c
-src/fs/plugin_block_fs.c
src/gana/gnunet-error-codes/gnunet_error_codes.c
src/lib/block/bg_bf.c
src/lib/block/block.c
@@ -273,6 +241,7 @@ src/plugin/block/plugin_block_test.c
src/plugin/dhtu/plugin_dhtu_gnunet.c
src/plugin/dhtu/plugin_dhtu_ip.c
src/plugin/dhtu/testing_dhtu_cmd_send.c
+src/plugin/fs/plugin_block_fs.c
src/plugin/gns/plugin_block_gns.c
src/plugin/gns/plugin_gnsrecord_gns.c
src/plugin/gnsrecord/plugin_gnsrecord_dns.c
@@ -365,6 +334,37 @@ src/service/dns/gnunet-helper-dns.c
src/service/dns/gnunet-service-dns.c
src/service/dns/gnunet-zonewalk.c
src/service/dns/plugin_block_dns.c
+src/service/fs/fs_api.c
+src/service/fs/fs_directory.c
+src/service/fs/fs_dirmetascan.c
+src/service/fs/fs_download.c
+src/service/fs/fs_file_information.c
+src/service/fs/fs_getopt.c
+src/service/fs/fs_list_indexed.c
+src/service/fs/fs_misc.c
+src/service/fs/fs_namespace.c
+src/service/fs/fs_publish.c
+src/service/fs/fs_publish_ksk.c
+src/service/fs/fs_publish_ublock.c
+src/service/fs/fs_search.c
+src/service/fs/fs_sharetree.c
+src/service/fs/fs_test_lib.c
+src/service/fs/fs_tree.c
+src/service/fs/fs_unindex.c
+src/service/fs/fs_uri.c
+src/service/fs/gnunet-daemon-fsprofiler.c
+src/service/fs/gnunet-fs-profiler.c
+src/service/fs/gnunet-helper-fs-publish.c
+src/service/fs/gnunet-service-fs.c
+src/service/fs/gnunet-service-fs_cadet_client.c
+src/service/fs/gnunet-service-fs_cadet_server.c
+src/service/fs/gnunet-service-fs_cp.c
+src/service/fs/gnunet-service-fs_indexing.c
+src/service/fs/gnunet-service-fs_pe.c
+src/service/fs/gnunet-service-fs_pr.c
+src/service/fs/gnunet-service-fs_push.c
+src/service/fs/gnunet-service-fs_put.c
+src/service/fs/meta_data.c
src/service/gns/gns_api.c
src/service/gns/gns_tld_api.c
src/service/gns/gnunet-bcd.c
@@ -496,8 +496,8 @@ src/service/vpn/gnunet-helper-vpn.c
src/service/vpn/gnunet-service-vpn.c
src/service/vpn/vpn_api.c
src/service/zonemaster/gnunet-service-zonemaster.c
-src/fs/fs_api.h
src/include/gnunet_json_lib.h
src/include/gnunet_pq_lib.h
src/include/gnunet_transport_hello_service.h
src/lib/pq/pq.h
+src/service/fs/fs_api.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d1607b6b..3631ff970 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,6 @@ SUBDIRS = \
rest-plugin \
cli \
contrib \
- fs \
exit \
pt \
reclaim \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index e968c0bce..950aab622 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -13,4 +13,5 @@ SUBDIRS = \
revocation \
vpn \
gns \
+ fs \
cadet
diff --git a/src/cli/fs/.gitignore b/src/cli/fs/.gitignore
new file mode 100644
index 000000000..3ca8908d0
--- /dev/null
+++ b/src/cli/fs/.gitignore
@@ -0,0 +1,8 @@
+gnunet-unindex
+gnunet-auto-share
+gnunet-directory
+gnunet-download
+gnunet-fs
+gnunet-publish
+gnunet-search
+
diff --git a/src/cli/fs/Makefile.am b/src/cli/fs/Makefile.am
new file mode 100644
index 000000000..0d489dbe6
--- /dev/null
+++ b/src/cli/fs/Makefile.am
@@ -0,0 +1,107 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-auto-share \
+ gnunet-directory \
+ gnunet-download \
+ gnunet-publish \
+ gnunet-search \
+ gnunet-fs \
+ gnunet-unindex
+
+gnunet_directory_SOURCES = \
+ gnunet-directory.c
+gnunet_directory_LDADD = \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_directory_LDADD += \
+ -lextractor
+endif
+
+gnunet_fs_SOURCES = \
+ gnunet-fs.c
+gnunet_fs_LDADD = \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_fs_LDADD += \
+ -lextractor
+endif
+
+gnunet_download_SOURCES = \
+ gnunet-download.c
+gnunet_download_LDADD = \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+gnunet_publish_SOURCES = \
+ gnunet-publish.c
+gnunet_publish_LDADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_publish_LDADD += \
+ -lextractor
+endif
+
+gnunet_auto_share_SOURCES = \
+ gnunet-auto-share.c
+gnunet_auto_share_LDADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_auto_share_LDADD += \
+ -lextractor
+endif
+
+gnunet_helper_fs_publish_SOURCES = \
+ gnunet-helper-fs-publish.c
+gnunet_helper_fs_publish_LDADD = \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_helper_fs_publish_LDADD += \
+ -lextractor
+endif
+
+gnunet_search_SOURCES = \
+ gnunet-search.c
+gnunet_search_LDADD = \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_search_LDADD += \
+ -lextractor
+endif
+
+
+gnunet_unindex_SOURCES = \
+ gnunet-unindex.c
+gnunet_unindex_LDADD = \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
diff --git a/src/fs/gnunet-auto-share.c b/src/cli/fs/gnunet-auto-share.c
similarity index 100%
rename from src/fs/gnunet-auto-share.c
rename to src/cli/fs/gnunet-auto-share.c
diff --git a/src/fs/gnunet-directory.c b/src/cli/fs/gnunet-directory.c
similarity index 100%
rename from src/fs/gnunet-directory.c
rename to src/cli/fs/gnunet-directory.c
diff --git a/src/fs/gnunet-download.c b/src/cli/fs/gnunet-download.c
similarity index 100%
rename from src/fs/gnunet-download.c
rename to src/cli/fs/gnunet-download.c
diff --git a/src/fs/gnunet-fs.c b/src/cli/fs/gnunet-fs.c
similarity index 100%
rename from src/fs/gnunet-fs.c
rename to src/cli/fs/gnunet-fs.c
diff --git a/src/fs/gnunet-publish.c b/src/cli/fs/gnunet-publish.c
similarity index 100%
rename from src/fs/gnunet-publish.c
rename to src/cli/fs/gnunet-publish.c
diff --git a/src/fs/gnunet-search.c b/src/cli/fs/gnunet-search.c
similarity index 100%
rename from src/fs/gnunet-search.c
rename to src/cli/fs/gnunet-search.c
diff --git a/src/fs/gnunet-unindex.c b/src/cli/fs/gnunet-unindex.c
similarity index 100%
rename from src/fs/gnunet-unindex.c
rename to src/cli/fs/gnunet-unindex.c
diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in
deleted file mode 100755
index 564dd68f2..000000000
--- a/src/fs/test_gnunet_fs_idx.py.in
+++ /dev/null
@@ -1,113 +0,0 @@
-#!@PYTHONEXE@
-# 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 Affero General Public License as published
-# by the Free Software Foundation, either version 3 of the License,
-# 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
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# SPDX-License-Identifier: AGPL3.0-or-later
-#
-# Testcase for file-sharing command-line tools (indexing and unindexing)
-import sys
-import os
-import subprocess
-import re
-import shutil
-
-srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
-if gnunet_pyexpect_dir not in sys.path:
- sys.path.append(gnunet_pyexpect_dir)
-
-from gnunet_pyexpect import pexpect
-
-if os.name == 'posix':
- download = './gnunet-download'
- gnunetarm = 'gnunet-arm'
- publish = './gnunet-publish'
- unindex = './gnunet-unindex'
-elif os.name == 'nt':
- download = './gnunet-download.exe'
- gnunetarm = 'gnunet-arm.exe'
- publish = './gnunet-publish.exe'
- unindex = './gnunet-unindex.exe'
-
-if os.name == "nt":
- shutil.rmtree(
- os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True
- )
-else:
- shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True)
-
-arm = subprocess.Popen([gnunetarm, '-sq', '-c',
'test_gnunet_fs_idx_data.conf'])
-arm.communicate()
-
-try:
- pub = pexpect()
-
- pub.spawn(
- None, [
- publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m',
- "description:Test archive", '-k', 'tst',
- 'test_gnunet_fs_rec_data.tgz'
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- pub.expect(
- "stdout",
- re.compile(
- r"URI is
`gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"
- )
- )
-
- down = pexpect()
- down.spawn(
- None, [
- download, '-c', 'test_gnunet_fs_idx_data.conf', '-o',
- 'test_gnunet_fs_rec_data.tar.gz',
-
'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- down.expect(
- "stdout",
- re.compile(
- r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"
- )
- )
- os.remove("test_gnunet_fs_rec_data.tar.gz")
-
- un = pexpect()
- un.spawn(
- None, [
- unindex, '-c', 'test_gnunet_fs_idx_data.conf',
- 'test_gnunet_fs_rec_data.tgz'
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- un.expect("stdout", re.compile(r'Unindexing done\.\r?\n'))
-
-finally:
- arm = subprocess.Popen([
- gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf'
- ])
- arm.communicate()
- if os.name == "nt":
- shutil.rmtree(
- os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True
- )
- else:
- shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True)
diff --git a/src/fs/test_gnunet_fs_idx_data.conf
b/src/fs/test_gnunet_fs_idx_data.conf
deleted file mode 100644
index ba2a872dd..000000000
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ test_fs_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-py-idx/
-
-[transport]
-PLUGINS =
-
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
deleted file mode 100755
index a25e4eaef..000000000
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ /dev/null
@@ -1,149 +0,0 @@
-#!@PYTHONEXE@
-# This file is part of GNUnet.
-# (C) 2010, 2018 Christian Grothoff (and other contributing authors)
-#
-# GNUnet is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License as published
-# by the Free Software Foundation, either version 3 of the License,
-# 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
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# SPDX-License-Identifier: AGPL3.0-or-later
-#
-# Testcase for file-sharing command-line tools (publish, search, download)
-
-import sys
-import os
-import subprocess
-import re
-import shutil
-try:
- # Python 2.7
- reload
-except NameError:
- try:
- # Python 3.4+:
- from importlib import reload
- except ImportError:
- # Python 3.0 - 3.3
- from imp import reload
-
-reload(sys)
-
-# Force encoding to utf-8, as this test otherwise fails
-# on some systems (see #5094). In Python 3+ there is no attribute
-# sys.setdefaultencoding anymore.
-if (3 < sys.version_info[0]):
- sys.setdefaultencoding('utf8')
-
-srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
-if gnunet_pyexpect_dir not in sys.path:
- sys.path.append(gnunet_pyexpect_dir)
-
-from gnunet_pyexpect import pexpect
-
-if os.name == 'posix':
- download = './gnunet-download'
- gnunetarm = 'gnunet-arm'
- publish = './gnunet-publish'
- unindex = './gnunet-unindex'
- search = './gnunet-search'
-elif os.name == 'nt':
- download = './gnunet-download.exe'
- gnunetarm = 'gnunet-arm.exe'
- publish = './gnunet-publish.exe'
- unindex = './gnunet-unindex.exe'
- search = './gnunet-search.exe'
-
-if "GNUNET_PREFIX" in os.environ:
- pass
-else:
- print("You need to export GNUNET_PREFIX")
- sys.exit(1)
-
-if os.name == "nt":
- shutil.rmtree(
- os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True
- )
-else:
- shutil.rmtree("/tmp/gnunet-test-fs-py-psd", True)
-
-arm = subprocess.Popen([gnunetarm, '-sq', '-c',
'test_gnunet_fs_psd_data.conf'])
-arm.communicate()
-
-# first, basic publish-search-download run
-try:
- pub = pexpect()
- pub.spawn(
- None, [
- publish, '-c', 'test_gnunet_fs_psd_data.conf', '-n', '-m',
- "description:Test archive", '-k', 'tst',
- 'test_gnunet_fs_rec_data.tgz'
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- pub.expect(
- "stdout",
- re.compile(r"Publishing `.+test_gnunet_fs_rec_data.tgz' done\.\r?\n")
- )
- pub.expect(
- "stdout",
- re.compile(
- r"URI is
`gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"
- )
- )
-
- s = pexpect()
- s.spawn(
- None, [
- search, '-V', '-t', '1000 ms', '-N', '1', '-c',
- 'test_gnunet_fs_psd_data.conf', 'tst'
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- s.expect(
- "stdout",
- re.compile(
- r'gnunet-download -o "test_gnunet_fs_rec_data.tgz"
gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822\r?\n'
- )
- )
-
- down = pexpect()
- down.spawn(
- None, [
- download, '-c', 'test_gnunet_fs_psd_data.conf', '-o',
- 'test_gnunet_fs_rec_data.tar.gz',
-
'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- down.expect(
- "stdout",
- re.compile(
- r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"
- )
- )
- os.remove("test_gnunet_fs_rec_data.tar.gz")
-
-finally:
- arm = subprocess.Popen([
- gnunetarm, '-eq', '-c', 'test_gnunet_fs_psd_data.conf'
- ])
- arm.communicate()
- if os.name == "nt":
- shutil.rmtree(
- os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True
- )
- else:
- shutil.rmtree("/tmp/gnunet-test-fs-py-psd", True)
diff --git a/src/fs/test_gnunet_fs_psd_data.conf
b/src/fs/test_gnunet_fs_psd_data.conf
deleted file mode 100644
index f6c05ecdd..000000000
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ test_fs_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-py-psd/
-
-[transport]
-PLUGINS =
-
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
deleted file mode 100755
index f7e84e3da..000000000
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ /dev/null
@@ -1,171 +0,0 @@
-#!@PYTHONEXE@
-# 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 Affero General Public License as published
-# by the Free Software Foundation, either version 3 of the License,
-# 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
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# SPDX-License-Identifier: AGPL3.0-or-later
-#
-# Testcase for file-sharing command-line tools (recursive publishing &
download)
-import sys
-import os
-import subprocess
-import re
-import shutil
-import tarfile
-import filecmp
-
-srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
-if gnunet_pyexpect_dir not in sys.path:
- sys.path.append(gnunet_pyexpect_dir)
-
-from gnunet_pyexpect import pexpect
-from pydiffer import dcdiff
-
-if os.name == 'posix':
- download = './gnunet-download'
- gnunetarm = 'gnunet-arm'
- publish = './gnunet-publish'
- unindex = './gnunet-unindex'
- search = './gnunet-search'
- directory = './gnunet-directory'
-elif os.name == 'nt':
- download = './gnunet-download.exe'
- gnunetarm = 'gnunet-arm.exe'
- publish = './gnunet-publish.exe'
- unindex = './gnunet-unindex.exe'
- search = './gnunet-search.exe'
- directory = './gnunet-directory.exe'
-
-if os.name == "nt":
- shutil.rmtree(
- os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True
- )
-else:
- shutil.rmtree("/tmp/gnunet-test-fs-py-rec", True)
-
-arm = subprocess.Popen([gnunetarm, '-sq', '-c',
'test_gnunet_fs_rec_data.conf'])
-arm.communicate()
-
-tar = tarfile.open('test_gnunet_fs_rec_data.tgz')
-tar.extractall()
-# first, basic publish-search-download run
-try:
- pub = pexpect()
- pub.spawn(
- None, [
- publish, '-c', 'test_gnunet_fs_rec_data.conf', '-k', 'testdir',
- 'dir/'
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- # Can't say much for publishing, except that the last one is the toplevel
directory
- pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
- pub.expect(
- "stdout",
- re.compile(
- r"URI is
`gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
- )
- )
- pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
- pub.expect(
- "stdout",
- re.compile(
- r"URI is
`gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
- )
- )
- pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
- pub.expect(
- "stdout",
- re.compile(
- r"URI is
`gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
- )
- )
- pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
- pub.expect(
- "stdout",
- re.compile(
- r"URI is
`gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
- )
- )
- pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
- pub.expect(
- "stdout",
- re.compile(
- r"URI is
`gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
- )
- )
- pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
- pub.expect(
- "stdout",
- re.compile(
- r"URI is
`gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
- )
- )
- pub.expect(
- "stdout", re.compile(r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n")
- )
- m = pub.expect("stdout", re.compile(r".+\r?\n"))
- if not m:
- sys.exit(3)
- output = m.string
- url = output[output.find("`") + 1:output.find("'")]
-
- down = pexpect()
- down.spawn(
- None, [
- download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o',
- 'rdir.gnd', url
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- down.expect("stdout", re.compile(r"Downloading `rdir.gnd' done
(.*).\r?\n"))
-
- d = pexpect()
- d.spawn(
- None, [directory, '-c', 'test_gnunet_fs_rec_data.conf', 'rdir/a.gnd'],
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT
- )
- d.expect("stdout", re.compile(r"Directory `a/' meta data:\r?\n"))
- d.expect("stdout", re.compile(r"Directory `a/' contents:\r?\n"))
- d.expect("stdout", re.compile(r"COPYING (.*)\r?\n"))
- d.expect("stdout", re.compile(r"INSTALL (.*)\r?\n"))
-
- os.remove("rdir/b.gnd")
- os.remove("rdir/a.gnd")
- diff = dcdiff('dir', 'rdir')
- if len(diff) != 0:
- raise Exception(
- "Unexpected difference between source directory and downloaded
result:\n{}"
- .format(diff)
- )
-
-finally:
- arm = subprocess.Popen([
- gnunetarm, '-eq', '-c', 'test_gnunet_fs_rec_data.conf'
- ])
- arm.communicate()
- if os.name == "nt":
- shutil.rmtree(
- os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True
- )
- else:
- shutil.rmtree("/tmp/gnunet-test-fs-py-rec", True)
- shutil.rmtree("dir", True)
- shutil.rmtree("rdir", True)
- shutil.rmtree("rdir.gnd", True)
diff --git a/src/fs/test_gnunet_fs_rec_data.conf
b/src/fs/test_gnunet_fs_rec_data.conf
deleted file mode 100644
index 82ddb8f49..000000000
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ test_fs_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-py-rec/
-
-[transport]
-PLUGINS =
-
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 5b1464d89..574c57639 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -5,4 +5,5 @@ SUBDIRS = \
namecache \
namestore \
revocation \
- gns
+ gns \
+ fs
diff --git a/src/plugin/fs/Makefile.am b/src/plugin/fs/Makefile.am
new file mode 100644
index 000000000..928997e4d
--- /dev/null
+++ b/src/plugin/fs/Makefile.am
@@ -0,0 +1,36 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_block_fs.la
+
+libgnunet_plugin_block_fs_la_SOURCES = \
+ plugin_block_fs.c
+libgnunet_plugin_block_fs_la_LIBADD = \
+ $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+ $(top_builddir)/src/lib/block/libgnunetblock.la \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_block_fs_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+check_PROGRAMS = \
+ test_plugin_block_fs
+
+test_plugin_block_fs_SOURCES = \
+ test_plugin_block_fs.c
+test_plugin_block_fs_LDADD = \
+ $(top_builddir)/src/lib/block/libgnunetblock.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/fs/plugin_block_fs.c b/src/plugin/fs/plugin_block_fs.c
similarity index 100%
rename from src/fs/plugin_block_fs.c
rename to src/plugin/fs/plugin_block_fs.c
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 34ae7945f..ff17f89a2 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -26,5 +26,6 @@ SUBDIRS = \
revocation \
vpn \
gns \
- zonemaster
+ zonemaster \
+ fs
diff --git a/src/fs/.gitignore b/src/service/fs/.gitignore
similarity index 88%
rename from src/fs/.gitignore
rename to src/service/fs/.gitignore
index f0e2a4f7b..f3637f186 100644
--- a/src/fs/.gitignore
+++ b/src/service/fs/.gitignore
@@ -1,13 +1,6 @@
-gnunet-unindex
-gnunet-auto-share
gnunet-daemon-fsprofiler
-gnunet-directory
-gnunet-download
-gnunet-fs
gnunet-fs-profiler
gnunet-helper-fs-publish
-gnunet-publish
-gnunet-search
gnunet-service-fs
test_fs_directory
test_fs_download
diff --git a/src/fs/Makefile.am b/src/service/fs/Makefile.am
similarity index 72%
rename from src/fs/Makefile.am
rename to src/service/fs/Makefile.am
index 38d75c0dc..93c8814ca 100644
--- a/src/fs/Makefile.am
+++ b/src/service/fs/Makefile.am
@@ -13,14 +13,8 @@ libexecdir= $(pkglibdir)/libexec/
pkgcfg_DATA = \
fs.conf
-plugindir = $(libdir)/gnunet
-
-
lib_LTLIBRARIES = libgnunetfs.la
-plugin_LTLIBRARIES = \
- libgnunet_plugin_block_fs.la
-
libgnunetfs_la_SOURCES = \
fs_api.c fs_api.h fs.h \
fs_directory.c \
@@ -64,70 +58,6 @@ libexec_PROGRAMS = \
noinst_PROGRAMS = \
gnunet-daemon-fsprofiler
-bin_PROGRAMS = \
- gnunet-auto-share \
- gnunet-directory \
- gnunet-download \
- gnunet-publish \
- gnunet-search \
- gnunet-fs \
- gnunet-unindex
-
-gnunet_directory_SOURCES = \
- gnunet-directory.c
-gnunet_directory_LDADD = \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_directory_LDADD += \
- -lextractor
-endif
-
-gnunet_fs_SOURCES = \
- gnunet-fs.c
-gnunet_fs_LDADD = \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_fs_LDADD += \
- -lextractor
-endif
-
-gnunet_download_SOURCES = \
- gnunet-download.c
-gnunet_download_LDADD = \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-gnunet_publish_SOURCES = \
- gnunet-publish.c
-gnunet_publish_LDADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_publish_LDADD += \
- -lextractor
-endif
-
-gnunet_auto_share_SOURCES = \
- gnunet-auto-share.c
-gnunet_auto_share_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_auto_share_LDADD += \
- -lextractor
-endif
-
gnunet_helper_fs_publish_SOURCES = \
gnunet-helper-fs-publish.c
gnunet_helper_fs_publish_LDADD = \
@@ -140,19 +70,6 @@ gnunet_helper_fs_publish_LDADD += \
-lextractor
endif
-gnunet_search_SOURCES = \
- gnunet-search.c
-gnunet_search_LDADD = \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_search_LDADD += \
- -lextractor
-endif
-
-
gnunet_daemon_fsprofiler_SOURCES = \
gnunet-daemon-fsprofiler.c
gnunet_daemon_fsprofiler_LDADD = \
@@ -183,26 +100,7 @@ gnunet_service_fs_LDADD = \
$(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(GN_LIBINTL) -lm
-gnunet_unindex_SOURCES = \
- gnunet-unindex.c
-gnunet_unindex_LDADD = \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-libgnunet_plugin_block_fs_la_SOURCES = \
- plugin_block_fs.c
-libgnunet_plugin_block_fs_la_LIBADD = \
- $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_block_fs_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
check_PROGRAMS = \
- test_plugin_block_fs \
test_fs_directory \
test_fs_download \
test_fs_download_cadet \
@@ -228,24 +126,6 @@ check_PROGRAMS = \
test_gnunet_service_fs_migration \
$(FS_BENCHMARKS)
-test_plugin_block_fs_SOURCES = \
- test_plugin_block_fs.c
-test_plugin_block_fs_LDADD = \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-if HAVE_PYTHON
-check_SCRIPTS = \
- test_gnunet_fs_rec.py \
- test_gnunet_fs_idx.py
-
-if HAVE_LIBEXTRACTOR
-check_SCRIPTS += \
- test_gnunet_fs_psd.py
-endif
-endif
-
-
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
TESTS = test_fs_directory \
@@ -259,7 +139,6 @@ TESTS = test_fs_directory \
test_fs_start_stop \
test_fs_uri \
test_fs_meta_data
- # $(check_SCRIPTS)
endif
@@ -487,23 +366,6 @@ test_fs_uri_LDADD = \
# libgnunetfs.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la
-test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile
- $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/test_gnunet_fs_psd.py.in > test_gnunet_fs_psd.py
- chmod +x test_gnunet_fs_psd.py
-
-test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile
- $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/test_gnunet_fs_rec.py.in > test_gnunet_fs_rec.py
- chmod +x test_gnunet_fs_rec.py
-
-test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile
- $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/test_gnunet_fs_ns.py.in > test_gnunet_fs_ns.py
- chmod +x test_gnunet_fs_ns.py
-
-test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
- $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/test_gnunet_fs_idx.py.in > test_gnunet_fs_idx.py
- chmod +x test_gnunet_fs_idx.py
-
-
EXTRA_DIST = \
fs_test_lib_data.conf \
perf_gnunet_service_fs_p2p.conf \
@@ -517,15 +379,7 @@ EXTRA_DIST = \
test_fs_publish_data.conf \
test_fs_search_data.conf \
test_fs_unindex_data.conf \
- test_gnunet_fs_idx_data.conf \
- test_gnunet_fs_psd_data.conf \
- test_gnunet_fs_rec_data.conf \
test_gnunet_fs_rec_data.tgz \
- test_gnunet_fs_psd.py.in \
- test_gnunet_fs_rec.py.in \
- test_gnunet_fs_idx.py.in \
test_gnunet_service_fs_migration_data.conf \
test_gnunet_service_fs_p2p_cadet.conf \
test_pseudonym_data.conf
-
-CLEANFILES = $(check_SCRIPTS)
diff --git a/src/fs/fs.conf.in b/src/service/fs/fs.conf.in
similarity index 100%
rename from src/fs/fs.conf.in
rename to src/service/fs/fs.conf.in
diff --git a/src/fs/fs.h b/src/service/fs/fs.h
similarity index 100%
rename from src/fs/fs.h
rename to src/service/fs/fs.h
diff --git a/src/fs/fs_api.c b/src/service/fs/fs_api.c
similarity index 100%
rename from src/fs/fs_api.c
rename to src/service/fs/fs_api.c
diff --git a/src/fs/fs_api.h b/src/service/fs/fs_api.h
similarity index 100%
rename from src/fs/fs_api.h
rename to src/service/fs/fs_api.h
diff --git a/src/fs/fs_directory.c b/src/service/fs/fs_directory.c
similarity index 100%
rename from src/fs/fs_directory.c
rename to src/service/fs/fs_directory.c
diff --git a/src/fs/fs_dirmetascan.c b/src/service/fs/fs_dirmetascan.c
similarity index 100%
rename from src/fs/fs_dirmetascan.c
rename to src/service/fs/fs_dirmetascan.c
diff --git a/src/fs/fs_download.c b/src/service/fs/fs_download.c
similarity index 100%
rename from src/fs/fs_download.c
rename to src/service/fs/fs_download.c
diff --git a/src/fs/fs_file_information.c b/src/service/fs/fs_file_information.c
similarity index 100%
rename from src/fs/fs_file_information.c
rename to src/service/fs/fs_file_information.c
diff --git a/src/fs/fs_getopt.c b/src/service/fs/fs_getopt.c
similarity index 100%
rename from src/fs/fs_getopt.c
rename to src/service/fs/fs_getopt.c
diff --git a/src/fs/fs_list_indexed.c b/src/service/fs/fs_list_indexed.c
similarity index 100%
rename from src/fs/fs_list_indexed.c
rename to src/service/fs/fs_list_indexed.c
diff --git a/src/fs/fs_misc.c b/src/service/fs/fs_misc.c
similarity index 100%
rename from src/fs/fs_misc.c
rename to src/service/fs/fs_misc.c
diff --git a/src/fs/fs_namespace.c b/src/service/fs/fs_namespace.c
similarity index 100%
rename from src/fs/fs_namespace.c
rename to src/service/fs/fs_namespace.c
diff --git a/src/fs/fs_publish.c b/src/service/fs/fs_publish.c
similarity index 100%
rename from src/fs/fs_publish.c
rename to src/service/fs/fs_publish.c
diff --git a/src/fs/fs_publish_ksk.c b/src/service/fs/fs_publish_ksk.c
similarity index 100%
rename from src/fs/fs_publish_ksk.c
rename to src/service/fs/fs_publish_ksk.c
diff --git a/src/fs/fs_publish_ublock.c b/src/service/fs/fs_publish_ublock.c
similarity index 100%
rename from src/fs/fs_publish_ublock.c
rename to src/service/fs/fs_publish_ublock.c
diff --git a/src/fs/fs_publish_ublock.h b/src/service/fs/fs_publish_ublock.h
similarity index 100%
rename from src/fs/fs_publish_ublock.h
rename to src/service/fs/fs_publish_ublock.h
diff --git a/src/fs/fs_search.c b/src/service/fs/fs_search.c
similarity index 100%
rename from src/fs/fs_search.c
rename to src/service/fs/fs_search.c
diff --git a/src/fs/fs_sharetree.c b/src/service/fs/fs_sharetree.c
similarity index 100%
rename from src/fs/fs_sharetree.c
rename to src/service/fs/fs_sharetree.c
diff --git a/src/fs/fs_test_lib.c b/src/service/fs/fs_test_lib.c
similarity index 100%
rename from src/fs/fs_test_lib.c
rename to src/service/fs/fs_test_lib.c
diff --git a/src/fs/fs_test_lib.h b/src/service/fs/fs_test_lib.h
similarity index 100%
rename from src/fs/fs_test_lib.h
rename to src/service/fs/fs_test_lib.h
diff --git a/src/fs/fs_test_lib_data.conf b/src/service/fs/fs_test_lib_data.conf
similarity index 100%
rename from src/fs/fs_test_lib_data.conf
rename to src/service/fs/fs_test_lib_data.conf
diff --git a/src/fs/fs_tree.c b/src/service/fs/fs_tree.c
similarity index 100%
rename from src/fs/fs_tree.c
rename to src/service/fs/fs_tree.c
diff --git a/src/fs/fs_tree.h b/src/service/fs/fs_tree.h
similarity index 100%
rename from src/fs/fs_tree.h
rename to src/service/fs/fs_tree.h
diff --git a/src/fs/fs_unindex.c b/src/service/fs/fs_unindex.c
similarity index 100%
rename from src/fs/fs_unindex.c
rename to src/service/fs/fs_unindex.c
diff --git a/src/fs/fs_uri.c b/src/service/fs/fs_uri.c
similarity index 100%
rename from src/fs/fs_uri.c
rename to src/service/fs/fs_uri.c
diff --git a/src/fs/gnunet-daemon-fsprofiler.c
b/src/service/fs/gnunet-daemon-fsprofiler.c
similarity index 100%
rename from src/fs/gnunet-daemon-fsprofiler.c
rename to src/service/fs/gnunet-daemon-fsprofiler.c
diff --git a/src/fs/gnunet-fs-profiler.c b/src/service/fs/gnunet-fs-profiler.c
similarity index 100%
rename from src/fs/gnunet-fs-profiler.c
rename to src/service/fs/gnunet-fs-profiler.c
diff --git a/src/fs/gnunet-helper-fs-publish.c
b/src/service/fs/gnunet-helper-fs-publish.c
similarity index 100%
rename from src/fs/gnunet-helper-fs-publish.c
rename to src/service/fs/gnunet-helper-fs-publish.c
diff --git a/src/fs/gnunet-service-fs.c b/src/service/fs/gnunet-service-fs.c
similarity index 100%
rename from src/fs/gnunet-service-fs.c
rename to src/service/fs/gnunet-service-fs.c
diff --git a/src/fs/gnunet-service-fs.h b/src/service/fs/gnunet-service-fs.h
similarity index 100%
rename from src/fs/gnunet-service-fs.h
rename to src/service/fs/gnunet-service-fs.h
diff --git a/src/fs/gnunet-service-fs_cadet.h
b/src/service/fs/gnunet-service-fs_cadet.h
similarity index 100%
rename from src/fs/gnunet-service-fs_cadet.h
rename to src/service/fs/gnunet-service-fs_cadet.h
diff --git a/src/fs/gnunet-service-fs_cadet_client.c
b/src/service/fs/gnunet-service-fs_cadet_client.c
similarity index 100%
rename from src/fs/gnunet-service-fs_cadet_client.c
rename to src/service/fs/gnunet-service-fs_cadet_client.c
diff --git a/src/fs/gnunet-service-fs_cadet_server.c
b/src/service/fs/gnunet-service-fs_cadet_server.c
similarity index 100%
rename from src/fs/gnunet-service-fs_cadet_server.c
rename to src/service/fs/gnunet-service-fs_cadet_server.c
diff --git a/src/fs/gnunet-service-fs_cp.c
b/src/service/fs/gnunet-service-fs_cp.c
similarity index 100%
rename from src/fs/gnunet-service-fs_cp.c
rename to src/service/fs/gnunet-service-fs_cp.c
diff --git a/src/fs/gnunet-service-fs_cp.h
b/src/service/fs/gnunet-service-fs_cp.h
similarity index 100%
rename from src/fs/gnunet-service-fs_cp.h
rename to src/service/fs/gnunet-service-fs_cp.h
diff --git a/src/fs/gnunet-service-fs_indexing.c
b/src/service/fs/gnunet-service-fs_indexing.c
similarity index 100%
rename from src/fs/gnunet-service-fs_indexing.c
rename to src/service/fs/gnunet-service-fs_indexing.c
diff --git a/src/fs/gnunet-service-fs_indexing.h
b/src/service/fs/gnunet-service-fs_indexing.h
similarity index 100%
rename from src/fs/gnunet-service-fs_indexing.h
rename to src/service/fs/gnunet-service-fs_indexing.h
diff --git a/src/fs/gnunet-service-fs_pe.c
b/src/service/fs/gnunet-service-fs_pe.c
similarity index 100%
rename from src/fs/gnunet-service-fs_pe.c
rename to src/service/fs/gnunet-service-fs_pe.c
diff --git a/src/fs/gnunet-service-fs_pe.h
b/src/service/fs/gnunet-service-fs_pe.h
similarity index 100%
rename from src/fs/gnunet-service-fs_pe.h
rename to src/service/fs/gnunet-service-fs_pe.h
diff --git a/src/fs/gnunet-service-fs_pr.c
b/src/service/fs/gnunet-service-fs_pr.c
similarity index 100%
rename from src/fs/gnunet-service-fs_pr.c
rename to src/service/fs/gnunet-service-fs_pr.c
diff --git a/src/fs/gnunet-service-fs_pr.h
b/src/service/fs/gnunet-service-fs_pr.h
similarity index 100%
rename from src/fs/gnunet-service-fs_pr.h
rename to src/service/fs/gnunet-service-fs_pr.h
diff --git a/src/fs/gnunet-service-fs_push.c
b/src/service/fs/gnunet-service-fs_push.c
similarity index 100%
rename from src/fs/gnunet-service-fs_push.c
rename to src/service/fs/gnunet-service-fs_push.c
diff --git a/src/fs/gnunet-service-fs_push.h
b/src/service/fs/gnunet-service-fs_push.h
similarity index 100%
rename from src/fs/gnunet-service-fs_push.h
rename to src/service/fs/gnunet-service-fs_push.h
diff --git a/src/fs/gnunet-service-fs_put.c
b/src/service/fs/gnunet-service-fs_put.c
similarity index 100%
rename from src/fs/gnunet-service-fs_put.c
rename to src/service/fs/gnunet-service-fs_put.c
diff --git a/src/fs/gnunet-service-fs_put.h
b/src/service/fs/gnunet-service-fs_put.h
similarity index 100%
rename from src/fs/gnunet-service-fs_put.h
rename to src/service/fs/gnunet-service-fs_put.h
diff --git a/src/fs/meson.build b/src/service/fs/meson.build
similarity index 100%
rename from src/fs/meson.build
rename to src/service/fs/meson.build
diff --git a/src/fs/meta_data.c b/src/service/fs/meta_data.c
similarity index 100%
rename from src/fs/meta_data.c
rename to src/service/fs/meta_data.c
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c
b/src/service/fs/perf_gnunet_service_fs_p2p.c
similarity index 100%
rename from src/fs/perf_gnunet_service_fs_p2p.c
rename to src/service/fs/perf_gnunet_service_fs_p2p.c
diff --git a/src/fs/perf_gnunet_service_fs_p2p.conf
b/src/service/fs/perf_gnunet_service_fs_p2p.conf
similarity index 100%
rename from src/fs/perf_gnunet_service_fs_p2p.conf
rename to src/service/fs/perf_gnunet_service_fs_p2p.conf
diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c
b/src/service/fs/perf_gnunet_service_fs_p2p_respect.c
similarity index 100%
rename from src/fs/perf_gnunet_service_fs_p2p_respect.c
rename to src/service/fs/perf_gnunet_service_fs_p2p_respect.c
diff --git a/src/fs/test_fs.c b/src/service/fs/test_fs.c
similarity index 100%
rename from src/fs/test_fs.c
rename to src/service/fs/test_fs.c
diff --git a/src/fs/test_fs_data.conf b/src/service/fs/test_fs_data.conf
similarity index 100%
rename from src/fs/test_fs_data.conf
rename to src/service/fs/test_fs_data.conf
diff --git a/src/fs/test_fs_defaults.conf b/src/service/fs/test_fs_defaults.conf
similarity index 100%
rename from src/fs/test_fs_defaults.conf
rename to src/service/fs/test_fs_defaults.conf
diff --git a/src/fs/test_fs_directory.c b/src/service/fs/test_fs_directory.c
similarity index 100%
rename from src/fs/test_fs_directory.c
rename to src/service/fs/test_fs_directory.c
diff --git a/src/fs/test_fs_download.c b/src/service/fs/test_fs_download.c
similarity index 100%
rename from src/fs/test_fs_download.c
rename to src/service/fs/test_fs_download.c
diff --git a/src/fs/test_fs_download_data.conf
b/src/service/fs/test_fs_download_data.conf
similarity index 100%
rename from src/fs/test_fs_download_data.conf
rename to src/service/fs/test_fs_download_data.conf
diff --git a/src/fs/test_fs_download_indexed.conf
b/src/service/fs/test_fs_download_indexed.conf
similarity index 100%
rename from src/fs/test_fs_download_indexed.conf
rename to src/service/fs/test_fs_download_indexed.conf
diff --git a/src/fs/test_fs_download_persistence.c
b/src/service/fs/test_fs_download_persistence.c
similarity index 100%
rename from src/fs/test_fs_download_persistence.c
rename to src/service/fs/test_fs_download_persistence.c
diff --git a/src/fs/test_fs_file_information.c
b/src/service/fs/test_fs_file_information.c
similarity index 100%
rename from src/fs/test_fs_file_information.c
rename to src/service/fs/test_fs_file_information.c
diff --git a/src/fs/test_fs_file_information_data.conf
b/src/service/fs/test_fs_file_information_data.conf
similarity index 100%
rename from src/fs/test_fs_file_information_data.conf
rename to src/service/fs/test_fs_file_information_data.conf
diff --git a/src/fs/test_fs_getopt.c b/src/service/fs/test_fs_getopt.c
similarity index 100%
rename from src/fs/test_fs_getopt.c
rename to src/service/fs/test_fs_getopt.c
diff --git a/src/fs/test_fs_list_indexed.c
b/src/service/fs/test_fs_list_indexed.c
similarity index 100%
rename from src/fs/test_fs_list_indexed.c
rename to src/service/fs/test_fs_list_indexed.c
diff --git a/src/fs/test_fs_list_indexed_data.conf
b/src/service/fs/test_fs_list_indexed_data.conf
similarity index 100%
rename from src/fs/test_fs_list_indexed_data.conf
rename to src/service/fs/test_fs_list_indexed_data.conf
diff --git a/src/fs/test_fs_meta_data.c b/src/service/fs/test_fs_meta_data.c
similarity index 100%
rename from src/fs/test_fs_meta_data.c
rename to src/service/fs/test_fs_meta_data.c
diff --git a/src/fs/test_fs_namespace.c b/src/service/fs/test_fs_namespace.c
similarity index 100%
rename from src/fs/test_fs_namespace.c
rename to src/service/fs/test_fs_namespace.c
diff --git a/src/fs/test_fs_namespace_data.conf
b/src/service/fs/test_fs_namespace_data.conf
similarity index 100%
rename from src/fs/test_fs_namespace_data.conf
rename to src/service/fs/test_fs_namespace_data.conf
diff --git a/src/fs/test_fs_namespace_list_updateable.c
b/src/service/fs/test_fs_namespace_list_updateable.c
similarity index 100%
rename from src/fs/test_fs_namespace_list_updateable.c
rename to src/service/fs/test_fs_namespace_list_updateable.c
diff --git a/src/fs/test_fs_publish.c b/src/service/fs/test_fs_publish.c
similarity index 100%
rename from src/fs/test_fs_publish.c
rename to src/service/fs/test_fs_publish.c
diff --git a/src/fs/test_fs_publish_data.conf
b/src/service/fs/test_fs_publish_data.conf
similarity index 100%
rename from src/fs/test_fs_publish_data.conf
rename to src/service/fs/test_fs_publish_data.conf
diff --git a/src/fs/test_fs_publish_persistence.c
b/src/service/fs/test_fs_publish_persistence.c
similarity index 100%
rename from src/fs/test_fs_publish_persistence.c
rename to src/service/fs/test_fs_publish_persistence.c
diff --git a/src/fs/test_fs_search.c b/src/service/fs/test_fs_search.c
similarity index 100%
rename from src/fs/test_fs_search.c
rename to src/service/fs/test_fs_search.c
diff --git a/src/fs/test_fs_search_data.conf
b/src/service/fs/test_fs_search_data.conf
similarity index 100%
rename from src/fs/test_fs_search_data.conf
rename to src/service/fs/test_fs_search_data.conf
diff --git a/src/fs/test_fs_search_persistence.c
b/src/service/fs/test_fs_search_persistence.c
similarity index 100%
rename from src/fs/test_fs_search_persistence.c
rename to src/service/fs/test_fs_search_persistence.c
diff --git a/src/fs/test_fs_search_probes.c
b/src/service/fs/test_fs_search_probes.c
similarity index 100%
rename from src/fs/test_fs_search_probes.c
rename to src/service/fs/test_fs_search_probes.c
diff --git a/src/fs/test_fs_search_with_and.c
b/src/service/fs/test_fs_search_with_and.c
similarity index 100%
rename from src/fs/test_fs_search_with_and.c
rename to src/service/fs/test_fs_search_with_and.c
diff --git a/src/fs/test_fs_start_stop.c b/src/service/fs/test_fs_start_stop.c
similarity index 100%
rename from src/fs/test_fs_start_stop.c
rename to src/service/fs/test_fs_start_stop.c
diff --git a/src/fs/test_fs_test_lib.c b/src/service/fs/test_fs_test_lib.c
similarity index 100%
rename from src/fs/test_fs_test_lib.c
rename to src/service/fs/test_fs_test_lib.c
diff --git a/src/fs/test_fs_unindex.c b/src/service/fs/test_fs_unindex.c
similarity index 100%
rename from src/fs/test_fs_unindex.c
rename to src/service/fs/test_fs_unindex.c
diff --git a/src/fs/test_fs_unindex_data.conf
b/src/service/fs/test_fs_unindex_data.conf
similarity index 100%
rename from src/fs/test_fs_unindex_data.conf
rename to src/service/fs/test_fs_unindex_data.conf
diff --git a/src/fs/test_fs_unindex_persistence.c
b/src/service/fs/test_fs_unindex_persistence.c
similarity index 100%
rename from src/fs/test_fs_unindex_persistence.c
rename to src/service/fs/test_fs_unindex_persistence.c
diff --git a/src/fs/test_fs_uri.c b/src/service/fs/test_fs_uri.c
similarity index 100%
rename from src/fs/test_fs_uri.c
rename to src/service/fs/test_fs_uri.c
diff --git a/src/fs/test_gnunet_fs_rec_data.tgz
b/src/service/fs/test_gnunet_fs_rec_data.tgz
similarity index 100%
rename from src/fs/test_gnunet_fs_rec_data.tgz
rename to src/service/fs/test_gnunet_fs_rec_data.tgz
diff --git a/src/fs/test_gnunet_service_fs_migration.c
b/src/service/fs/test_gnunet_service_fs_migration.c
similarity index 100%
rename from src/fs/test_gnunet_service_fs_migration.c
rename to src/service/fs/test_gnunet_service_fs_migration.c
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf
b/src/service/fs/test_gnunet_service_fs_migration_data.conf
similarity index 100%
rename from src/fs/test_gnunet_service_fs_migration_data.conf
rename to src/service/fs/test_gnunet_service_fs_migration_data.conf
diff --git a/src/fs/test_gnunet_service_fs_p2p.c
b/src/service/fs/test_gnunet_service_fs_p2p.c
similarity index 100%
rename from src/fs/test_gnunet_service_fs_p2p.c
rename to src/service/fs/test_gnunet_service_fs_p2p.c
diff --git a/src/fs/test_gnunet_service_fs_p2p_cadet.conf
b/src/service/fs/test_gnunet_service_fs_p2p_cadet.conf
similarity index 100%
rename from src/fs/test_gnunet_service_fs_p2p_cadet.conf
rename to src/service/fs/test_gnunet_service_fs_p2p_cadet.conf
diff --git a/src/fs/test_plugin_block_fs.c
b/src/service/fs/test_plugin_block_fs.c
similarity index 100%
rename from src/fs/test_plugin_block_fs.c
rename to src/service/fs/test_plugin_block_fs.c
diff --git a/src/fs/test_pseudonym_data.conf
b/src/service/fs/test_pseudonym_data.conf
similarity index 100%
rename from src/fs/test_pseudonym_data.conf
rename to src/service/fs/test_pseudonym_data.conf
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.