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

[gnunet]

Author: wachs
Date: 2011-06-15 14:35:00 +0200 (Wed, 15 Jun 2011)
New Revision: 15640

Modified:
   gnunet/src/transport/test_transport_api_rel_https_peer1.conf
   gnunet/src/transport/test_transport_api_rel_https_peer2.conf
Log:
use different ports


Modified: gnunet/src/transport/test_transport_api_rel_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_rel_https_peer1.conf        
2011-06-15 11:28:47 UTC (rev 15639)
+++ gnunet/src/transport/test_transport_api_rel_https_peer1.conf        
2011-06-15 12:35:00 UTC (rev 15640)
@@ -1,35 +1,16 @@
-[transport-http]
-PORT = 12389
-DEBUG = NO
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-USE_LOCALADDR = YES
-
 [transport-https]
-PORT = 15001
-#DEBUG = YES
+PORT = 13301
 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
 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
-USE_LOCALADDR = YES
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -51,7 +32,6 @@
 
 [transport]
 PLUGINS = https
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -60,7 +40,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 15000
+PORT = 13302
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -75,7 +55,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 13303
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -85,7 +65,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 13304
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -95,7 +75,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 13305
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -106,14 +86,9 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 13306
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[transport-tcp]
-PORT = 12399
-DEBUG = YES
-
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -123,14 +98,21 @@
 [PATHS]
 SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
 
+[fs]
+AUTOSTART = NO
 
+[datastore]
+AUTOSTART = NO
+
+[core]
+AUTOSTART = NO
+
 [dht]
 AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
 
-
 [dns]
 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-15 11:28:47 UTC (rev 15639)
+++ gnunet/src/transport/test_transport_api_rel_https_peer2.conf        
2011-06-15 12:35:00 UTC (rev 15640)
@@ -1,14 +1,5 @@
-[transport-http]
-PORT = 22389
-DEBUG = NO
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-USE_LOCALADDR = YES
-
 [transport-https]
-PORT = 16001
+PORT = 13401
 DEBUG = NO
 USE_IPv4 = YES
 USE_IPv6 = NO
@@ -21,15 +12,6 @@
 #CRYPTO_INIT = PERFORMANCE
 USE_LOCALADDR = YES
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -51,7 +33,6 @@
 
 [transport]
 PLUGINS = https
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -60,7 +41,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 16000
+PORT = 13402
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -75,7 +56,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 13403
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -85,7 +66,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 13404
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -95,7 +76,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 13405
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -107,18 +88,9 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 13406
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-
-[transport-http]
-PORT = 22389
-DEBUG = NO
-
-[transport-tcp]
-PORT = 22399
-DEBUG = YES
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -128,7 +100,15 @@
 [PATHS]
 SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
 
+[fs]
+AUTOSTART = NO
 
+[datastore]
+AUTOSTART = NO
+
+[core]
+AUTOSTART = NO
+
 [dht]
 AUTOSTART = NO