diff options
-rw-r--r-- | configure.ac | 32 | ||||
-rw-r--r-- | src/arm/Makefile.am | 2 | ||||
-rw-r--r-- | src/arm/arm.conf.in (renamed from src/arm/arm.conf) | 2 | ||||
-rw-r--r-- | src/ats/Makefile.am | 2 | ||||
-rw-r--r-- | src/ats/ats.conf.in (renamed from src/ats/ats.conf) | 2 | ||||
-rw-r--r-- | src/chat/Makefile.am | 2 | ||||
-rw-r--r-- | src/chat/chat.conf.in (renamed from src/chat/chat.conf) | 2 | ||||
-rw-r--r-- | src/core/Makefile.am | 2 | ||||
-rw-r--r-- | src/core/core.conf.in (renamed from src/core/core.conf) | 2 | ||||
-rw-r--r-- | src/datastore/Makefile.am | 2 | ||||
-rw-r--r-- | src/datastore/datastore.conf.in (renamed from src/datastore/datastore.conf) | 2 | ||||
-rw-r--r-- | src/dht/Makefile.am | 2 | ||||
-rw-r--r-- | src/dht/dht.conf.in (renamed from src/dht/dht.conf) | 2 | ||||
-rw-r--r-- | src/dns/Makefile.am | 2 | ||||
-rw-r--r-- | src/dns/dns.conf.in (renamed from src/dns/dns.conf) | 2 | ||||
-rw-r--r-- | src/dv/Makefile.am | 2 | ||||
-rw-r--r-- | src/dv/dv.conf.in (renamed from src/dv/dv.conf) | 3 | ||||
-rw-r--r-- | src/fs/Makefile.am | 2 | ||||
-rw-r--r-- | src/fs/fs.conf.in (renamed from src/fs/fs.conf) | 2 | ||||
-rw-r--r-- | src/mesh/Makefile.am | 2 | ||||
-rw-r--r-- | src/mesh/mesh.conf.in (renamed from src/mesh/mesh.conf) | 2 | ||||
-rw-r--r-- | src/nse/Makefile.am | 2 | ||||
-rw-r--r-- | src/nse/nse.conf.in (renamed from src/nse/nse.conf) | 4 | ||||
-rw-r--r-- | src/peerinfo/Makefile.am | 2 | ||||
-rw-r--r-- | src/peerinfo/peerinfo.conf.in (renamed from src/peerinfo/peerinfo.conf) | 2 | ||||
-rw-r--r-- | src/statistics/Makefile.am | 2 | ||||
-rw-r--r-- | src/statistics/statistics.conf.in (renamed from src/statistics/statistics.conf) | 2 | ||||
-rw-r--r-- | src/transport/Makefile.am | 2 | ||||
-rw-r--r-- | src/transport/transport.conf.in (renamed from src/transport/transport.conf) | 2 | ||||
-rw-r--r-- | src/util/Makefile.am | 5 | ||||
-rw-r--r-- | src/util/client.c | 46 | ||||
-rw-r--r-- | src/util/resolver.conf.in (renamed from src/util/resolver.conf) | 2 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 2 | ||||
-rw-r--r-- | src/vpn/vpn.conf.in (renamed from src/vpn/vpn.conf) | 2 |
34 files changed, 96 insertions, 52 deletions
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 | |||
79 | DEFAULT_INTERFACE="\"en0\"" | 79 | DEFAULT_INTERFACE="\"en0\"" |
80 | LIBPREFIX= | 80 | LIBPREFIX= |
81 | DLLDIR=lib | 81 | DLLDIR=lib |
82 | UNIXONLY="#" | ||
82 | ;; | 83 | ;; |
83 | linux*) | 84 | linux*) |
84 | AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system]) | 85 | AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system]) |
85 | build_target="linux" | 86 | build_target="linux" |
86 | LIBPREFIX= | 87 | LIBPREFIX= |
87 | DLLDIR=lib | 88 | DLLDIR=lib |
89 | UNIXONLY="#" | ||
88 | AC_PATH_XTRA | 90 | AC_PATH_XTRA |
89 | ;; | 91 | ;; |
90 | freebsd*) | 92 | freebsd*) |
@@ -94,6 +96,7 @@ freebsd*) | |||
94 | build_target="freebsd" | 96 | build_target="freebsd" |
95 | LIBPREFIX= | 97 | LIBPREFIX= |
96 | DLLDIR=lib | 98 | DLLDIR=lib |
99 | UNIXONLY="#" | ||
97 | ;; | 100 | ;; |
98 | openbsd*) | 101 | openbsd*) |
99 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) | 102 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) |
@@ -102,12 +105,14 @@ openbsd*) | |||
102 | build_target="openbsd" | 105 | build_target="openbsd" |
103 | LIBPREFIX= | 106 | LIBPREFIX= |
104 | DLLDIR=lib | 107 | DLLDIR=lib |
108 | UNIXONLY="#" | ||
105 | ;; | 109 | ;; |
106 | netbsd*) | 110 | netbsd*) |
107 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) | 111 | AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system]) |
108 | AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) | 112 | AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system]) |
109 | LIBPREFIX= | 113 | LIBPREFIX= |
110 | DLLDIR=lib | 114 | DLLDIR=lib |
115 | UNIXONLY="#" | ||
111 | ;; | 116 | ;; |
112 | *solaris*) | 117 | *solaris*) |
113 | AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system]) | 118 | AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system]) |
@@ -117,6 +122,7 @@ netbsd*) | |||
117 | build_target="solaris" | 122 | build_target="solaris" |
118 | LIBPREFIX= | 123 | LIBPREFIX= |
119 | DLLDIR=lib | 124 | DLLDIR=lib |
125 | UNIXONLY="#" | ||
120 | ;; | 126 | ;; |
121 | *arm-linux*) | 127 | *arm-linux*) |
122 | AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system]) | 128 | AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system]) |
@@ -124,6 +130,7 @@ netbsd*) | |||
124 | build_target="linux" | 130 | build_target="linux" |
125 | LIBPREFIX= | 131 | LIBPREFIX= |
126 | DLLDIR=lib | 132 | DLLDIR=lib |
133 | UNIXONLY="#" | ||
127 | ;; | 134 | ;; |
128 | *cygwin*) | 135 | *cygwin*) |
129 | AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) | 136 | AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) |
@@ -135,6 +142,7 @@ netbsd*) | |||
135 | LIBPREFIX=lib | 142 | LIBPREFIX=lib |
136 | DLLDIR=bin | 143 | DLLDIR=bin |
137 | AC_PROG_CXX | 144 | AC_PROG_CXX |
145 | UNIXONLY="" | ||
138 | ;; | 146 | ;; |
139 | *mingw*) | 147 | *mingw*) |
140 | AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) | 148 | AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) |
@@ -149,15 +157,21 @@ netbsd*) | |||
149 | AC_PROG_CXX | 157 | AC_PROG_CXX |
150 | LIBPREFIX=lib | 158 | LIBPREFIX=lib |
151 | DLLDIR=bin | 159 | DLLDIR=bin |
160 | UNIXONLY="" | ||
152 | ;; | 161 | ;; |
153 | *) | 162 | *) |
154 | AC_MSG_RESULT(Unrecognised OS $host_os) | 163 | AC_MSG_RESULT(Unrecognised OS $host_os) |
155 | AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS]) | 164 | AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS]) |
165 | UNIXONLY="" | ||
156 | ;; | 166 | ;; |
157 | esac | 167 | esac |
158 | AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should be the default choice for the name of the first network interface]) | 168 | AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should be the default choice for the name of the first network interface]) |
159 | AC_SUBST(DEFAULT_INTERFACE) | 169 | AC_SUBST(DEFAULT_INTERFACE) |
160 | 170 | ||
171 | # Disable TCP-based IPC on systems that support UNIX domain | ||
172 | # sockets in default configuratin: | ||
173 | AC_SUBST(UNIXONLY) | ||
174 | |||
161 | AC_MSG_CHECKING([for build target]) | 175 | AC_MSG_CHECKING([for build target]) |
162 | AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin") | 176 | AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin") |
163 | AM_CONDITIONAL(CYGWIN, test "$build_target" = "cygwin") | 177 | AM_CONDITIONAL(CYGWIN, test "$build_target" = "cygwin") |
@@ -814,34 +828,50 @@ m4/Makefile | |||
814 | po/Makefile.in | 828 | po/Makefile.in |
815 | src/Makefile | 829 | src/Makefile |
816 | src/arm/Makefile | 830 | src/arm/Makefile |
831 | src/arm/arm.conf | ||
817 | src/ats/Makefile | 832 | src/ats/Makefile |
833 | src/ats/ats.conf | ||
818 | src/block/Makefile | 834 | src/block/Makefile |
835 | src/chat/Makefile | ||
836 | src/chat/chat.conf | ||
819 | src/core/Makefile | 837 | src/core/Makefile |
838 | src/core/core.conf | ||
820 | src/datacache/Makefile | 839 | src/datacache/Makefile |
821 | src/datastore/Makefile | 840 | src/datastore/Makefile |
841 | src/datastore/datastore.conf | ||
822 | src/dht/Makefile | 842 | src/dht/Makefile |
843 | src/dht/dht.conf | ||
823 | src/dns/Makefile | 844 | src/dns/Makefile |
845 | src/dns/dns.conf | ||
824 | src/dv/Makefile | 846 | src/dv/Makefile |
847 | src/dv/dv.conf | ||
825 | src/exit/Makefile | 848 | src/exit/Makefile |
826 | src/fragmentation/Makefile | 849 | src/fragmentation/Makefile |
827 | src/fs/Makefile | 850 | src/fs/Makefile |
851 | src/fs/fs.conf | ||
828 | src/hello/Makefile | 852 | src/hello/Makefile |
829 | src/include/Makefile | 853 | src/include/Makefile |
830 | src/include/gnunet_directories.h | 854 | src/include/gnunet_directories.h |
831 | src/hostlist/Makefile | 855 | src/hostlist/Makefile |
832 | src/mesh/Makefile | 856 | src/mesh/Makefile |
857 | src/mesh/mesh.conf | ||
833 | src/nat/Makefile | 858 | src/nat/Makefile |
834 | src/nse/Makefile | 859 | src/nse/Makefile |
860 | src/nse/nse.conf | ||
835 | src/peerinfo/Makefile | 861 | src/peerinfo/Makefile |
862 | src/peerinfo/peerinfo.conf | ||
836 | src/peerinfo-tool/Makefile | 863 | src/peerinfo-tool/Makefile |
837 | src/statistics/Makefile | 864 | src/statistics/Makefile |
865 | src/statistics/statistics.conf | ||
838 | src/template/Makefile | 866 | src/template/Makefile |
839 | src/testing/Makefile | 867 | src/testing/Makefile |
840 | src/topology/Makefile | 868 | src/topology/Makefile |
841 | src/transport/Makefile | 869 | src/transport/Makefile |
870 | src/transport/transport.conf | ||
842 | src/util/Makefile | 871 | src/util/Makefile |
872 | src/util/resolver.conf | ||
843 | src/vpn/Makefile | 873 | src/vpn/Makefile |
844 | src/chat/Makefile | 874 | src/vpn/vpn.conf |
845 | src/integration-tests/Makefile | 875 | src/integration-tests/Makefile |
846 | pkgconfig/Makefile | 876 | pkgconfig/Makefile |
847 | pkgconfig/gnunetarm.pc | 877 | 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 | |||
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | 3 | pkgcfgdir= $(pkgdatadir)/config.d/ |
4 | 4 | ||
5 | dist_pkgcfg_DATA = \ | 5 | pkgcfg_DATA = \ |
6 | arm.conf | 6 | arm.conf |
7 | 7 | ||
8 | if MINGW | 8 | if MINGW |
diff --git a/src/arm/arm.conf b/src/arm/arm.conf.in index fa82ea957..c1f408fd2 100644 --- a/src/arm/arm.conf +++ b/src/arm/arm.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | [arm] | 2 | [arm] |
3 | PORT = 2087 | 3 | @UNIXONLY@ PORT = 2087 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | 3 | pkgcfgdir= $(pkgdatadir)/config.d/ |
4 | 4 | ||
5 | dist_pkgcfg_DATA = \ | 5 | pkgcfg_DATA = \ |
6 | ats.conf | 6 | ats.conf |
7 | 7 | ||
8 | if MINGW | 8 | if MINGW |
diff --git a/src/ats/ats.conf b/src/ats/ats.conf.in index 3b9e1a58e..6ea0d417f 100644 --- a/src/ats/ats.conf +++ b/src/ats/ats.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [ats] | 1 | [ats] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2098 | 3 | @UNIXONLY@ PORT = 2098 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | 3 | pkgcfgdir= $(pkgdatadir)/config.d/ |
4 | 4 | ||
5 | dist_pkgcfg_DATA = \ | 5 | pkgcfg_DATA = \ |
6 | chat.conf | 6 | chat.conf |
7 | 7 | ||
8 | if MINGW | 8 | if MINGW |
diff --git a/src/chat/chat.conf b/src/chat/chat.conf.in index 61d551e16..41fe9b4f7 100644 --- a/src/chat/chat.conf +++ b/src/chat/chat.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [chat] | 1 | [chat] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2090 | 3 | @UNIXONLY@ PORT = 2090 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | 3 | pkgcfgdir= $(pkgdatadir)/config.d/ |
4 | 4 | ||
5 | dist_pkgcfg_DATA = \ | 5 | pkgcfg_DATA = \ |
6 | core.conf | 6 | core.conf |
7 | 7 | ||
8 | if MINGW | 8 | if MINGW |
diff --git a/src/core/core.conf b/src/core/core.conf.in index 3dc08312e..84e2df9fb 100644 --- a/src/core/core.conf +++ b/src/core/core.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [core] | 1 | [core] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2092 | 3 | @UNIXONLY@ PORT = 2092 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
4 | 4 | ||
5 | pkgcfgdir= $(pkgdatadir)/config.d/ | 5 | pkgcfgdir= $(pkgdatadir)/config.d/ |
6 | 6 | ||
7 | dist_pkgcfg_DATA = \ | 7 | pkgcfg_DATA = \ |
8 | datastore.conf | 8 | datastore.conf |
9 | 9 | ||
10 | if MINGW | 10 | if MINGW |
diff --git a/src/datastore/datastore.conf b/src/datastore/datastore.conf.in index 68de15626..837c619c2 100644 --- a/src/datastore/datastore.conf +++ b/src/datastore/datastore.conf.in | |||
@@ -3,7 +3,7 @@ AUTOSTART = YES | |||
3 | UNIXPATH = /tmp/gnunet-service-datastore.sock | 3 | UNIXPATH = /tmp/gnunet-service-datastore.sock |
4 | UNIX_MATCH_UID = YES | 4 | UNIX_MATCH_UID = YES |
5 | UNIX_MATCH_GID = YES | 5 | UNIX_MATCH_GID = YES |
6 | PORT = 2093 | 6 | @UNIXONLY@ PORT = 2093 |
7 | HOSTNAME = localhost | 7 | HOSTNAME = localhost |
8 | HOME = $SERVICEHOME | 8 | HOME = $SERVICEHOME |
9 | CONFIG = $DEFAULTCONFIG | 9 | CONFIG = $DEFAULTCONFIG |
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 | |||
7 | 7 | ||
8 | pkgcfgdir= $(pkgdatadir)/config.d/ | 8 | pkgcfgdir= $(pkgdatadir)/config.d/ |
9 | 9 | ||
10 | dist_pkgcfg_DATA = \ | 10 | pkgcfg_DATA = \ |
11 | dht.conf | 11 | dht.conf |
12 | 12 | ||
13 | if HAVE_ZLIB | 13 | if HAVE_ZLIB |
diff --git a/src/dht/dht.conf b/src/dht/dht.conf.in index ba903a2d0..c73c05688 100644 --- a/src/dht/dht.conf +++ b/src/dht/dht.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [dht] | 1 | [dht] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2095 | 3 | @UNIXONLY@ PORT = 2095 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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/ | |||
12 | 12 | ||
13 | plugindir = $(libdir)/gnunet | 13 | plugindir = $(libdir)/gnunet |
14 | 14 | ||
15 | dist_pkgcfg_DATA = \ | 15 | pkgcfg_DATA = \ |
16 | dns.conf | 16 | dns.conf |
17 | 17 | ||
18 | if LINUX | 18 | if LINUX |
diff --git a/src/dns/dns.conf b/src/dns/dns.conf.in index f8590bf61..cd1c2e6e3 100644 --- a/src/dns/dns.conf +++ b/src/dns/dns.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [dns] | 1 | [dns] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 0 | 3 | @UNIXONLY@ PORT = 0 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
13 | 13 | ||
14 | pkgcfgdir= $(pkgdatadir)/config.d/ | 14 | pkgcfgdir= $(pkgdatadir)/config.d/ |
15 | 15 | ||
16 | dist_pkgcfg_DATA = \ | 16 | pkgcfg_DATA = \ |
17 | dv.conf | 17 | dv.conf |
18 | 18 | ||
19 | lib_LTLIBRARIES = libgnunetdv.la | 19 | lib_LTLIBRARIES = libgnunetdv.la |
diff --git a/src/dv/dv.conf b/src/dv/dv.conf.in index 8fbf23659..fa647e31c 100644 --- a/src/dv/dv.conf +++ b/src/dv/dv.conf.in | |||
@@ -7,7 +7,8 @@ BINARY = gnunet-service-dv | |||
7 | CONFIG = $DEFAULTCONFIG | 7 | CONFIG = $DEFAULTCONFIG |
8 | HOME = $SERVICEHOME | 8 | HOME = $SERVICEHOME |
9 | HOSTNAME = localhost | 9 | HOSTNAME = localhost |
10 | PORT = 2571 | 10 | @UNIXONLY@ PORT = 2571 |
11 | UNIXPATH = /tmp/gnunet-service-dv.sock | ||
11 | # ACCEPT_FROM = | 12 | # ACCEPT_FROM = |
12 | # ACCEPT_FROM6 = | 13 | # ACCEPT_FROM6 = |
13 | # REJECT_FROM = | 14 | # REJECT_FROM = |
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 | |||
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | 12 | pkgcfgdir= $(pkgdatadir)/config.d/ |
13 | 13 | ||
14 | dist_pkgcfg_DATA = \ | 14 | pkgcfg_DATA = \ |
15 | fs.conf | 15 | fs.conf |
16 | 16 | ||
17 | plugindir = $(libdir)/gnunet | 17 | plugindir = $(libdir)/gnunet |
diff --git a/src/fs/fs.conf b/src/fs/fs.conf.in index 2f65859b4..48c8b5209 100644 --- a/src/fs/fs.conf +++ b/src/fs/fs.conf.in | |||
@@ -5,7 +5,7 @@ TRUST = $SERVICEHOME/data/credit/ | |||
5 | IDENTITY_DIR = $SERVICEHOME/identities/ | 5 | IDENTITY_DIR = $SERVICEHOME/identities/ |
6 | STATE_DIR = $SERVICEHOME/persistence/ | 6 | STATE_DIR = $SERVICEHOME/persistence/ |
7 | UPDATE_DIR = $SERVICEHOME/updates/ | 7 | UPDATE_DIR = $SERVICEHOME/updates/ |
8 | PORT = 2094 | 8 | @UNIXONLY@ PORT = 2094 |
9 | HOSTNAME = localhost | 9 | HOSTNAME = localhost |
10 | HOME = $SERVICEHOME | 10 | HOME = $SERVICEHOME |
11 | CONFIG = $DEFAULTCONFIG | 11 | CONFIG = $DEFAULTCONFIG |
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 | |||
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | 12 | pkgcfgdir= $(pkgdatadir)/config.d/ |
13 | 13 | ||
14 | dist_pkgcfg_DATA = \ | 14 | pkgcfg_DATA = \ |
15 | mesh.conf | 15 | mesh.conf |
16 | 16 | ||
17 | AM_CLFAGS = -g | 17 | AM_CLFAGS = -g |
diff --git a/src/mesh/mesh.conf b/src/mesh/mesh.conf.in index 922275368..83a8938b2 100644 --- a/src/mesh/mesh.conf +++ b/src/mesh/mesh.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [mesh] | 1 | [mesh] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2096 | 3 | @UNIXONLY@ PORT = 2096 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | 12 | pkgcfgdir= $(pkgdatadir)/config.d/ |
13 | 13 | ||
14 | dist_pkgcfg_DATA = \ | 14 | pkgcfg_DATA = \ |
15 | nse.conf | 15 | nse.conf |
16 | 16 | ||
17 | 17 | ||
diff --git a/src/nse/nse.conf b/src/nse/nse.conf.in index 8cc912d4d..b04f5acfe 100644 --- a/src/nse/nse.conf +++ b/src/nse/nse.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [nse] | 1 | [nse] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2097 | 3 | @UNIXONLY@ PORT = 2097 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
@@ -8,7 +8,7 @@ BINARY = gnunet-service-nse | |||
8 | ACCEPT_FROM = 127.0.0.1; | 8 | ACCEPT_FROM = 127.0.0.1; |
9 | ACCEPT_FROM6 = ::1; | 9 | ACCEPT_FROM6 = ::1; |
10 | UNIXPATH = /tmp/test-nse-service-nse.unix | 10 | UNIXPATH = /tmp/test-nse-service-nse.unix |
11 | UNIX_MATCH_UID = YES | 11 | UNIX_MATCH_UID = NO |
12 | UNIX_MATCH_GID = YES | 12 | UNIX_MATCH_GID = YES |
13 | PROOFFILE = $SERVICEHOME/.nse-proof | 13 | PROOFFILE = $SERVICEHOME/.nse-proof |
14 | HISTOGRAM = $SERVICEHOME/nse-history.log | 14 | HISTOGRAM = $SERVICEHOME/nse-history.log |
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 | |||
2 | 2 | ||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | 3 | pkgcfgdir= $(pkgdatadir)/config.d/ |
4 | 4 | ||
5 | dist_pkgcfg_DATA = \ | 5 | pkgcfg_DATA = \ |
6 | peerinfo.conf | 6 | peerinfo.conf |
7 | 7 | ||
8 | if MINGW | 8 | if MINGW |
diff --git a/src/peerinfo/peerinfo.conf b/src/peerinfo/peerinfo.conf.in index 1b300ca4b..a40cc4fba 100644 --- a/src/peerinfo/peerinfo.conf +++ b/src/peerinfo/peerinfo.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [peerinfo] | 1 | [peerinfo] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2090 | 3 | @UNIXONLY@ PORT = 2090 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
11 | 11 | ||
12 | pkgcfgdir= $(pkgdatadir)/config.d/ | 12 | pkgcfgdir= $(pkgdatadir)/config.d/ |
13 | 13 | ||
14 | dist_pkgcfg_DATA = \ | 14 | pkgcfg_DATA = \ |
15 | statistics.conf | 15 | statistics.conf |
16 | 16 | ||
17 | lib_LTLIBRARIES = libgnunetstatistics.la | 17 | lib_LTLIBRARIES = libgnunetstatistics.la |
diff --git a/src/statistics/statistics.conf b/src/statistics/statistics.conf.in index e54c51963..4482b0f11 100644 --- a/src/statistics/statistics.conf +++ b/src/statistics/statistics.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [statistics] | 1 | [statistics] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2088 | 3 | @UNIXONLY@ PORT = 2088 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
4 | 4 | ||
5 | pkgcfgdir= $(pkgdatadir)/config.d/ | 5 | pkgcfgdir= $(pkgdatadir)/config.d/ |
6 | 6 | ||
7 | dist_pkgcfg_DATA = \ | 7 | pkgcfg_DATA = \ |
8 | transport.conf | 8 | transport.conf |
9 | 9 | ||
10 | 10 | ||
diff --git a/src/transport/transport.conf b/src/transport/transport.conf.in index 5f742bcda..213e8f5f0 100644 --- a/src/transport/transport.conf +++ b/src/transport/transport.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [transport] | 1 | [transport] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2091 | 3 | @UNIXONLY@ PORT = 2091 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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 | |||
5 | pkgcfgdir= $(pkgdatadir)/config.d/ | 5 | pkgcfgdir= $(pkgdatadir)/config.d/ |
6 | 6 | ||
7 | dist_pkgcfg_DATA = \ | 7 | dist_pkgcfg_DATA = \ |
8 | util.conf resolver.conf | 8 | util.conf |
9 | |||
10 | pkgcfg_DATA = \ | ||
11 | resolver.conf | ||
9 | 12 | ||
10 | if MINGW | 13 | if MINGW |
11 | noinst_LTLIBRARIES = \ | 14 | 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, | |||
289 | } | 289 | } |
290 | #endif | 290 | #endif |
291 | 291 | ||
292 | if ((GNUNET_OK != | 292 | if (GNUNET_YES == |
293 | GNUNET_CONFIGURATION_get_value_number (cfg, service_name, "PORT", &port)) | 293 | GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT")) |
294 | || (port > 65535) || | ||
295 | (GNUNET_OK != | ||
296 | GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "HOSTNAME", | ||
297 | &hostname))) | ||
298 | { | 294 | { |
299 | LOG (GNUNET_ERROR_TYPE_WARNING, | 295 | if ((GNUNET_OK != |
300 | _ | 296 | GNUNET_CONFIGURATION_get_value_number (cfg, service_name, "PORT", &port)) |
301 | ("Could not determine valid hostname and port for service `%s' from configuration.\n"), | 297 | || (port > 65535) || |
302 | service_name); | 298 | (GNUNET_OK != |
303 | return NULL; | 299 | GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "HOSTNAME", |
300 | &hostname))) | ||
301 | { | ||
302 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
303 | _ | ||
304 | ("Could not determine valid hostname and port for service `%s' from configuration.\n"), | ||
305 | service_name); | ||
306 | return NULL; | ||
307 | } | ||
308 | if (0 == strlen (hostname)) | ||
309 | { | ||
310 | GNUNET_free (hostname); | ||
311 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
312 | _("Need a non-empty hostname for service `%s'.\n"), service_name); | ||
313 | return NULL; | ||
314 | } | ||
304 | } | 315 | } |
305 | if (0 == strlen (hostname)) | 316 | else |
306 | { | 317 | { |
307 | GNUNET_free (hostname); | 318 | /* unspecified means 0 (disabled) */ |
308 | LOG (GNUNET_ERROR_TYPE_WARNING, | 319 | port = 0; |
309 | _("Need a non-empty hostname for service `%s'.\n"), service_name); | 320 | hostname = NULL; |
310 | return NULL; | ||
311 | } | 321 | } |
312 | if (port == 0) | 322 | if (port == 0) |
313 | { | 323 | { |
@@ -326,7 +336,7 @@ do_connect (const char *service_name, | |||
326 | if (sock != NULL) | 336 | if (sock != NULL) |
327 | { | 337 | { |
328 | GNUNET_free (unixpath); | 338 | GNUNET_free (unixpath); |
329 | GNUNET_free (hostname); | 339 | GNUNET_free_non_null (hostname); |
330 | return sock; | 340 | return sock; |
331 | } | 341 | } |
332 | } | 342 | } |
@@ -338,7 +348,7 @@ do_connect (const char *service_name, | |||
338 | "Port is 0 for service `%s', UNIXPATH did not work, returning NULL!\n", | 348 | "Port is 0 for service `%s', UNIXPATH did not work, returning NULL!\n", |
339 | service_name); | 349 | service_name); |
340 | #endif | 350 | #endif |
341 | GNUNET_free (hostname); | 351 | GNUNET_free_non_null (hostname); |
342 | return NULL; | 352 | return NULL; |
343 | } | 353 | } |
344 | 354 | ||
diff --git a/src/util/resolver.conf b/src/util/resolver.conf.in index a2690fcc3..671ea0ed6 100644 --- a/src/util/resolver.conf +++ b/src/util/resolver.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [resolver] | 1 | [resolver] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 2089 | 3 | @UNIXONLY@ PORT = 2089 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |
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/ | |||
12 | 12 | ||
13 | plugindir = $(libdir)/gnunet | 13 | plugindir = $(libdir)/gnunet |
14 | 14 | ||
15 | dist_pkgcfg_DATA = \ | 15 | pkgcfg_DATA = \ |
16 | vpn.conf | 16 | vpn.conf |
17 | 17 | ||
18 | if LINUX | 18 | if LINUX |
diff --git a/src/vpn/vpn.conf b/src/vpn/vpn.conf.in index 0d8e1e1a5..411ad3fb9 100644 --- a/src/vpn/vpn.conf +++ b/src/vpn/vpn.conf.in | |||
@@ -1,6 +1,6 @@ | |||
1 | [vpn] | 1 | [vpn] |
2 | AUTOSTART = YES | 2 | AUTOSTART = YES |
3 | PORT = 0 | 3 | @UNIXONLY@ PORT = 0 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | 6 | CONFIG = $DEFAULTCONFIG |