[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19123 - in gnunet: . src/arm src/ats src/chat src/core src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19123 - in gnunet: . src/arm src/ats src/chat src/core src/datastore src/dht src/dns src/dv src/exit src/fs src/mesh src/nse src/peerinfo src/statistics src/transport src/util src/vpn |
|
Date: |
Fri, 13 Jan 2012 18:04:35 +0100 |
Author: grothoff
Date: 2012-01-13 18:04:35 +0100 (Fri, 13 Jan 2012)
New Revision: 19123
Added:
gnunet/src/arm/arm.conf.in
gnunet/src/ats/ats.conf.in
gnunet/src/chat/chat.conf.in
gnunet/src/core/core.conf.in
gnunet/src/datastore/datastore.conf.in
gnunet/src/dht/dht.conf.in
gnunet/src/dns/dns.conf.in
gnunet/src/dv/dv.conf.in
gnunet/src/exit/exit.conf
gnunet/src/fs/fs.conf.in
gnunet/src/mesh/mesh.conf.in
gnunet/src/nse/nse.conf.in
gnunet/src/peerinfo/peerinfo.conf.in
gnunet/src/statistics/statistics.conf.in
gnunet/src/transport/transport.conf.in
gnunet/src/util/resolver.conf.in
gnunet/src/vpn/vpn.conf.in
Removed:
gnunet/src/arm/arm.conf
gnunet/src/ats/ats.conf
gnunet/src/chat/chat.conf
gnunet/src/core/core.conf
gnunet/src/datastore/datastore.conf
gnunet/src/dht/dht.conf
gnunet/src/dns/dns.conf
gnunet/src/dv/dv.conf
gnunet/src/exit/exit.conf
gnunet/src/fs/fs.conf
gnunet/src/mesh/mesh.conf
gnunet/src/nse/nse.conf
gnunet/src/peerinfo/peerinfo.conf
gnunet/src/statistics/statistics.conf
gnunet/src/transport/transport.conf
gnunet/src/util/resolver.conf
gnunet/src/vpn/vpn.conf
Modified:
gnunet/configure.ac
gnunet/src/arm/Makefile.am
gnunet/src/ats/Makefile.am
gnunet/src/chat/Makefile.am
gnunet/src/core/Makefile.am
gnunet/src/datastore/Makefile.am
gnunet/src/dht/Makefile.am
gnunet/src/dns/Makefile.am
gnunet/src/dv/Makefile.am
gnunet/src/fs/Makefile.am
gnunet/src/mesh/Makefile.am
gnunet/src/nse/Makefile.am
gnunet/src/peerinfo/Makefile.am
gnunet/src/statistics/Makefile.am
gnunet/src/transport/Makefile.am
gnunet/src/util/Makefile.am
gnunet/src/util/client.c
gnunet/src/vpn/Makefile.am
Log:
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
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/configure.ac 2012-01-13 17:04:35 UTC (rev 19123)
@@ -79,12 +79,14 @@
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 @@
build_target="freebsd"
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
openbsd*)
AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
@@ -102,12 +105,14 @@
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 @@
build_target="solaris"
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
*arm-linux*)
AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
@@ -124,6 +130,7 @@
build_target="linux"
LIBPREFIX=
DLLDIR=lib
+ UNIXONLY="#"
;;
*cygwin*)
AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
@@ -135,6 +142,7 @@
LIBPREFIX=lib
DLLDIR=bin
AC_PROG_CXX
+ UNIXONLY=""
;;
*mingw*)
AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
@@ -149,15 +157,21 @@
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 @@
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
Modified: gnunet/src/arm/Makefile.am
===================================================================
--- gnunet/src/arm/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/arm/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -2,7 +2,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
arm.conf
if MINGW
Deleted: gnunet/src/arm/arm.conf
===================================================================
--- gnunet/src/arm/arm.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/arm/arm.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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 =
Copied: gnunet/src/arm/arm.conf.in (from rev 19120, gnunet/src/arm/arm.conf)
===================================================================
--- gnunet/src/arm/arm.conf.in (rev 0)
+++ gnunet/src/arm/arm.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,23 @@
+
+[arm]
address@hidden@ 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 =
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/ats/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -2,7 +2,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
ats.conf
if MINGW
Deleted: gnunet/src/ats/ats.conf
===================================================================
--- gnunet/src/ats/ats.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/ats/ats.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
Copied: gnunet/src/ats/ats.conf.in (from rev 19120, gnunet/src/ats/ats.conf)
===================================================================
--- gnunet/src/ats/ats.conf.in (rev 0)
+++ gnunet/src/ats/ats.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,24 @@
+[ats]
+AUTOSTART = YES
address@hidden@ 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
Modified: gnunet/src/chat/Makefile.am
===================================================================
--- gnunet/src/chat/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/chat/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -2,7 +2,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
chat.conf
if MINGW
Deleted: gnunet/src/chat/chat.conf
===================================================================
--- gnunet/src/chat/chat.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/chat/chat.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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 =
-
Copied: gnunet/src/chat/chat.conf.in (from rev 19120, gnunet/src/chat/chat.conf)
===================================================================
--- gnunet/src/chat/chat.conf.in (rev 0)
+++ gnunet/src/chat/chat.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,22 @@
+[chat]
+AUTOSTART = YES
address@hidden@ 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 =
+
Modified: gnunet/src/core/Makefile.am
===================================================================
--- gnunet/src/core/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/core/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -2,7 +2,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
core.conf
if MINGW
Deleted: gnunet/src/core/core.conf
===================================================================
--- gnunet/src/core/core.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/core/core.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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 =
Copied: gnunet/src/core/core.conf.in (from rev 19120, gnunet/src/core/core.conf)
===================================================================
--- gnunet/src/core/core.conf.in (rev 0)
+++ gnunet/src/core/core.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,22 @@
+[core]
+AUTOSTART = YES
address@hidden@ 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 =
Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/datastore/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -4,7 +4,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
datastore.conf
if MINGW
Deleted: gnunet/src/datastore/datastore.conf
===================================================================
--- gnunet/src/datastore/datastore.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/datastore/datastore.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
-
-
-
Copied: gnunet/src/datastore/datastore.conf.in (from rev 19120,
gnunet/src/datastore/datastore.conf)
===================================================================
--- gnunet/src/datastore/datastore.conf.in (rev 0)
+++ gnunet/src/datastore/datastore.conf.in 2012-01-13 17:04:35 UTC (rev
19123)
@@ -0,0 +1,33 @@
+[datastore]
+AUTOSTART = YES
+UNIXPATH = /tmp/gnunet-service-datastore.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
address@hidden@ 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
+
+
+
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/dht/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -7,7 +7,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
dht.conf
if HAVE_ZLIB
Deleted: gnunet/src/dht/dht.conf
===================================================================
--- gnunet/src/dht/dht.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/dht/dht.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
-
Copied: gnunet/src/dht/dht.conf.in (from rev 19120, gnunet/src/dht/dht.conf)
===================================================================
--- gnunet/src/dht/dht.conf.in (rev 0)
+++ gnunet/src/dht/dht.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,38 @@
+[dht]
+AUTOSTART = YES
address@hidden@ 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
+
Modified: gnunet/src/dns/Makefile.am
===================================================================
--- gnunet/src/dns/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/dns/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -12,7 +12,7 @@
plugindir = $(libdir)/gnunet
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
dns.conf
if LINUX
Deleted: gnunet/src/dns/dns.conf
===================================================================
--- gnunet/src/dns/dns.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/dns/dns.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
-
Copied: gnunet/src/dns/dns.conf.in (from rev 19120, gnunet/src/dns/dns.conf)
===================================================================
--- gnunet/src/dns/dns.conf.in (rev 0)
+++ gnunet/src/dns/dns.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,22 @@
+[dns]
+AUTOSTART = YES
address@hidden@ 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
+
Modified: gnunet/src/dv/Makefile.am
===================================================================
--- gnunet/src/dv/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/dv/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -13,7 +13,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
dv.conf
lib_LTLIBRARIES = libgnunetdv.la
Deleted: gnunet/src/dv/dv.conf
===================================================================
--- gnunet/src/dv/dv.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/dv/dv.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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 =
Copied: gnunet/src/dv/dv.conf.in (from rev 19120, gnunet/src/dv/dv.conf)
===================================================================
--- gnunet/src/dv/dv.conf.in (rev 0)
+++ gnunet/src/dv/dv.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
address@hidden@ PORT = 2571
+UNIXPATH = /tmp/gnunet-service-dv.sock
+# ACCEPT_FROM =
+# ACCEPT_FROM6 =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# BINDTO =
Deleted: gnunet/src/exit/exit.conf
===================================================================
--- gnunet/src/exit/exit.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/exit/exit.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -1,12 +0,0 @@
-[exit]
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-# MAX_CONNECTIONS = 256
Copied: gnunet/src/exit/exit.conf (from rev 19120, gnunet/src/exit/exit.conf)
===================================================================
--- gnunet/src/exit/exit.conf (rev 0)
+++ gnunet/src/exit/exit.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,12 @@
+[exit]
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-exit
+IPV6ADDR = 1234:1::1
+IPV6PREFIX = 32
+IPV4ADDR = 10.10.1.1
+IPV4MASK = 255.255.0.0
+IFNAME = exit-gnunet
+ENABLE_UDP = NO
+ENABLE_TCP = NO
+
+# MAX_CONNECTIONS = 256
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/fs/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -11,7 +11,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
fs.conf
plugindir = $(libdir)/gnunet
Deleted: gnunet/src/fs/fs.conf
===================================================================
--- gnunet/src/fs/fs.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/fs/fs.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
-
-
Copied: gnunet/src/fs/fs.conf.in (from rev 19120, gnunet/src/fs/fs.conf)
===================================================================
--- gnunet/src/fs/fs.conf.in (rev 0)
+++ gnunet/src/fs/fs.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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/
address@hidden@ 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
+
+
Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/mesh/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -11,7 +11,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
mesh.conf
AM_CLFAGS = -g
Deleted: gnunet/src/mesh/mesh.conf
===================================================================
--- gnunet/src/mesh/mesh.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/mesh/mesh.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
-
Copied: gnunet/src/mesh/mesh.conf.in (from rev 19120, gnunet/src/mesh/mesh.conf)
===================================================================
--- gnunet/src/mesh/mesh.conf.in (rev 0)
+++ gnunet/src/mesh/mesh.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,13 @@
+[mesh]
+AUTOSTART = YES
address@hidden@ 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
+
Modified: gnunet/src/nse/Makefile.am
===================================================================
--- gnunet/src/nse/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/nse/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -11,7 +11,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
nse.conf
Deleted: gnunet/src/nse/nse.conf
===================================================================
--- gnunet/src/nse/nse.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/nse/nse.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
-
Copied: gnunet/src/nse/nse.conf.in (from rev 19120, gnunet/src/nse/nse.conf)
===================================================================
--- gnunet/src/nse/nse.conf.in (rev 0)
+++ gnunet/src/nse/nse.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,25 @@
+[nse]
+AUTOSTART = YES
address@hidden@ 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
+
Modified: gnunet/src/peerinfo/Makefile.am
===================================================================
--- gnunet/src/peerinfo/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/peerinfo/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -2,7 +2,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
peerinfo.conf
if MINGW
Deleted: gnunet/src/peerinfo/peerinfo.conf
===================================================================
--- gnunet/src/peerinfo/peerinfo.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/peerinfo/peerinfo.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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/
-
-
Copied: gnunet/src/peerinfo/peerinfo.conf.in (from rev 19120,
gnunet/src/peerinfo/peerinfo.conf)
===================================================================
--- gnunet/src/peerinfo/peerinfo.conf.in (rev 0)
+++ gnunet/src/peerinfo/peerinfo.conf.in 2012-01-13 17:04:35 UTC (rev
19123)
@@ -0,0 +1,24 @@
+[peerinfo]
+AUTOSTART = YES
address@hidden@ 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/
+
+
Modified: gnunet/src/statistics/Makefile.am
===================================================================
--- gnunet/src/statistics/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/statistics/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -11,7 +11,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
statistics.conf
lib_LTLIBRARIES = libgnunetstatistics.la
Deleted: gnunet/src/statistics/statistics.conf
===================================================================
--- gnunet/src/statistics/statistics.conf 2012-01-13 16:49:39 UTC (rev
19122)
+++ gnunet/src/statistics/statistics.conf 2012-01-13 17:04:35 UTC (rev
19123)
@@ -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 =
-
Copied: gnunet/src/statistics/statistics.conf.in (from rev 19120,
gnunet/src/statistics/statistics.conf)
===================================================================
--- gnunet/src/statistics/statistics.conf.in (rev 0)
+++ gnunet/src/statistics/statistics.conf.in 2012-01-13 17:04:35 UTC (rev
19123)
@@ -0,0 +1,22 @@
+[statistics]
+AUTOSTART = YES
address@hidden@ 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 =
+
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/transport/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -4,7 +4,7 @@
pkgcfgdir= $(pkgdatadir)/config.d/
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
transport.conf
Deleted: gnunet/src/transport/transport.conf
===================================================================
--- gnunet/src/transport/transport.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/transport/transport.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
-
Copied: gnunet/src/transport/transport.conf.in (from rev 19120,
gnunet/src/transport/transport.conf)
===================================================================
--- gnunet/src/transport/transport.conf.in (rev 0)
+++ gnunet/src/transport/transport.conf.in 2012-01-13 17:04:35 UTC (rev
19123)
@@ -0,0 +1,66 @@
+[transport]
+AUTOSTART = YES
address@hidden@ 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
+
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/util/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -5,8 +5,11 @@
pkgcfgdir= $(pkgdatadir)/config.d/
dist_pkgcfg_DATA = \
- util.conf resolver.conf
+ util.conf
+pkgcfg_DATA = \
+ resolver.conf
+
if MINGW
noinst_LTLIBRARIES = \
libgnunetutilwin.la
Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/util/client.c 2012-01-13 17:04:35 UTC (rev 19123)
@@ -289,25 +289,35 @@
}
#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 @@
if (sock != NULL)
{
GNUNET_free (unixpath);
- GNUNET_free (hostname);
+ GNUNET_free_non_null (hostname);
return sock;
}
}
@@ -338,7 +348,7 @@
"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;
}
Deleted: gnunet/src/util/resolver.conf
===================================================================
--- gnunet/src/util/resolver.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/util/resolver.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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 =
-
Copied: gnunet/src/util/resolver.conf.in (from rev 19120,
gnunet/src/util/resolver.conf)
===================================================================
--- gnunet/src/util/resolver.conf.in (rev 0)
+++ gnunet/src/util/resolver.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,22 @@
+[resolver]
+AUTOSTART = YES
address@hidden@ 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 =
+
Modified: gnunet/src/vpn/Makefile.am
===================================================================
--- gnunet/src/vpn/Makefile.am 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/vpn/Makefile.am 2012-01-13 17:04:35 UTC (rev 19123)
@@ -12,7 +12,7 @@
plugindir = $(libdir)/gnunet
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
vpn.conf
if LINUX
Deleted: gnunet/src/vpn/vpn.conf
===================================================================
--- gnunet/src/vpn/vpn.conf 2012-01-13 16:49:39 UTC (rev 19122)
+++ gnunet/src/vpn/vpn.conf 2012-01-13 17:04:35 UTC (rev 19123)
@@ -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
-
Copied: gnunet/src/vpn/vpn.conf.in (from rev 19120, gnunet/src/vpn/vpn.conf)
===================================================================
--- gnunet/src/vpn/vpn.conf.in (rev 0)
+++ gnunet/src/vpn/vpn.conf.in 2012-01-13 17:04:35 UTC (rev 19123)
@@ -0,0 +1,19 @@
+[vpn]
+AUTOSTART = YES
address@hidden@ 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
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19123 - in gnunet: . src/arm src/ats src/chat src/core src/datastore src/dht src/dns src/dv src/exit src/fs src/mesh src/nse src/peerinfo src/statistics src/transport src/util src/vpn,
gnunet <=