[GNUnet-SVN] r13733 - gnunet/src/transport

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13733 - gnunet/src/transport

From:	gnunet
Subject:	[GNUnet-SVN] r13733 - gnunet/src/transport
Date:	Thu, 18 Nov 2010 13:58:57 +0100
Author: wachs
Date: 2010-11-18 13:58:57 +0100 (Thu, 18 Nov 2010)
New Revision: 13733

Modified:
   gnunet/src/transport/test_quota_compliance_http_peer1.conf
   gnunet/src/transport/test_quota_compliance_http_peer2.conf
   gnunet/src/transport/test_quota_compliance_https_peer1.conf
   gnunet/src/transport/test_quota_compliance_https_peer2.conf
Log:
clean port assignment


Modified: gnunet/src/transport/test_quota_compliance_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer1.conf  2010-11-18 
12:30:29 UTC (rev 13732)
+++ gnunet/src/transport/test_quota_compliance_http_peer1.conf  2010-11-18 
12:58:57 UTC (rev 13733)
@@ -31,7 +31,7 @@
 AUTOSTART = NO
 
 [transport-http]
-PORT = 4389
+PORT = 4010
 DEBUG = NO
 USE_IPv4 = YES
 USE_IPv6 = NO
@@ -39,6 +39,8 @@
 #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 @@
 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 @@
 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 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 4087
-UNIXPATH = 
/tmp/test_quota_compliance_peer1/test_quota_compliance_arm_peer1.sock
 
 [TESTING]
 WEAKRANDOM = YES

Modified: gnunet/src/transport/test_quota_compliance_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer2.conf  2010-11-18 
12:30:29 UTC (rev 13732)
+++ gnunet/src/transport/test_quota_compliance_http_peer2.conf  2010-11-18 
12:58:57 UTC (rev 13733)
@@ -3,22 +3,13 @@
 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 @@
 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 @@
 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 @@
 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 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3087
-UNIXPATH = 
/tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock
 
 [TESTING]
 WEAKRANDOM = YES

Modified: gnunet/src/transport/test_quota_compliance_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer1.conf 2010-11-18 
12:30:29 UTC (rev 13732)
+++ gnunet/src/transport/test_quota_compliance_https_peer1.conf 2010-11-18 
12:58:57 UTC (rev 13733)
@@ -37,14 +37,16 @@
 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 @@
 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 @@
 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 @@
 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 @@
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
 
-
 [dht]
 AUTOSTART = NO
-
-

Modified: gnunet/src/transport/test_quota_compliance_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer2.conf 2010-11-18 
12:30:29 UTC (rev 13732)
+++ gnunet/src/transport/test_quota_compliance_https_peer2.conf 2010-11-18 
12:58:57 UTC (rev 13733)
@@ -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_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 @@
 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 @@
 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 @@
 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,9 +101,8 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 3087
-UNIXPATH = 
/tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock
 
+
 [TESTING]
 WEAKRANDOM = YES
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r13733 - gnunet/src/transport, gnunet <=
Prev by Date: [GNUnet-SVN] r13732 - gnunet/src/core
Next by Date: [GNUnet-SVN] r13734 - gnunet/src/core
Previous by thread: [GNUnet-SVN] r13732 - gnunet/src/core
Next by thread: [GNUnet-SVN] r13734 - gnunet/src/core
Index(es):
- Date
- Thread