summaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-06-05 16:16:46 +0000
committerChristian Grothoff <christian@grothoff.org>2010-06-05 16:16:46 +0000
commit69a23725d6937db68fc8ca2fd1e8490220edc7de (patch)
treeb4a4060dfb25ccf18254e0b726120c9b6bef9ee5 /src/transport
parentcf96e25a7a3c3864bb936b1b82fd086ca8d16a5e (diff)
UNIX domain socket support
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/test_transport_api_http_peer1.conf5
-rw-r--r--src/transport/test_transport_api_http_peer2.conf7
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf7
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf5
-rw-r--r--src/transport/test_transport_api_udp_nat_peer1.conf35
-rw-r--r--src/transport/test_transport_api_udp_nat_peer2.conf38
-rw-r--r--src/transport/test_transport_api_udp_peer1.conf15
-rw-r--r--src/transport/test_transport_api_udp_peer2.conf16
8 files changed, 50 insertions, 78 deletions
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 539e9ab6c..793e12cc0 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -40,6 +40,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12365
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
[peerinfo]
TRUST = $SERVICEHOME/data/credit/
@@ -51,6 +52,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12369
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
[resolver]
ACCEPT_FROM6 = ::1;
@@ -60,6 +62,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12364
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
[statistics]
ACCEPT_FROM6 = ::1;
@@ -69,6 +72,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12367
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
[arm]
DEFAULTSERVICES =
@@ -79,6 +83,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12366
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
[transport-http]
PORT = 12389
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 1cbe8cae0..00b90358f 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -43,6 +43,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22365
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
#PREFIX = valgrind --leak-check=full
@@ -56,6 +57,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22369
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
[resolver]
ACCEPT_FROM6 = ::1;
@@ -65,6 +67,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22364
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
[statistics]
ACCEPT_FROM6 = ::1;
@@ -74,6 +77,8 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22367
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+
[arm]
DEFAULTSERVICES =
@@ -84,6 +89,8 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22366
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+
[transport-http]
PORT = 22389
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 97e2111c8..f5bdc2063 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -43,6 +43,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12365
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
[peerinfo]
TRUST = $SERVICEHOME/data/credit/
@@ -54,6 +55,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12369
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
[resolver]
ACCEPT_FROM6 = ::1;
@@ -62,7 +64,8 @@ BINARY = gnunet-service-resolver
CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
-PORT = 12364
+PORT = 1236
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
[statistics]
ACCEPT_FROM6 = ::1;
@@ -72,6 +75,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12367
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
[arm]
DEFAULTSERVICES = transport statistics
@@ -82,6 +86,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12366
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
[transport-tcp]
TIMEOUT = 300000
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index f6ab6c231..f2c22e336 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -42,6 +42,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22365
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
#PREFIX = valgrind --leak-check=full
@@ -55,6 +56,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22369
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
[resolver]
ACCEPT_FROM6 = ::1;
@@ -64,6 +66,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22364
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
[statistics]
ACCEPT_FROM6 = ::1;
@@ -73,6 +76,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22367
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
[arm]
DEFAULTSERVICES = transport statistics
@@ -83,6 +87,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22366
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
[transport-tcp]
TIMEOUT = 300000
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index d2ab3ecee..0956c83eb 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -5,29 +5,13 @@ INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
[fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
+AUTOSTART = NO
[datastore-sqlite]
FILENAME = $SERVICEHOME/datastore/sqlite.db
[datastore]
-DATABASE = sqlite
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-QUOTA = 100000000
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-datastore
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2093
+AUTOSTART = NO
[hostlist]
HTTP-PROXY =
@@ -49,15 +33,7 @@ FRIENDS-ONLY = NO
MINIMUM-FRIENDS = 0
[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2092
+AUTOSTART = NO
[transport]
PLUGINS = udp_nat
@@ -70,6 +46,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12365
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
#PREFIX = xterm -e xterm -T transport -e gdb --args
@@ -83,6 +60,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12369
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
[resolver]
ACCEPT_FROM6 = ::1;
@@ -92,6 +70,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12364
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
[statistics]
ACCEPT_FROM6 = ::1;
@@ -101,6 +80,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12367
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
[arm]
DEFAULTSERVICES =
@@ -111,6 +91,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12366
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
[transport-tcp]
TIMEOUT = 300000
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 32d8cab23..3dc4d672b 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -5,29 +5,10 @@ EXTERNAL_ADDRESS = 127.0.0.1
INTERNAL_ADDRESS = 127.0.0.1
[fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
-
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+AUTOSTART = NO
[datastore]
-DATABASE = sqlite
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-QUOTA = 100000000
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-datastore
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2093
+AUTOSTART = NO
[hostlist]
HTTP-PROXY =
@@ -49,15 +30,7 @@ FRIENDS-ONLY = NO
MINIMUM-FRIENDS = 0
[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2092
+AUTOSTART = NO
[transport]
PLUGINS = udp_nat
@@ -71,6 +44,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22365
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
#PREFIX = xterm -e xterm -T transport -e gdb --args
[peerinfo]
@@ -83,6 +57,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22369
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
[resolver]
ACCEPT_FROM6 = ::1;
@@ -92,6 +67,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22364
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
[statistics]
ACCEPT_FROM6 = ::1;
@@ -101,6 +77,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22367
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
[arm]
DEFAULTSERVICES =
@@ -111,6 +88,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22366
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
[transport-tcp]
TIMEOUT = 300000
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index e1ff1644e..49efbff63 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -30,15 +30,7 @@ FRIENDS-ONLY = NO
MINIMUM-FRIENDS = 0
[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2092
+AUTOSTART = NO
[transport]
PLUGINS = udp
@@ -51,6 +43,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12365
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
#PREFIX = xterm -e xterm -T transport -e gdb --args
@@ -64,6 +57,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12369
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
[resolver]
ACCEPT_FROM6 = ::1;
@@ -73,6 +67,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12364
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
[statistics]
ACCEPT_FROM6 = ::1;
@@ -82,6 +77,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12367
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
[arm]
DEFAULTSERVICES =
@@ -92,6 +88,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12366
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
[transport-tcp]
TIMEOUT = 300000
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index cb4d4778d..2259e23f7 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -29,17 +29,6 @@ AUTOCONNECT = YES
FRIENDS-ONLY = NO
MINIMUM-FRIENDS = 0
-[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2092
-
[transport]
PLUGINS = udp
DEBUG = NO
@@ -52,6 +41,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22365
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
[peerinfo]
@@ -64,6 +54,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22369
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
[resolver]
ACCEPT_FROM6 = ::1;
@@ -73,6 +64,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22364
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
[statistics]
ACCEPT_FROM6 = ::1;
@@ -82,6 +74,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22367
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
[arm]
DEFAULTSERVICES =
@@ -92,6 +85,7 @@ CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22366
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
[transport-tcp]
TIMEOUT = 300000