-core review

1 files changed, 154 insertions, 136 deletions

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 12d50481a..9f732257b 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -6,6 +6,14 @@ endif
 
 SUBDIRS = . $(NSS_SUBDIR)
 
+EXTRA_DIST = \
+  test_gns_defaults.conf \
+  test_gns_simple_lookup.conf \
+  test_gns_dht_default.conf \
+  zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey \
+  zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
+  zonefiles/test_zonekey
+
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
   DO_W32_HELPER = gnunet-gns-helper-service-w32
@@ -18,7 +26,7 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
 
-pkgcfgdir= $(pkgdatadir)/config.d/
+pkgcfgdir = $(pkgdatadir)/config.d/
 
 plugindir = $(libdir)/gnunet
 
@@ -28,7 +36,9 @@ pkgcfg_DATA = \
 
 lib_LTLIBRARIES = \
   $(DO_W32_NSP) \
-  libgnunetgns.la
+  libgnunetgns.la \
+  libgnunetgns_common.la
+
 
 if HAVE_MHD
  DO_FCFSD=gnunet-gns-fcfsd
@@ -46,7 +56,143 @@ bin_PROGRAMS = \
   gnunet-gns \
   gnunet-dns2gns
 
-bin_SCRIPTS=gnunet-gns-proxy-setup-ca
+bin_SCRIPTS = gnunet-gns-proxy-setup-ca
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_gns.la
+
+gnunet_gns_SOURCES = \
+ gnunet-gns.c
+gnunet_gns_LDADD = \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(GN_LIBINTL)
+gnunet_gns_DEPENDENCIES = \
+  libgnunetgns.la
+
+gnunet_dns2gns_SOURCES = \
+ gnunet-dns2gns.c
+gnunet_dns2gns_LDADD = \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/dns/libgnunetdnsparser.la \
+        $(top_builddir)/src/dns/libgnunetdnsstub.la \
+  $(GN_LIBINTL)
+gnunet_dns2gns_DEPENDENCIES = \
+  libgnunetgns.la
+
+gnunet_gns_proxy_SOURCES = \
+ gnunet-gns-proxy.c gns_proxy_proto.h 
+gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lgnutls \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_gns_proxy_DEPENDENCIES = \
+  libgnunetgns.la
+
+gnunet_gns_helper_service_w32_SOURCES = \
+  gnunet-gns-helper-service-w32.c
+gnunet_gns_helper_service_w32_LDADD = \
+  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+gnunet_gns_helper_service_w32_DEPENDENCIES = \
+  libgnunetgns.la
+
+w32nsp_install_SOURCES = \
+  w32nsp-install.c
+w32nsp_install_LDADD = -lws2_32
+
+w32nsp_uninstall_SOURCES = \
+  w32nsp-uninstall.c
+w32nsp_uninstall_LDADD = -lws2_32
+
+w32nsp_resolve_SOURCES = \
+  w32nsp-resolve.c
+w32nsp_resolve_LDADD = -lws2_32
+
+gnunet_service_gns_SOURCES = \
+ gnunet-service-gns.c \
+ gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
+ gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h 
+gnunet_service_gns_LDADD = \
+  -lm \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/gns/libgnunetgns_common.la \
+        $(top_builddir)/src/dns/libgnunetdns.la \
+        $(top_builddir)/src/dns/libgnunetdnsparser.la \
+        $(top_builddir)/src/dht/libgnunetdht.la \
+        $(top_builddir)/src/namestore/libgnunetnamestore.la \
+        $(top_builddir)/src/vpn/libgnunetvpn.la \
+  $(GN_LIBINTL)
+gnunet_service_gns_DEPENDENCIES = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/gns/libgnunetgns_common.la \
+        $(top_builddir)/src/dns/libgnunetdns.la \
+        $(top_builddir)/src/dns/libgnunetdnsparser.la \
+        $(top_builddir)/src/dht/libgnunetdht.la \
+        $(top_builddir)/src/namestore/libgnunetnamestore.la \
+        $(top_builddir)/src/vpn/libgnunetvpn.la
+
+
+
+gnunet_gns_fcfsd_SOURCES = \
+ gnunet-gns-fcfsd.c 
+gnunet_gns_fcfsd_LDADD = -lmicrohttpd \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(GN_LIBINTL)
+gnunet_gns_fcfsd_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+
+libw32nsp_la_SOURCES = \
+  w32nsp.c
+libw32nsp_la_LIBADD = \
+  -lole32 -lws2_32
+libw32nsp_la_LDFLAGS = \
+  -export-symbols $(top_srcdir)/src/gns/w32nsp.def \
+  $(GN_LIB_LDFLAGS)
+
+libgnunetgns_la_SOURCES = \
+ gns_api.c gns.h
+libgnunetgns_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+ $(top_builddir)/src/namestore/libgnunetnamestore.la
+libgnunetgns_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
+libgnunetgns_la_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/namestore/libgnunetnamestore.la
+
+
+libgnunetgns_common_la_SOURCES = \
+ gns_common.c gns_common.h
+libgnunetgns_common_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la 
+libgnunetgns_common_la_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la 
+
+
+libgnunet_plugin_block_gns_la_SOURCES = \
+  plugin_block_gns.c
+libgnunet_plugin_block_gns_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/gns/libgnunetgns_common.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+libgnunet_plugin_block_gns_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_block_gns_la_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/gns/libgnunetgns_common.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+
 
 check_PROGRAMS = \
   test_gns_simple_shorten \
@@ -65,7 +211,11 @@ check_PROGRAMS = \
   test_gns_dht_three_peers
  #test_gns_proxy
 
-  
+if ENABLE_TEST_RUN
+if LINUX
+TESTS = $(check_PROGRAMS)
+endif
+endif
 
 
 #  test_gns_simple_lookup
@@ -73,9 +223,6 @@ check_PROGRAMS = \
 #  test_gns_dht_delegated_lookup
 
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_gns.la
-
 #test_gns_proxy_SOURCES = \
 #  test_gns_proxy.c
 #test_gns_proxy_LDADD = -lmicrohttpd @LIBCURL@ \
@@ -282,123 +429,6 @@ test_gns_revocation_DEPENDENCIES = \
   $(top_builddir)/src/testing/libgnunettesting.la
 
 
-gnunet_gns_SOURCES = \
- gnunet-gns.c
-gnunet_gns_LDADD = \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(GN_LIBINTL)
-gnunet_gns_DEPENDENCIES = \
-  libgnunetgns.la
-
-gnunet_dns2gns_SOURCES = \
- gnunet-dns2gns.c
-gnunet_dns2gns_LDADD = \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
-        $(top_builddir)/src/dns/libgnunetdnsstub.la \
-  $(GN_LIBINTL)
-gnunet_dns2gns_DEPENDENCIES = \
-  libgnunetgns.la
-
-gnunet_gns_proxy_SOURCES = \
- gnunet-gns-proxy.c gns_proxy_proto.h 
-gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lgnutls \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-gnunet_gns_proxy_DEPENDENCIES = \
-  libgnunetgns.la
-
-gnunet_gns_helper_service_w32_SOURCES = \
-  gnunet-gns-helper-service-w32.c
-gnunet_gns_helper_service_w32_LDADD = \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-gnunet_gns_helper_service_w32_DEPENDENCIES = \
-  libgnunetgns.la
-
-w32nsp_install_SOURCES = \
-  w32nsp-install.c
-w32nsp_install_LDADD = -lws2_32
-
-w32nsp_uninstall_SOURCES = \
-  w32nsp-uninstall.c
-w32nsp_uninstall_LDADD = -lws2_32
-
-w32nsp_resolve_SOURCES = \
-  w32nsp-resolve.c
-w32nsp_resolve_LDADD = -lws2_32
-
-gnunet_service_gns_SOURCES = \
- gnunet-service-gns.c \
- gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
- gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h 
-gnunet_service_gns_LDADD = \
-  -lm \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-        $(top_builddir)/src/dns/libgnunetdns.la \
-        $(top_builddir)/src/dns/libgnunetdnsparser.la \
-        $(top_builddir)/src/dht/libgnunetdht.la \
-        $(top_builddir)/src/namestore/libgnunetnamestore.la \
-        $(top_builddir)/src/vpn/libgnunetvpn.la \
-  $(GN_LIBINTL)
-gnunet_service_gns_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-        $(top_builddir)/src/dns/libgnunetdns.la \
-        $(top_builddir)/src/dns/libgnunetdnsparser.la \
-        $(top_builddir)/src/dht/libgnunetdht.la \
-        $(top_builddir)/src/namestore/libgnunetnamestore.la \
-        $(top_builddir)/src/vpn/libgnunetvpn.la
-
-
-gnunet_gns_fcfsd_SOURCES = \
- gnunet-gns-fcfsd.c 
-gnunet_gns_fcfsd_LDADD = -lmicrohttpd \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(GN_LIBINTL)
-gnunet_gns_fcfsd_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
-
-libw32nsp_la_SOURCES = \
-  w32nsp.c
-libw32nsp_la_LIBADD = \
-  -lole32 -lws2_32
-libw32nsp_la_LDFLAGS = \
-  -export-symbols $(top_srcdir)/src/gns/w32nsp.def \
-  $(GN_LIB_LDFLAGS)
-
-libgnunetgns_la_SOURCES = \
- gns_api.c gns.h
-libgnunetgns_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
- $(top_builddir)/src/namestore/libgnunetnamestore.la
-libgnunetgns_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-libgnunetgns_la_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/namestore/libgnunetnamestore.la
-
-libgnunet_plugin_block_gns_la_SOURCES = \
-  plugin_block_gns.c
-libgnunet_plugin_block_gns_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
-libgnunet_plugin_block_gns_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_gns_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
 
 #Build stub api
 #libgnunetnamestore_la_SOURCES = \
@@ -410,17 +440,5 @@ libgnunet_plugin_block_gns_la_DEPENDENCIES = \
 #libgnunetnamestore_la_DEPENDENCIES = \
 # $(top_builddir)/src/util/libgnunetutil.la
 
-if ENABLE_TEST_RUN
-if LINUX
-TESTS = $(check_PROGRAMS)
-endif
-endif
 
-EXTRA_DIST = \
-  test_gns_defaults.conf \
-  test_gns_simple_lookup.conf \
-  test_gns_dht_default.conf \
-        zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey \
-        zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
-        zonefiles/test_zonekey