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

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

From:	gnunet
Subject:	[GNUnet-SVN] r15674 - gnunet/src/transport
Date:	Thu, 16 Jun 2011 16:29:41 +0200
Author: wachs
Date: 2011-06-16 16:29:41 +0200 (Thu, 16 Jun 2011)
New Revision: 15674

Modified:
   gnunet/src/transport/test_plugin_transport_data_http.conf
   gnunet/src/transport/test_quota_compliance_http_peer1.conf
   gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_https_peer1.conf
   gnunet/src/transport/test_transport_api_https_peer2.conf
   gnunet/src/transport/test_transport_api_rel_http_peer1.conf
   gnunet/src/transport/test_transport_api_rel_http_peer2.conf
   gnunet/src/transport/test_transport_api_rel_https_peer1.conf
   gnunet/src/transport/test_transport_api_rel_https_peer2.conf
Log:
confs


Modified: gnunet/src/transport/test_plugin_transport_data_http.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data_http.conf   2011-06-16 
14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_plugin_transport_data_http.conf   2011-06-16 
14:29:41 UTC (rev 15674)
@@ -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 @@
 
 
 [transport-https]
-PORT = 12389
+PORT = 12321
 DEBUG = YES
 #USE_IPv4 = NO
 #USE_IPv6 = NO
@@ -42,7 +42,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12322
 
 [arm]
 DEFAULTSERVICES = topology hostlist
@@ -52,7 +52,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12323
 
 [dht]
 AUTOSTART = NO
@@ -61,6 +61,4 @@
 AUTOSTART = NO
 
 [dns]
-AUTOSTART = NO
-
-
+AUTOSTART = NO
\ No newline at end of file

Modified: gnunet/src/transport/test_quota_compliance_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer1.conf  2011-06-16 
14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_quota_compliance_http_peer1.conf  2011-06-16 
14:29:41 UTC (rev 15674)
@@ -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]

Modified: gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer1.conf   2011-06-16 
14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer1.conf   2011-06-16 
14:29:41 UTC (rev 15674)
@@ -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]

Modified: gnunet/src/transport/test_transport_api_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer1.conf    2011-06-16 
14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_transport_api_https_peer1.conf    2011-06-16 
14:29:41 UTC (rev 15674)
@@ -5,8 +5,8 @@
 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

Modified: gnunet/src/transport/test_transport_api_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer2.conf    2011-06-16 
14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_transport_api_https_peer2.conf    2011-06-16 
14:29:41 UTC (rev 15674)
@@ -5,8 +5,8 @@
 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

Modified: gnunet/src/transport/test_transport_api_rel_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_rel_http_peer1.conf 2011-06-16 
14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_transport_api_rel_http_peer1.conf 2011-06-16 
14:29:41 UTC (rev 15674)
@@ -1,5 +1,5 @@
 [transport-http]
-PORT = 12389
+PORT = 12180
 DEBUG = NO
 USE_IPv4 = YES
 USE_IPv6 = NO
@@ -7,25 +7,6 @@
 #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 @@
 
 [transport]
 PLUGINS = http
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -56,7 +36,7 @@
 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 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12182
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -82,7 +62,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 12183
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -92,7 +72,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12184
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -103,14 +83,9 @@
 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,9 +93,18 @@
 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
 

Modified: gnunet/src/transport/test_transport_api_rel_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_rel_http_peer2.conf 2011-06-16 
14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_transport_api_rel_http_peer2.conf 2011-06-16 
14:29:41 UTC (rev 15674)
@@ -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 @@
 
 [transport]
 PLUGINS = http
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -47,7 +44,7 @@
 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 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12092
+PORT = 12192
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -74,7 +71,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12093
+PORT = 12193
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -84,7 +81,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12094
+PORT = 12194
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -96,7 +93,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12095
+PORT = 12195
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]

Modified: gnunet/src/transport/test_transport_api_rel_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_rel_https_peer1.conf        
2011-06-16 14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_transport_api_rel_https_peer1.conf        
2011-06-16 14:29:41 UTC (rev 15674)
@@ -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 @@
 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 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13303
+PORT = 12302
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -65,7 +65,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13304
+PORT = 12303
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -75,7 +75,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13305
+PORT = 12304
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -86,7 +86,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13306
+PORT = 12305
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [TESTING]
@@ -96,7 +96,7 @@
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-https-p1/
 
 [fs]
 AUTOSTART = NO

Modified: gnunet/src/transport/test_transport_api_rel_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_rel_https_peer2.conf        
2011-06-16 14:03:28 UTC (rev 15673)
+++ gnunet/src/transport/test_transport_api_rel_https_peer2.conf        
2011-06-16 14:29:41 UTC (rev 15674)
@@ -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 @@
 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 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13403
+PORT = 12312
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -66,7 +66,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13404
+PORT = 12313
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -76,7 +76,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13405
+PORT = 12314
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -88,7 +88,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 13406
+PORT = 12315
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
@@ -98,7 +98,7 @@
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-https-p2/
 
 [fs]
 AUTOSTART = NO
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r15674 - gnunet/src/transport, gnunet <=
Prev by Date: [GNUnet-SVN] r15648 - / gnunet gnunet/contrib gnunet/src gnunet-setup/src libmicrohttpd monkey monkey/src monkey/src/include
Next by Date: [GNUnet-SVN] r15675 - gnunet/src/transport
Previous by thread: [GNUnet-SVN] r15648 - / gnunet gnunet/contrib gnunet/src gnunet-setup/src libmicrohttpd monkey monkey/src monkey/src/include
Next by thread: [GNUnet-SVN] r15675 - gnunet/src/transport
Index(es):
- Date
- Thread