From 5ab444c806af4a0c934fd8762e6f3bcc419f3c9c Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 18 Nov 2010 12:58:57 +0000 Subject: clean port assignment --- .../test_quota_compliance_http_peer1.conf | 22 +++++++-------- .../test_quota_compliance_http_peer2.conf | 31 ++++++++-------------- .../test_quota_compliance_https_peer1.conf | 29 ++++++++++---------- .../test_quota_compliance_https_peer2.conf | 30 +++++++++++---------- 4 files changed, 52 insertions(+), 60 deletions(-) diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 190410d91..d709a4f53 100644 --- 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 b69e77200..0781778ff 100644 --- 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 b2c4ea9f2..cb95e92bc 100644 --- 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 bf9debcf0..1602c0ae7 100644 --- 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 -- cgit v1.2.3