From: Christian Grothoff Date: Fri, 13 Jan 2012 17:04:35 +0000 (+0000) Subject: change default configurations on systems with UNIX domain sockets to NOT specify... X-Git-Tag: initial-import-from-subversion-38251~15327 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f491ac4fab469421986f77df0bbf79fefc417786;p=oweals%2Fgnunet.git change default configurations on systems with UNIX domain sockets to NOT specify any port for TCP-based IPC (and interpret that as no TCP-based IPC desired), as we can and want to use UNIX domain sockets in this case by default --- diff --git a/configure.ac b/configure.ac index 9ab15c647..9dd33ef8f 100644 --- a/configure.ac +++ b/configure.ac @@ -79,12 +79,14 @@ case "$host_os" in DEFAULT_INTERFACE="\"en0\"" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; linux*) AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system]) build_target="linux" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" AC_PATH_XTRA ;; freebsd*) @@ -94,6 +96,7 @@ freebsd*) build_target="freebsd" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; openbsd*) AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) @@ -102,12 +105,14 @@ openbsd*) build_target="openbsd" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; netbsd*) AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; *solaris*) AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system]) @@ -117,6 +122,7 @@ netbsd*) build_target="solaris" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; *arm-linux*) AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system]) @@ -124,6 +130,7 @@ netbsd*) build_target="linux" LIBPREFIX= DLLDIR=lib + UNIXONLY="#" ;; *cygwin*) AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) @@ -135,6 +142,7 @@ netbsd*) LIBPREFIX=lib DLLDIR=bin AC_PROG_CXX + UNIXONLY="" ;; *mingw*) AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) @@ -149,15 +157,21 @@ netbsd*) AC_PROG_CXX LIBPREFIX=lib DLLDIR=bin + UNIXONLY="" ;; *) AC_MSG_RESULT(Unrecognised OS $host_os) AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS]) + UNIXONLY="" ;; esac AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should be the default choice for the name of the first network interface]) AC_SUBST(DEFAULT_INTERFACE) +# Disable TCP-based IPC on systems that support UNIX domain +# sockets in default configuratin: +AC_SUBST(UNIXONLY) + AC_MSG_CHECKING([for build target]) AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin") AM_CONDITIONAL(CYGWIN, test "$build_target" = "cygwin") @@ -814,34 +828,50 @@ m4/Makefile po/Makefile.in src/Makefile src/arm/Makefile +src/arm/arm.conf src/ats/Makefile +src/ats/ats.conf src/block/Makefile +src/chat/Makefile +src/chat/chat.conf src/core/Makefile +src/core/core.conf src/datacache/Makefile src/datastore/Makefile +src/datastore/datastore.conf src/dht/Makefile +src/dht/dht.conf src/dns/Makefile +src/dns/dns.conf src/dv/Makefile +src/dv/dv.conf src/exit/Makefile src/fragmentation/Makefile src/fs/Makefile +src/fs/fs.conf src/hello/Makefile src/include/Makefile src/include/gnunet_directories.h src/hostlist/Makefile src/mesh/Makefile +src/mesh/mesh.conf src/nat/Makefile src/nse/Makefile +src/nse/nse.conf src/peerinfo/Makefile +src/peerinfo/peerinfo.conf src/peerinfo-tool/Makefile src/statistics/Makefile +src/statistics/statistics.conf src/template/Makefile src/testing/Makefile src/topology/Makefile src/transport/Makefile +src/transport/transport.conf src/util/Makefile +src/util/resolver.conf src/vpn/Makefile -src/chat/Makefile +src/vpn/vpn.conf src/integration-tests/Makefile pkgconfig/Makefile pkgconfig/gnunetarm.pc diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index 25eb7d166..7da1e2c60 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src/include pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ arm.conf if MINGW diff --git a/src/arm/arm.conf b/src/arm/arm.conf deleted file mode 100644 index fa82ea957..000000000 --- a/src/arm/arm.conf +++ /dev/null @@ -1,23 +0,0 @@ - -[arm] -PORT = 2087 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-arm -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -DEFAULTSERVICES = topology hostlist -UNIXPATH = /tmp/gnunet-service-arm.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs -# GLOBAL_PREFIX = -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in new file mode 100644 index 000000000..c1f408fd2 --- /dev/null +++ b/src/arm/arm.conf.in @@ -0,0 +1,23 @@ + +[arm] +@UNIXONLY@ PORT = 2087 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-arm +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +DEFAULTSERVICES = topology hostlist +UNIXPATH = /tmp/gnunet-service-arm.sock +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES +# GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs +# GLOBAL_PREFIX = +# USERNAME = +# MAXBUF = +# TIMEOUT = +# DISABLEV6 = +# BINDTO = +# REJECT_FROM = +# REJECT_FROM6 = +# PREFIX = diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index d6ffebc8f..1f8a84a67 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src/include pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ ats.conf if MINGW diff --git a/src/ats/ats.conf b/src/ats/ats.conf deleted file mode 100644 index 3b9e1a58e..000000000 --- a/src/ats/ats.conf +++ /dev/null @@ -1,24 +0,0 @@ -[ats] -AUTOSTART = YES -PORT = 2098 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-ats -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-ats.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -MLP = NO -WAN_QUOTA_IN = 65536 -WAN_QUOTA_OUT = 65536 -# ATS options -DUMP_MLP = NO -DUMP_SOLUTION = NO -DUMP_OVERWRITE = NO -DUMP_MIN_PEERS = 0 -DUMP_MIN_ADDRS = 0 -DUMP_OVERWRITE = NO -ATS_MIN_INTERVAL = 15000 -ATS_EXEC_INTERVAL = 30000 diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in new file mode 100644 index 000000000..6ea0d417f --- /dev/null +++ b/src/ats/ats.conf.in @@ -0,0 +1,24 @@ +[ats] +AUTOSTART = YES +@UNIXONLY@ PORT = 2098 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-ats +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-ats.sock +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES +MLP = NO +WAN_QUOTA_IN = 65536 +WAN_QUOTA_OUT = 65536 +# ATS options +DUMP_MLP = NO +DUMP_SOLUTION = NO +DUMP_OVERWRITE = NO +DUMP_MIN_PEERS = 0 +DUMP_MIN_ADDRS = 0 +DUMP_OVERWRITE = NO +ATS_MIN_INTERVAL = 15000 +ATS_EXEC_INTERVAL = 30000 diff --git a/src/chat/Makefile.am b/src/chat/Makefile.am index 859e8f1f1..213283684 100644 --- a/src/chat/Makefile.am +++ b/src/chat/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src/include pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ chat.conf if MINGW diff --git a/src/chat/chat.conf b/src/chat/chat.conf deleted file mode 100644 index 61d551e16..000000000 --- a/src/chat/chat.conf +++ /dev/null @@ -1,22 +0,0 @@ -[chat] -AUTOSTART = YES -PORT = 2090 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-chat -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-chat.sock -UNIX_MATCH_UID = NO -UNIX_MATCH_GID = YES -# DISABLE_SOCKET_FORWARDING = NO -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = - diff --git a/src/chat/chat.conf.in b/src/chat/chat.conf.in new file mode 100644 index 000000000..41fe9b4f7 --- /dev/null +++ b/src/chat/chat.conf.in @@ -0,0 +1,22 @@ +[chat] +AUTOSTART = YES +@UNIXONLY@ PORT = 2090 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-chat +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-chat.sock +UNIX_MATCH_UID = NO +UNIX_MATCH_GID = YES +# DISABLE_SOCKET_FORWARDING = NO +# USERNAME = +# MAXBUF = +# TIMEOUT = +# DISABLEV6 = +# BINDTO = +# REJECT_FROM = +# REJECT_FROM6 = +# PREFIX = + diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 13054d15a..ad9bddcb6 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src/include pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ core.conf if MINGW diff --git a/src/core/core.conf b/src/core/core.conf deleted file mode 100644 index 3dc08312e..000000000 --- a/src/core/core.conf +++ /dev/null @@ -1,22 +0,0 @@ -[core] -AUTOSTART = YES -PORT = 2092 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-core -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-core.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -# DISABLE_SOCKET_FORWARDING = NO -# DEBUG = YES -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = diff --git a/src/core/core.conf.in b/src/core/core.conf.in new file mode 100644 index 000000000..84e2df9fb --- /dev/null +++ b/src/core/core.conf.in @@ -0,0 +1,22 @@ +[core] +AUTOSTART = YES +@UNIXONLY@ PORT = 2092 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-core +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-core.sock +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES +# DISABLE_SOCKET_FORWARDING = NO +# DEBUG = YES +# USERNAME = +# MAXBUF = +# TIMEOUT = +# DISABLEV6 = +# BINDTO = +# REJECT_FROM = +# REJECT_FROM6 = +# PREFIX = diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index d98ebb2e1..44c5bbee4 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am @@ -4,7 +4,7 @@ plugindir = $(libdir)/gnunet pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ datastore.conf if MINGW diff --git a/src/datastore/datastore.conf b/src/datastore/datastore.conf deleted file mode 100644 index 68de15626..000000000 --- a/src/datastore/datastore.conf +++ /dev/null @@ -1,33 +0,0 @@ -[datastore] -AUTOSTART = YES -UNIXPATH = /tmp/gnunet-service-datastore.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -PORT = 2093 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-datastore -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -QUOTA = 100 MB -BLOOMFILTER = $SERVICEHOME/datastore/bloomfilter -DATABASE = sqlite -# DISABLE_SOCKET_FORWARDING = NO - -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db - -[datastore-postgres] -CONFIG = connect_timeout=10; dbname=gnunet - -[datastore-mysql] -DATABASE = gnunet -CONFIG = ~/.my.cnf -# USER = gnunet -# PASSWORD = -# HOST = localhost -# PORT = 3306 - - - diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in new file mode 100644 index 000000000..837c619c2 --- /dev/null +++ b/src/datastore/datastore.conf.in @@ -0,0 +1,33 @@ +[datastore] +AUTOSTART = YES +UNIXPATH = /tmp/gnunet-service-datastore.sock +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES +@UNIXONLY@ PORT = 2093 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-datastore +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +QUOTA = 100 MB +BLOOMFILTER = $SERVICEHOME/datastore/bloomfilter +DATABASE = sqlite +# DISABLE_SOCKET_FORWARDING = NO + +[datastore-sqlite] +FILENAME = $SERVICEHOME/datastore/sqlite.db + +[datastore-postgres] +CONFIG = connect_timeout=10; dbname=gnunet + +[datastore-mysql] +DATABASE = gnunet +CONFIG = ~/.my.cnf +# USER = gnunet +# PASSWORD = +# HOST = localhost +# PORT = 3306 + + + diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index e5d3c88ed..f9766a227 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -7,7 +7,7 @@ plugindir = $(libdir)/gnunet pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ dht.conf if HAVE_ZLIB diff --git a/src/dht/dht.conf b/src/dht/dht.conf deleted file mode 100644 index ba903a2d0..000000000 --- a/src/dht/dht.conf +++ /dev/null @@ -1,38 +0,0 @@ -[dht] -AUTOSTART = YES -PORT = 2095 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-dht -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -BUCKET_SIZE = 4 -UNIXPATH = /tmp/gnunet-service-dht.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -# DISABLE_SOCKET_FORWARDING = NO -# DEBUG = YES -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = -# DO_FIND_PEER = -# STRICT_KADEMLIA = -# USE_MAX_HOPS = -# MAX_HOPS = -# REPUBLISH = YES -# REPLICATION_FREQUENCY = 60 -# STOP_ON_CLOSEST = -# STOP_FOUND = -# CONVERGE_MODIFIER = - - -[dhtcache] -DATABASE = sqlite -QUOTA = 1 MB - diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in new file mode 100644 index 000000000..c73c05688 --- /dev/null +++ b/src/dht/dht.conf.in @@ -0,0 +1,38 @@ +[dht] +AUTOSTART = YES +@UNIXONLY@ PORT = 2095 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-dht +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +BUCKET_SIZE = 4 +UNIXPATH = /tmp/gnunet-service-dht.sock +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES +# DISABLE_SOCKET_FORWARDING = NO +# DEBUG = YES +# USERNAME = +# MAXBUF = +# TIMEOUT = +# DISABLEV6 = +# BINDTO = +# REJECT_FROM = +# REJECT_FROM6 = +# PREFIX = +# DO_FIND_PEER = +# STRICT_KADEMLIA = +# USE_MAX_HOPS = +# MAX_HOPS = +# REPUBLISH = YES +# REPLICATION_FREQUENCY = 60 +# STOP_ON_CLOSEST = +# STOP_FOUND = +# CONVERGE_MODIFIER = + + +[dhtcache] +DATABASE = sqlite +QUOTA = 1 MB + diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 2a554f454..f7376a111 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -12,7 +12,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/ plugindir = $(libdir)/gnunet -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ dns.conf if LINUX diff --git a/src/dns/dns.conf b/src/dns/dns.conf deleted file mode 100644 index f8590bf61..000000000 --- a/src/dns/dns.conf +++ /dev/null @@ -1,22 +0,0 @@ -[dns] -AUTOSTART = YES -PORT = 0 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-dns -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-dns.sock - -PROVIDE_EXIT = YES -IFNAME = gnunet-dns - -# Use RFC 3849-style documentation IPv6 address (RFC 4773 might provide an alternative in the future) -IPV6ADDR = 2001:DB8::1 -IPV6PREFIX = 126 - -# Use RFC 3927-style link-local address -IPV4ADDR = 169.254.1.1 -IPV4MASK = 255.255.0.0 - diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in new file mode 100644 index 000000000..cd1c2e6e3 --- /dev/null +++ b/src/dns/dns.conf.in @@ -0,0 +1,22 @@ +[dns] +AUTOSTART = YES +@UNIXONLY@ PORT = 0 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-dns +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-dns.sock + +PROVIDE_EXIT = YES +IFNAME = gnunet-dns + +# Use RFC 3849-style documentation IPv6 address (RFC 4773 might provide an alternative in the future) +IPV6ADDR = 2001:DB8::1 +IPV6PREFIX = 126 + +# Use RFC 3927-style link-local address +IPV4ADDR = 169.254.1.1 +IPV4MASK = 255.255.0.0 + diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am index c0e826a2c..e0cd2e4e8 100644 --- a/src/dv/Makefile.am +++ b/src/dv/Makefile.am @@ -13,7 +13,7 @@ plugindir = $(libdir)/gnunet pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ dv.conf lib_LTLIBRARIES = libgnunetdv.la diff --git a/src/dv/dv.conf b/src/dv/dv.conf deleted file mode 100644 index 8fbf23659..000000000 --- a/src/dv/dv.conf +++ /dev/null @@ -1,15 +0,0 @@ -[dv] -AUTOSTART = YES -DEBUG = NO -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-dv -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2571 -# ACCEPT_FROM = -# ACCEPT_FROM6 = -# REJECT_FROM = -# REJECT_FROM6 = -# BINDTO = diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in new file mode 100644 index 000000000..fa647e31c --- /dev/null +++ b/src/dv/dv.conf.in @@ -0,0 +1,16 @@ +[dv] +AUTOSTART = YES +DEBUG = NO +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-dv +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +@UNIXONLY@ PORT = 2571 +UNIXPATH = /tmp/gnunet-service-dv.sock +# ACCEPT_FROM = +# ACCEPT_FROM6 = +# REJECT_FROM = +# REJECT_FROM6 = +# BINDTO = diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index f480f2845..cbf63f335 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -11,7 +11,7 @@ endif pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ fs.conf plugindir = $(libdir)/gnunet diff --git a/src/fs/fs.conf b/src/fs/fs.conf deleted file mode 100644 index 2f65859b4..000000000 --- a/src/fs/fs.conf +++ /dev/null @@ -1,32 +0,0 @@ -[fs] -AUTOSTART = YES -INDEXDB = $SERVICEHOME/idxinfo.lst -TRUST = $SERVICEHOME/data/credit/ -IDENTITY_DIR = $SERVICEHOME/identities/ -STATE_DIR = $SERVICEHOME/persistence/ -UPDATE_DIR = $SERVICEHOME/updates/ -PORT = 2094 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-fs -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; - -DELAY = YES -CONTENT_CACHING = YES -CONTENT_PUSHING = YES - -UNIXPATH = /tmp/gnunet-service-fs.sock -UNIX_MATCH_UID = NO -UNIX_MATCH_GID = YES -# DISABLE_SOCKET_FORWARDING = NO -# DEBUG = YES -MAX_PENDING_REQUESTS = 65536 -# Maximum frequency we're allowed to poll the datastore -# for content for migration (can be used to reduce -# GNUnet's disk-IO rate) -MIN_MIGRATION_DELAY = 100 ms -EXPECTED_NEIGHBOUR_COUNT = 128 - - diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in new file mode 100644 index 000000000..48c8b5209 --- /dev/null +++ b/src/fs/fs.conf.in @@ -0,0 +1,32 @@ +[fs] +AUTOSTART = YES +INDEXDB = $SERVICEHOME/idxinfo.lst +TRUST = $SERVICEHOME/data/credit/ +IDENTITY_DIR = $SERVICEHOME/identities/ +STATE_DIR = $SERVICEHOME/persistence/ +UPDATE_DIR = $SERVICEHOME/updates/ +@UNIXONLY@ PORT = 2094 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-fs +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; + +DELAY = YES +CONTENT_CACHING = YES +CONTENT_PUSHING = YES + +UNIXPATH = /tmp/gnunet-service-fs.sock +UNIX_MATCH_UID = NO +UNIX_MATCH_GID = YES +# DISABLE_SOCKET_FORWARDING = NO +# DEBUG = YES +MAX_PENDING_REQUESTS = 65536 +# Maximum frequency we're allowed to poll the datastore +# for content for migration (can be used to reduce +# GNUnet's disk-IO rate) +MIN_MIGRATION_DELAY = 100 ms +EXPECTED_NEIGHBOUR_COUNT = 128 + + diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index 6adcdf425..610353610 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -11,7 +11,7 @@ endif pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ mesh.conf AM_CLFAGS = -g diff --git a/src/mesh/mesh.conf b/src/mesh/mesh.conf deleted file mode 100644 index 922275368..000000000 --- a/src/mesh/mesh.conf +++ /dev/null @@ -1,13 +0,0 @@ -[mesh] -AUTOSTART = YES -PORT = 2096 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-mesh -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-mesh.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES - diff --git a/src/mesh/mesh.conf.in b/src/mesh/mesh.conf.in new file mode 100644 index 000000000..83a8938b2 --- /dev/null +++ b/src/mesh/mesh.conf.in @@ -0,0 +1,13 @@ +[mesh] +AUTOSTART = YES +@UNIXONLY@ PORT = 2096 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-mesh +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-mesh.sock +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index 695059c64..054a77663 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am @@ -11,7 +11,7 @@ endif pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ nse.conf diff --git a/src/nse/nse.conf b/src/nse/nse.conf deleted file mode 100644 index 8cc912d4d..000000000 --- a/src/nse/nse.conf +++ /dev/null @@ -1,25 +0,0 @@ -[nse] -AUTOSTART = YES -PORT = 2097 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-nse -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/test-nse-service-nse.unix -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -PROOFFILE = $SERVICEHOME/.nse-proof -HISTOGRAM = $SERVICEHOME/nse-history.log - -# How 'slowly' should the proof-of-work be constructed (delay -# between rounds); sane values between 0 and ~1000. -WORKDELAY = 5 ms - -# Note: changing any of the values below will make this peer -# completely incompatible with other peers! -INTERVAL = 1 h -# 26 is about 10 minutes on a modern i7 (single-core) -WORKBITS = 26 - diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in new file mode 100644 index 000000000..b04f5acfe --- /dev/null +++ b/src/nse/nse.conf.in @@ -0,0 +1,25 @@ +[nse] +AUTOSTART = YES +@UNIXONLY@ PORT = 2097 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-nse +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/test-nse-service-nse.unix +UNIX_MATCH_UID = NO +UNIX_MATCH_GID = YES +PROOFFILE = $SERVICEHOME/.nse-proof +HISTOGRAM = $SERVICEHOME/nse-history.log + +# How 'slowly' should the proof-of-work be constructed (delay +# between rounds); sane values between 0 and ~1000. +WORKDELAY = 5 ms + +# Note: changing any of the values below will make this peer +# completely incompatible with other peers! +INTERVAL = 1 h +# 26 is about 10 minutes on a modern i7 (single-core) +WORKBITS = 26 + diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 13a763b47..468fab541 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src/include pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ peerinfo.conf if MINGW diff --git a/src/peerinfo/peerinfo.conf b/src/peerinfo/peerinfo.conf deleted file mode 100644 index 1b300ca4b..000000000 --- a/src/peerinfo/peerinfo.conf +++ /dev/null @@ -1,24 +0,0 @@ -[peerinfo] -AUTOSTART = YES -PORT = 2090 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-peerinfo -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-peerinfo.sock -UNIX_MATCH_UID = NO -UNIX_MATCH_GID = YES -# DISABLE_SOCKET_FORWARDING = NO -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = -HOSTS = $SERVICEHOME/data/hosts/ - - diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in new file mode 100644 index 000000000..a40cc4fba --- /dev/null +++ b/src/peerinfo/peerinfo.conf.in @@ -0,0 +1,24 @@ +[peerinfo] +AUTOSTART = YES +@UNIXONLY@ PORT = 2090 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-peerinfo +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-peerinfo.sock +UNIX_MATCH_UID = NO +UNIX_MATCH_GID = YES +# DISABLE_SOCKET_FORWARDING = NO +# USERNAME = +# MAXBUF = +# TIMEOUT = +# DISABLEV6 = +# BINDTO = +# REJECT_FROM = +# REJECT_FROM6 = +# PREFIX = +HOSTS = $SERVICEHOME/data/hosts/ + + diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am index 8ea7e93d2..2d1daf8d7 100644 --- a/src/statistics/Makefile.am +++ b/src/statistics/Makefile.am @@ -11,7 +11,7 @@ endif pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ statistics.conf lib_LTLIBRARIES = libgnunetstatistics.la diff --git a/src/statistics/statistics.conf b/src/statistics/statistics.conf deleted file mode 100644 index e54c51963..000000000 --- a/src/statistics/statistics.conf +++ /dev/null @@ -1,22 +0,0 @@ -[statistics] -AUTOSTART = YES -PORT = 2088 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-statistics -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-statistics.sock -UNIX_MATCH_UID = NO -UNIX_MATCH_GID = YES -# DISABLE_SOCKET_FORWARDING = NO -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = - diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in new file mode 100644 index 000000000..4482b0f11 --- /dev/null +++ b/src/statistics/statistics.conf.in @@ -0,0 +1,22 @@ +[statistics] +AUTOSTART = YES +@UNIXONLY@ PORT = 2088 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-statistics +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-statistics.sock +UNIX_MATCH_UID = NO +UNIX_MATCH_GID = YES +# DISABLE_SOCKET_FORWARDING = NO +# USERNAME = +# MAXBUF = +# TIMEOUT = +# DISABLEV6 = +# BINDTO = +# REJECT_FROM = +# REJECT_FROM6 = +# PREFIX = + diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 210998293..fc6c8f200 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -4,7 +4,7 @@ plugindir = $(libdir)/gnunet pkgcfgdir= $(pkgdatadir)/config.d/ -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ transport.conf diff --git a/src/transport/transport.conf b/src/transport/transport.conf deleted file mode 100644 index 5f742bcda..000000000 --- a/src/transport/transport.conf +++ /dev/null @@ -1,66 +0,0 @@ -[transport] -AUTOSTART = YES -PORT = 2091 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-transport -#PREFIX = valgrind -NEIGHBOUR_LIMIT = 50 -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -PLUGINS = tcp -UNIXPATH = /tmp/gnunet-service-transport.sock -BLACKLIST_FILE = $SERVICEHOME/blacklist -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -# DISABLE_SOCKET_FORWARDING = NO -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = valgrind --leak-check=full - - -[transport-tcp] -# Use 0 to ONLY advertise as a peer behind NAT (no port binding) -PORT = 2086 -ADVERTISED_PORT = 2086 - -# Maximum number of open TCP connections allowed -MAX_CONNECTIONS = 128 - -TIMEOUT = 5 s -# ACCEPT_FROM = -# ACCEPT_FROM6 = -# REJECT_FROM = -# REJECT_FROM6 = -# BINDTO = -MAX_CONNECTIONS = 128 - -[transport-udp] -PORT = 2086 -BROADCAST = YES -BROADCAST_INTERVAL = 30000 -MAX_BPS = 1000000 - -[transport-http] -PORT = 1080 -MAX_CONNECTIONS = 128 - -[transport-https] -PORT = 4433 -CRYPTO_INIT = NORMAL -KEY_FILE = https.key -CERT_FILE = https.cert -MAX_CONNECTIONS = 128 - -[transport-wlan] -# Name of the interface in monitor mode (typically monX) -INTERFACE = mon0 -# Real hardware, no testing -TESTMODE = 0 - diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in new file mode 100644 index 000000000..213e8f5f0 --- /dev/null +++ b/src/transport/transport.conf.in @@ -0,0 +1,66 @@ +[transport] +AUTOSTART = YES +@UNIXONLY@ PORT = 2091 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-transport +#PREFIX = valgrind +NEIGHBOUR_LIMIT = 50 +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +PLUGINS = tcp +UNIXPATH = /tmp/gnunet-service-transport.sock +BLACKLIST_FILE = $SERVICEHOME/blacklist +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES +# DISABLE_SOCKET_FORWARDING = NO +# USERNAME = +# MAXBUF = +# TIMEOUT = +# DISABLEV6 = +# BINDTO = +# REJECT_FROM = +# REJECT_FROM6 = +# PREFIX = valgrind --leak-check=full + + +[transport-tcp] +# Use 0 to ONLY advertise as a peer behind NAT (no port binding) +PORT = 2086 +ADVERTISED_PORT = 2086 + +# Maximum number of open TCP connections allowed +MAX_CONNECTIONS = 128 + +TIMEOUT = 5 s +# ACCEPT_FROM = +# ACCEPT_FROM6 = +# REJECT_FROM = +# REJECT_FROM6 = +# BINDTO = +MAX_CONNECTIONS = 128 + +[transport-udp] +PORT = 2086 +BROADCAST = YES +BROADCAST_INTERVAL = 30000 +MAX_BPS = 1000000 + +[transport-http] +PORT = 1080 +MAX_CONNECTIONS = 128 + +[transport-https] +PORT = 4433 +CRYPTO_INIT = NORMAL +KEY_FILE = https.key +CERT_FILE = https.cert +MAX_CONNECTIONS = 128 + +[transport-wlan] +# Name of the interface in monitor mode (typically monX) +INTERFACE = mon0 +# Real hardware, no testing +TESTMODE = 0 + diff --git a/src/util/Makefile.am b/src/util/Makefile.am index ec3884dc8..7f2e0cd48 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -5,7 +5,10 @@ plugindir = $(libdir)/gnunet pkgcfgdir= $(pkgdatadir)/config.d/ dist_pkgcfg_DATA = \ - util.conf resolver.conf + util.conf + +pkgcfg_DATA = \ + resolver.conf if MINGW noinst_LTLIBRARIES = \ diff --git a/src/util/client.c b/src/util/client.c index e71ccdf39..2f09a9046 100644 --- a/src/util/client.c +++ b/src/util/client.c @@ -289,25 +289,35 @@ do_connect (const char *service_name, } #endif - if ((GNUNET_OK != - GNUNET_CONFIGURATION_get_value_number (cfg, service_name, "PORT", &port)) - || (port > 65535) || - (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "HOSTNAME", - &hostname))) + if (GNUNET_YES == + GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT")) { - LOG (GNUNET_ERROR_TYPE_WARNING, - _ - ("Could not determine valid hostname and port for service `%s' from configuration.\n"), - service_name); - return NULL; + if ((GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (cfg, service_name, "PORT", &port)) + || (port > 65535) || + (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "HOSTNAME", + &hostname))) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + _ + ("Could not determine valid hostname and port for service `%s' from configuration.\n"), + service_name); + return NULL; + } + if (0 == strlen (hostname)) + { + GNUNET_free (hostname); + LOG (GNUNET_ERROR_TYPE_WARNING, + _("Need a non-empty hostname for service `%s'.\n"), service_name); + return NULL; + } } - if (0 == strlen (hostname)) + else { - GNUNET_free (hostname); - LOG (GNUNET_ERROR_TYPE_WARNING, - _("Need a non-empty hostname for service `%s'.\n"), service_name); - return NULL; + /* unspecified means 0 (disabled) */ + port = 0; + hostname = NULL; } if (port == 0) { @@ -326,7 +336,7 @@ do_connect (const char *service_name, if (sock != NULL) { GNUNET_free (unixpath); - GNUNET_free (hostname); + GNUNET_free_non_null (hostname); return sock; } } @@ -338,7 +348,7 @@ do_connect (const char *service_name, "Port is 0 for service `%s', UNIXPATH did not work, returning NULL!\n", service_name); #endif - GNUNET_free (hostname); + GNUNET_free_non_null (hostname); return NULL; } diff --git a/src/util/resolver.conf b/src/util/resolver.conf deleted file mode 100644 index a2690fcc3..000000000 --- a/src/util/resolver.conf +++ /dev/null @@ -1,22 +0,0 @@ -[resolver] -AUTOSTART = YES -PORT = 2089 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-resolver -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-resolver.sock -UNIX_MATCH_UID = NO -UNIX_MATCH_GID = NO -# DISABLE_SOCKET_FORWARDING = NO -# USERNAME = -# MAXBUF = -# TIMEOUT = -# DISABLEV6 = -# BINDTO = -# REJECT_FROM = -# REJECT_FROM6 = -# PREFIX = - diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in new file mode 100644 index 000000000..671ea0ed6 --- /dev/null +++ b/src/util/resolver.conf.in @@ -0,0 +1,22 @@ +[resolver] +AUTOSTART = YES +@UNIXONLY@ PORT = 2089 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-resolver +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-resolver.sock +UNIX_MATCH_UID = NO +UNIX_MATCH_GID = NO +# DISABLE_SOCKET_FORWARDING = NO +# USERNAME = +# MAXBUF = +# TIMEOUT = +# DISABLEV6 = +# BINDTO = +# REJECT_FROM = +# REJECT_FROM6 = +# PREFIX = + diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 857232a99..be28949c5 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -12,7 +12,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/ plugindir = $(libdir)/gnunet -dist_pkgcfg_DATA = \ +pkgcfg_DATA = \ vpn.conf if LINUX diff --git a/src/vpn/vpn.conf b/src/vpn/vpn.conf deleted file mode 100644 index 0d8e1e1a5..000000000 --- a/src/vpn/vpn.conf +++ /dev/null @@ -1,19 +0,0 @@ -[vpn] -AUTOSTART = YES -PORT = 0 -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-vpn -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-vpn.sock - -IPV6ADDR = 1234::1 -IPV6PREFIX = 32 -IPV4ADDR = 10.11.10.1 -IPV4MASK = 255.255.0.0 -VIRTDNS = 10.11.10.2 -VIRTDNS6 = 1234::17 -IFNAME = vpn-gnunet - diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in new file mode 100644 index 000000000..411ad3fb9 --- /dev/null +++ b/src/vpn/vpn.conf.in @@ -0,0 +1,19 @@ +[vpn] +AUTOSTART = YES +@UNIXONLY@ PORT = 0 +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-vpn +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-vpn.sock + +IPV6ADDR = 1234::1 +IPV6PREFIX = 32 +IPV4ADDR = 10.11.10.1 +IPV4MASK = 255.255.0.0 +VIRTDNS = 10.11.10.2 +VIRTDNS6 = 1234::17 +IFNAME = vpn-gnunet +