From: Christian Grothoff Date: Mon, 20 Feb 2012 18:25:35 +0000 (+0000) Subject: -adding namestore directory: X-Git-Tag: initial-import-from-subversion-38251~14790 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3be7c8d9183f4608aa670646053dc73666276e38;p=oweals%2Fgnunet.git -adding namestore directory: --- diff --git a/configure.ac b/configure.ac index 69cc7d60c..b1073d9d6 100644 --- a/configure.ac +++ b/configure.ac @@ -877,6 +877,8 @@ src/include/gnunet_directories.h src/hostlist/Makefile src/mesh/Makefile src/mesh/mesh.conf +src/namestore/Makefile +src/namestore/namestore.conf src/nat/Makefile src/nse/Makefile src/nse/nse.conf diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am new file mode 100644 index 000000000..3dead06dc --- /dev/null +++ b/src/namestore/Makefile.am @@ -0,0 +1,58 @@ +INCLUDES = -I$(top_srcdir)/src/include + +plugindir = $(libdir)/gnunet + +pkgcfgdir= $(pkgnamedir)/config.d/ + +pkgcfg_NAME = \ + namestore.conf + +if MINGW + WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols +endif + +if USE_COVERAGE + AM_CFLAGS = --coverage -O0 + XLIBS = -lgcov +endif + + +#lib_LTLIBRARIES = \ +# libgnunetnamestore.la +# +#libgnunetnamestore_la_SOURCES = \ +# namestore_api.c namestore.h +#libgnunetnamestore_la_LIBADD = \ +# $(top_builddir)/src/statistics/libgnunetstatistics.la \ +# $(top_builddir)/src/util/libgnunetutil.la \ +# $(GN_LIBINTL) +#libgnunetnamestore_la_LDFLAGS = \ +# $(GN_LIB_LDFLAGS) $(WINFLAGS) \ +# -version-info 0:0:0 +# + +#bin_PROGRAMS = \ +# gnunet-service-namestore +# +#gnunet_service_namestore_SOURCES = \ +# gnunet-service-namestore.c +#gnunet_service_namestore_LDADD = \ +# $(top_builddir)/src/statistics/libgnunetstatistics.la \ +# $(top_builddir)/src/util/libgnunetutil.la \ +# $(GN_LIBINTL) + +if HAVE_SQLITE + SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la +endif + +plugin_LTLIBRARIES = \ + $(SQLITE_PLUGIN) + +libgnunet_plugin_namestore_sqlite_la_SOURCES = \ + plugin_namestore_sqlite.c +libgnunet_plugin_namestore_sqlite_la_LIBADD = \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 +libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in new file mode 100644 index 000000000..c9b9984e9 --- /dev/null +++ b/src/namestore/namestore.conf.in @@ -0,0 +1,30 @@ +[namestore] +AUTOSTART = YES +UNIXPATH = /tmp/gnunet-service-namestore.sock +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES +@UNIXONLY@ PORT = 2099 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-namestore +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +DATABASE = sqlite + +[namestore-sqlite] +FILENAME = $SERVICEHOME/namestore/sqlite.db + +[namestore-postgres] +CONFIG = connect_timeout=10; dbname=gnunet + +[namestore-mysql] +DATABASE = gnunet +CONFIG = ~/.my.cnf +# USER = gnunet +# PASSWORD = +# HOST = localhost +# PORT = 3306 + + + diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf index 54df2238b..552b4fe63 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/nse/nse_profiler_test.conf @@ -103,7 +103,7 @@ PORT = 0 PORT = 0 #@W32PORT@ PORT = 1234 -#@UNIXPORT@ PORT = 0 +#@UNIXONLY@ PORT = 0 [transport] PORT = 0