projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a44c62)
clean port assignment
authorMatthias Wachs <wachs@net.in.tum.de>
Thu, 18 Nov 2010 12:58:57 +0000 (12:58 +0000)
committerMatthias Wachs <wachs@net.in.tum.de>
Thu, 18 Nov 2010 12:58:57 +0000 (12:58 +0000)
src/transport/test_quota_compliance_http_peer1.conf patch | blob | history
src/transport/test_quota_compliance_http_peer2.conf patch | blob | history
src/transport/test_quota_compliance_https_peer1.conf patch | blob | history
src/transport/test_quota_compliance_https_peer2.conf patch | blob | history

diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 190410d910a5adcb509fa08eb40eb90da39337cb..d709a4f5380f8414af068e14627badadb0a190ec 100644 (file)
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -31,7 +31,7 @@ MINIMUM-FRIENDS = 0
 AUTOSTART = NO
 
 [transport-http]
-PORT = 4389
+PORT = 4010
 DEBUG = NO
 USE_IPv4 = YES
 USE_IPv6 = NO
@@ -39,6 +39,8 @@ BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
 
 [transport]
+PORT = 4011
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_transport_peer1.sock
 plugins = http
 #DEBUG = YES
 PREFIX = 
@@ -49,10 +51,10 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4091
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_transport_peer1.sock
 
 [peerinfo]
+PORT = 4012
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_peerinfo_peer1.sock
 TRUST = $SERVICEHOME/data/credit/
 HOSTS = $SERVICEHOME/data/hosts/
 ACCEPT_FROM6 = ::1;
@@ -61,30 +63,30 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4090
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_peerinfo_peer1.sock
 
 [resolver]
+PORT = 4013
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_resolver_peer1.sock
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4089
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_resolver_peer1.sock
 
 [statistics]
+PORT = 4014
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_statistics_peer1.sock
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4088
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_statistics_peer1.sock
 
 [arm]
+PORT = 4015
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_http_arm_peer1.sock
 DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -92,8 +94,6 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4087
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_arm_peer1.sock
 
 [TESTING]
 WEAKRANDOM = YES
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index b69e772005a0459987288d2e2491fe163366df32..0781778ff856abb866deaf41d16099b0194b4676 100644 (file)
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -3,22 +3,13 @@ SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
 
 [transport-http]
-PORT = 3389
+PORT = 3010
 DEBUG = NO
 USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
 
-
-[transport-udp]
-PORT = 3094
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 3094
-BINDTO = 127.0.0.1
-
 [fs]
 AUTOSTART = NO
 
@@ -48,6 +39,8 @@ MINIMUM-FRIENDS = 0
 AUTOSTART = NO
 
 [transport]
+PORT = 3011
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_transport_peer2.sock
 plugins = http
 #DEBUG = YES
 PREFIX = 
@@ -58,10 +51,10 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3091
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_transport_peer2.sock
 
 [peerinfo]
+PORT = 3012
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_peerinfo_peer2.sock
 TRUST = $SERVICEHOME/data/credit/
 HOSTS = $SERVICEHOME/data/hosts/
 ACCEPT_FROM6 = ::1;
@@ -70,30 +63,30 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_peerinfo_peer2.sock
 
 [resolver]
+PORT = 3013
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_resolver_peer2.sock
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_resolver_peer2.sock
 
 [statistics]
+PORT = 3014
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_statistics_peer2.sock
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_statistics_peer2.sock
 
 [arm]
+PORT = 3015
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_http_arm_peer2.sock
 DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -101,8 +94,6 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock
 
 [TESTING]
 WEAKRANDOM = YES
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index b2c4ea9f2ed2a7288ade27653c2042dcb4f77fba..cb95e92bc2e5bdba9bad3735cf6dea69f7e7b4c9 100644 (file)
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -37,14 +37,16 @@ USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
-KEY_FILE = https_key_p1.key
-CERT_FILE = https_cert_p1.crt
+KEY_FILE = https_key_quota_p1.key
+CERT_FILE = https_cert_quota_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
 
 
 [transport]
+PORT = 4002
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_ctransport_peer1.sock
 plugins = https
 #DEBUG = YES
 PREFIX = 
@@ -55,10 +57,11 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4091
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_transport_peer1.sock
+
 
 [peerinfo]
+PORT = 4003
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_https_peerinfo_peer1.sock
 TRUST = $SERVICEHOME/data/credit/
 HOSTS = $SERVICEHOME/data/hosts/
 ACCEPT_FROM6 = ::1;
@@ -67,30 +70,31 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4090
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_peerinfo_peer1.sock
+
 
 [resolver]
+PORT = 4004
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_https_resolver_peer1.sock
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4089
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_resolver_peer1.sock
 
 [statistics]
+PORT = 4005
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_https_statistics_peer1.sock
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4088
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_statistics_peer1.sock
 
 [arm]
+PORT = 4006
+UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_https_arm_peer1.sock
 DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -98,8 +102,6 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4087
-UNIXPATH = /tmp/test_quota_compliance_peer1/test_quota_compliance_arm_peer1.sock
 
 [TESTING]
 WEAKRANDOM = YES
@@ -107,8 +109,5 @@ WEAKRANDOM = YES
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
 
-
 [dht]
 AUTOSTART = NO
-
-
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index bf9debcf0d6dc2d1c586d38b055a040cd9342c9b..1602c0ae762d798731ce94fd084fe5f45851b97f 100644 (file)
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+SERVICEHOME = /tmp/test_quota_compliance_https_peer2
 DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
 
 [transport-https]
@@ -9,13 +9,12 @@ USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
-KEY_FILE = https_key_p1.key
-CERT_FILE = https_cert_p1.crt
+KEY_FILE = https_key_quota_p2.key
+CERT_FILE = https_cert_qutoa_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
 
-
 [fs]
 AUTOSTART = NO
 
@@ -45,6 +44,8 @@ MINIMUM-FRIENDS = 0
 AUTOSTART = NO
 
 [transport]
+PORT = 3002
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_transport_peer2.sock
 plugins = https
 #DEBUG = YES
 PREFIX = 
@@ -55,10 +56,11 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3091
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_transport_peer2.sock
+
 
 [peerinfo]
+PORT = 3003
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_peerinfo_peer2.sock
 TRUST = $SERVICEHOME/data/credit/
 HOSTS = $SERVICEHOME/data/hosts/
 ACCEPT_FROM6 = ::1;
@@ -67,30 +69,31 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_peerinfo_peer2.sock
 
 [resolver]
+PORT = 3004
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_resolver_peer2.sock
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_resolver_peer2.sock
 
 [statistics]
+PORT = 3005
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_statistics_peer2.sock
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_statistics_peer2.sock
+
 
 [arm]
+PORT = 3006
+UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_https_arm_peer2.sock
 DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -98,8 +101,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock
+
 
 [TESTING]
 WEAKRANDOM = YES
Unnamed repository; edit this file 'description' to name the repository.