From d9a610d5d7c6d5c59f7c75385dcc9767c06bd5c3 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 22 Nov 2011 11:53:26 +0000 Subject: [PATCH] moving block plugins to respective subsystem --- TODO | 18 +++++---------- src/block/Makefile.am | 32 --------------------------- src/dht/Makefile.am | 18 ++++++++++++++- src/{block => dht}/plugin_block_dht.c | 0 src/fs/Makefile.am | 18 +++++++++++++++ src/{block => fs}/plugin_block_fs.c | 0 src/vpn/Makefile.am | 14 ++++++++++++ src/{block => vpn}/plugin_block_dns.c | 0 8 files changed, 55 insertions(+), 45 deletions(-) rename src/{block => dht}/plugin_block_dht.c (100%) rename src/{block => fs}/plugin_block_fs.c (100%) rename src/{block => vpn}/plugin_block_dns.c (100%) diff --git a/TODO b/TODO index 3607193e3..3521304e3 100644 --- a/TODO +++ b/TODO @@ -1,22 +1,12 @@ 0.9.0: -* GNUNET-GTK: [CG] - - provide context menus to allow aborts of downloads/uploads - - provide way to handle errors (search, download, publish errors) * new webpage: - write chapter on DHT/block [Nate] - - make a NICE download page * big code review * Determine RC bugs and fix those (release should have no known real bugs) * Transport: - When receiving SESSION_CONNECT: actually consider switching session (test this!) * FS [CG] - - implement multi-peer FS performance tests + gauger them! - + insert - + download - + search -* blocks: - + should block plugins live in block/ or with fs/dht/vpn? 0.9.1: * TRANSPORT: [MW] @@ -41,8 +31,10 @@ - Remove KBlocks in gnunet-unindex (see discussion with Kenneth Almquist on gnunet-devs in 9/2009) - use different queue prioritization for probe-downloads vs. normal downloads - re-implement gnunet-auto-share - - implement 'GNUNET_FS_file_information_create_from_directory', avoiding - code duplication with gnunet-gtk's similar code (!) + - implement multi-peer FS performance tests + gauger them! + + insert + + download + + search * GNUNET-GTK: [CG] - add tool bar - do meaningful update to status line (starting up, peer running, #connections, shutdown, ...) @@ -56,6 +48,8 @@ + normalize keywords (edit subdialog) - implement download by URI dialog; figure out where to display those downloads! - add combo box to select desired mime type for search + - provide context menus to allow aborts of downloads/uploads + - provide way to handle errors (search, download, publish errors) * ARM: [CG] - better tracking of which config changes actually need to cause process restarts by ARM. - handle gnunet-arm -k in combination with auto-start magic (what is the right thing here?) diff --git a/src/block/Makefile.am b/src/block/Makefile.am index cfbcb797f..39de6edf0 100644 --- a/src/block/Makefile.am +++ b/src/block/Makefile.am @@ -13,41 +13,9 @@ endif lib_LTLIBRARIES = libgnunetblock.la plugin_LTLIBRARIES = \ - libgnunet_plugin_block_dht.la \ - libgnunet_plugin_block_fs.la \ libgnunet_plugin_block_template.la \ - libgnunet_plugin_block_dns.la \ libgnunet_plugin_block_test.la -libgnunet_plugin_block_dht_la_SOURCES = \ - plugin_block_dht.c -libgnunet_plugin_block_dht_la_LIBADD = \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/block/libgnunetblock.la \ - $(top_builddir)/src/util/libgnunetutil.la -libgnunet_plugin_block_dht_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) -libgnunet_plugin_block_dht_la_DEPENDENCIES = \ - libgnunetblock.la - - -libgnunet_plugin_block_fs_la_SOURCES = \ - plugin_block_fs.c -libgnunet_plugin_block_fs_la_LIBADD = \ - $(top_builddir)/src/block/libgnunetblock.la \ - $(top_builddir)/src/util/libgnunetutil.la -libgnunet_plugin_block_fs_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) -libgnunet_plugin_block_fs_la_DEPENDENCIES = \ - libgnunetblock.la - - -libgnunet_plugin_block_dns_la_SOURCES = \ - plugin_block_dns.c -libgnunet_plugin_block_dns_la_LIBADD = \ - $(top_builddir)/src/util/libgnunetutil.la -libgnunet_plugin_block_dns_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_block_template_la_SOURCES = \ plugin_block_template.c diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index ad1d05d25..b2bbf5897 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -22,7 +22,6 @@ endif lib_LTLIBRARIES = \ libgnunetdht.la - libgnunetdht_la_SOURCES = \ dht_api.c dht.h libgnunetdht_la_LIBADD = \ @@ -32,6 +31,23 @@ libgnunetdht_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 + +plugin_LTLIBRARIES = \ + libgnunet_plugin_block_dht.la + +libgnunet_plugin_block_dht_la_SOURCES = \ + plugin_block_dht.c +libgnunet_plugin_block_dht_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/block/libgnunetblock.la \ + $(top_builddir)/src/util/libgnunetutil.la +libgnunet_plugin_block_dht_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) +libgnunet_plugin_block_dht_la_DEPENDENCIES = \ + $(top_builddir)/src/block/libgnunetblock.la + + + bin_PROGRAMS = \ gnunet-service-dht \ gnunet-dht-get \ diff --git a/src/block/plugin_block_dht.c b/src/dht/plugin_block_dht.c similarity index 100% rename from src/block/plugin_block_dht.c rename to src/dht/plugin_block_dht.c diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index b1f15afa3..22201b45a 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -14,9 +14,14 @@ pkgcfgdir= $(pkgdatadir)/config.d/ dist_pkgcfg_DATA = \ fs.conf +plugindir = $(libdir)/gnunet + lib_LTLIBRARIES = libgnunetfs.la +plugin_LTLIBRARIES = \ + libgnunet_plugin_block_fs.la + noinst_LIBRARIES = libgnunetfstest.a libgnunetfs_la_SOURCES = \ @@ -151,6 +156,19 @@ gnunet_unindex_LDADD = \ gnunet_unindex_DEPENDENCIES = \ libgnunetfs.la + +libgnunet_plugin_block_fs_la_SOURCES = \ + plugin_block_fs.c +libgnunet_plugin_block_fs_la_LIBADD = \ + $(top_builddir)/src/block/libgnunetblock.la \ + $(top_builddir)/src/util/libgnunetutil.la +libgnunet_plugin_block_fs_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) +libgnunet_plugin_block_fs_la_DEPENDENCIES = \ + $(top_builddir)/src/block/libgnunetblock.la + + + if HAVE_BENCHMARKS FS_BENCHMARKS = \ perf_gnunet_service_fs_p2p \ diff --git a/src/block/plugin_block_fs.c b/src/fs/plugin_block_fs.c similarity index 100% rename from src/block/plugin_block_fs.c rename to src/fs/plugin_block_fs.c diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index c6b390aca..e69c5643e 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -10,6 +10,8 @@ endif pkgcfgdir= $(pkgdatadir)/config.d/ +plugindir = $(libdir)/gnunet + dist_pkgcfg_DATA = \ vpn.conf @@ -72,6 +74,18 @@ gnunet_daemon_exit_LDADD = \ $(top_builddir)/src/mesh/libgnunetmesh.la \ $(GN_LIBINTL) + +plugin_LTLIBRARIES = \ + libgnunet_plugin_block_dns.la + +libgnunet_plugin_block_dns_la_SOURCES = \ + plugin_block_dns.c +libgnunet_plugin_block_dns_la_LIBADD = \ + $(top_builddir)/src/util/libgnunetutil.la +libgnunet_plugin_block_dns_la_LDFLAGS = \ + $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS) + + #check_PROGRAMS = \ # test_XXX diff --git a/src/block/plugin_block_dns.c b/src/vpn/plugin_block_dns.c similarity index 100% rename from src/block/plugin_block_dns.c rename to src/vpn/plugin_block_dns.c -- 2.25.1