projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ead465b)
confs
authorMatthias Wachs <wachs@net.in.tum.de>
Thu, 16 Jun 2011 14:29:41 +0000 (14:29 +0000)
committerMatthias Wachs <wachs@net.in.tum.de>
Thu, 16 Jun 2011 14:29:41 +0000 (14:29 +0000)
src/transport/test_plugin_transport_data_http.conf patch | blob | history
src/transport/test_quota_compliance_http_peer1.conf patch | blob | history
src/transport/test_quota_compliance_tcp_peer1.conf patch | blob | history
src/transport/test_transport_api_https_peer1.conf patch | blob | history
src/transport/test_transport_api_https_peer2.conf patch | blob | history
src/transport/test_transport_api_rel_http_peer1.conf patch | blob | history
src/transport/test_transport_api_rel_http_peer2.conf patch | blob | history
src/transport/test_transport_api_rel_https_peer1.conf patch | blob | history
src/transport/test_transport_api_rel_https_peer2.conf patch | blob | history

diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf
index d618f33ebe517f4cd67719753d496830f2d69a33..d118a8880f3e342dc9f456dcfdc5d8b40ff5e47e 100644 (file)
--- a/src/transport/test_plugin_transport_data_http.conf
+++ b/src/transport/test_plugin_transport_data_http.conf
@@ -1,12 +1,12 @@
 [PATHS]
 DEFAULTCONFIG = test_plugin_transport_data_http.conf
-SERVICEHOME = /tmp/test_plugin_transport_http/
+SERVICEHOME = /tmp/test-transport/plugin_http/
 
 [TESTING]
 WEAKRANDOM = YES
 
 [transport-http]
-PORT = 12389
+PORT = 12320
 DEBUG = YES
 #USE_IPv4 = NO
 #USE_IPv6 = NO
@@ -17,7 +17,7 @@ USE_IPv6 = YES
 
 
 [transport-https]
-PORT = 12389
+PORT = 12321
 DEBUG = YES
 #USE_IPv4 = NO
 #USE_IPv6 = NO
@@ -42,7 +42,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12322
 
 [arm]
 DEFAULTSERVICES = topology hostlist
@@ -52,7 +52,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12323
 
 [dht]
 AUTOSTART = NO
@@ -61,6 +61,4 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [dns]
-AUTOSTART = NO
-
-
+AUTOSTART = NO
\ No newline at end of file
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 13875a0e83c25ef2cdd76571fdd2ad4d05f72c03..85cd22a4f31fa91627bd3fc63ce363c974b9b72a 100644 (file)
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+SERVICEHOME = /tmp/test-transport/quota-http-p1/
 DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
 
 [fs]
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index de0a4ca7ce2b9e939f60c6eaff2f4f3901e62379..d6fc3850d0cf3873aa86c38b2eb24f2060d40921 100644 (file)
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
+SERVICEHOME = SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
 DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
 
 [fs]
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index e441bfc2bec21c03b03b218960dbd84d7d8788af..89baab8d28cb120d6c59429500da8b3204971c27 100644 (file)
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -5,8 +5,8 @@ USE_IPv6 = YES
 USE_IPv4 = YES
 #BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
-KEY_FILE = https_key_p1.key
-CERT_FILE = https_cert_p1.crt
+KEY_FILE = $SERVICEHOME/https_key_p1.key
+CERT_FILE = $SERVICEHOME/https_cert_p1.crt
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
 #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
 #CRYPTO_INIT = PERFORMANCE
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index cf0c5c9154dfa1977969a00e08715ce73621e6bd..e510b20f4810123f990ceab54b152afc0c49ddb3 100644 (file)
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -5,8 +5,8 @@ USE_IPv6 = YES
 USE_IPv4 = YES
 #BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
-KEY_FILE = https_key_p2.key
-CERT_FILE = https_cert_p2.crt
+KEY_FILE = $SERVICEHOME/https_key_p2.key
+CERT_FILE = $SERVICEHOME/https_cert_p2.crt
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
 #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
 #CRYPTO_INIT = PERFORMANCE
diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf
index fac0accc5f9c6e53c47da62fe0ce9df264d98373..9c66918cf34d9cd96391ed6768aad39e066566ef 100644 (file)
--- a/src/transport/test_transport_api_rel_http_peer1.conf
+++ b/src/transport/test_transport_api_rel_http_peer1.conf
@@ -1,5 +1,5 @@
 [transport-http]
-PORT = 12389
+PORT = 12180
 DEBUG = NO
 USE_IPv4 = YES
 USE_IPv6 = NO
@@ -7,25 +7,6 @@ BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
 USE_LOCALADDR = YES
 
-[transport-https]
-PORT = 42389
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-KEY_FILE = https_key_p1.key
-CERT_FILE = https_cert_p1.crt
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -47,7 +28,6 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = http
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -56,7 +36,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12365
+PORT = 12181
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -72,7 +52,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12182
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -82,7 +62,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 12183
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -92,7 +72,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12184
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -103,14 +83,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12185
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[transport-tcp]
-PORT = 12399
-#DEBUG = YES
-
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -118,8 +93,17 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-http-p1/
+
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
 
+[core]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf
index 3c8621b39c459a34c4c0543048c1b35da951d12f..ffcb681057d0a044d9f1dacc6f1cacdafc98ffc6 100644 (file)
--- a/src/transport/test_transport_api_rel_http_peer2.conf
+++ b/src/transport/test_transport_api_rel_http_peer2.conf
@@ -1,13 +1,11 @@
-[transport-https]
-PORT = 12090
+[transport-http]
+PORT = 12190
 DEBUG = NO
-USE_IPv6 = YES
 USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
+USE_IPv6 = NO
+BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
-KEY_FILE = https_key_p2.key
-CERT_FILE = https_cert_p2.crt
-
+USE_LOCALADDR = YES
 [fs]
 AUTOSTART = NO
 
@@ -38,7 +36,6 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = http
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -47,7 +44,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12091
+PORT = 12191
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -64,7 +61,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12092
+PORT = 12192
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -74,7 +71,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12093
+PORT = 12193
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -84,7 +81,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12094
+PORT = 12194
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -96,7 +93,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12095
+PORT = 12195
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf
index d0b9e7272cbde564cd53fccf770396fff8952154..d3298bdc7d76f66a0208109e1e3f7b38a853434e 100644 (file)
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -1,12 +1,12 @@
 [transport-https]
-PORT = 13301
+PORT = 12300
 USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
 USE_LOCALADDR = YES
-KEY_FILE = https_key_p1.key
-CERT_FILE = https_cert_p1.crt
+KEY_FILE = $SERVICEHOME/https_key_p1.key
+CERT_FILE = $SERVICEHOME/https_cert_p1.crt
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
 #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
 #CRYPTO_INIT = PERFORMANCE
@@ -40,7 +40,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13302
+PORT = 12301
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -55,7 +55,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13303
+PORT = 12302
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -65,7 +65,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13304
+PORT = 12303
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -75,7 +75,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13305
+PORT = 12304
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -86,7 +86,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13306
+PORT = 12305
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [TESTING]
@@ -96,7 +96,7 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-https-p1/
 
 [fs]
 AUTOSTART = NO
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf
index cfec1e0a5ee9f2861eaa2071bb8358807621b338..713422a4bb893ca0bb8045357f4200c7ed024bcf 100644 (file)
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -1,12 +1,12 @@
 [transport-https]
-PORT = 13401
+PORT = 12310
 DEBUG = NO
 USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
-KEY_FILE = https_key_p2.key
-CERT_FILE = https_cert_p2.crt
+KEY_FILE = $SERVICEHOME/https_key_p2.key
+CERT_FILE = $SERVICEHOME/https_cert_p2.crt
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
 #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
 #CRYPTO_INIT = PERFORMANCE
@@ -41,7 +41,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13402
+PORT = 12311
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -56,7 +56,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13403
+PORT = 12312
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -66,7 +66,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13404
+PORT = 12313
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -76,7 +76,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13405
+PORT = 12314
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -88,7 +88,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13406
+PORT = 12315
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
@@ -98,7 +98,7 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-https-p2/
 
 [fs]
 AUTOSTART = NO
Unnamed repository; edit this file 'description' to name the repository.