[GNUnet-SVN] r17525 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2011-10-17 11:59:05 +0200 (Mon, 17 Oct 2011)
New Revision: 17525

Removed:
   gnunet/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
   gnunet/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
Modified:
   gnunet/src/core/test_core_api_peer1.conf
   gnunet/src/core/test_core_api_peer2.conf
   gnunet/src/core/test_core_api_send_to_self.conf
   gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
   gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
   gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
   gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
   gnunet/src/core/test_core_quota_peer1.conf
   gnunet/src/core/test_core_quota_peer2.conf
Log:
configure ATS ports conflict-free for tests

Modified: gnunet/src/core/test_core_api_peer1.conf
===================================================================
--- gnunet/src/core/test_core_api_peer1.conf    2011-10-17 09:47:50 UTC (rev 
17524)
+++ gnunet/src/core/test_core_api_peer1.conf    2011-10-17 09:59:05 UTC (rev 
17525)
@@ -25,3 +25,6 @@
 PORT = 12465
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 
+[ats]
+PORT = 12471
+UNIXPATH = /tmp/gnunet-p1-service-ats.sock

Modified: gnunet/src/core/test_core_api_peer2.conf
===================================================================
--- gnunet/src/core/test_core_api_peer2.conf    2011-10-17 09:47:50 UTC (rev 
17524)
+++ gnunet/src/core/test_core_api_peer2.conf    2011-10-17 09:59:05 UTC (rev 
17525)
@@ -30,3 +30,6 @@
 PORT = 22470
 UNIXPATH = /tmp/gnunet-p2-service-core.sock
 
+[ats]
+PORT = 22471
+UNIXPATH = /tmp/gnunet-p2-service-ats.sock

Modified: gnunet/src/core/test_core_api_send_to_self.conf
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.conf     2011-10-17 09:47:50 UTC 
(rev 17524)
+++ gnunet/src/core/test_core_api_send_to_self.conf     2011-10-17 09:59:05 UTC 
(rev 17525)
@@ -13,6 +13,10 @@
 TOTAL_QUOTA_OUT = 104757600
 UNIXPATH = /tmp/gnunet-service-core.sock
 
+[ats]
+PORT = 24571
+UNIXPATH = /tmp/gnunet-p1-service-ats.sock
+
 [test-sts]
 AUTOSTART = YES
 PORT = 9252 

Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf  
2011-10-17 09:47:50 UTC (rev 17524)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf  
2011-10-17 09:59:05 UTC (rev 17525)
@@ -33,3 +33,7 @@
 UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock
 DEBUG = NO
 
+[ats]
+PORT = 12491
+UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-ats.sock
+

Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf  
2011-10-17 09:47:50 UTC (rev 17524)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf  
2011-10-17 09:59:05 UTC (rev 17525)
@@ -33,3 +33,7 @@
 UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock
 DEBUG = NO
 
+[ats]
+PORT = 22491
+UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-ats.sock
+

Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf    
2011-10-17 09:47:50 UTC (rev 17524)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf    
2011-10-17 09:59:05 UTC (rev 17525)
@@ -33,3 +33,8 @@
 UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock
 DEBUG = NO
 
+
+[ats]
+PORT = 12491
+UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-ats.sock
+

Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf    
2011-10-17 09:47:50 UTC (rev 17524)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf    
2011-10-17 09:59:05 UTC (rev 17525)
@@ -33,3 +33,8 @@
 UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock
 DEBUG = NO
 
+
+[ats]
+PORT = 22491
+UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-ats.sock
+

Deleted: gnunet/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limited_peer1.conf  
2011-10-17 09:47:50 UTC (rev 17524)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limited_peer1.conf  
2011-10-17 09:59:05 UTC (rev 17525)
@@ -1,35 +0,0 @@
address@hidden@ test_core_defaults.conf
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/
-DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer1.conf
-
-[transport-tcp]
-PORT = 12428
-
-[arm]
-PORT = 12426
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-arm.sock
-
-[statistics]
-PORT = 12427
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock
-
-[resolver]
-PORT = 12424
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12429
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12425
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock
-
-[core]
-PORT = 12430
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock
-DEBUG = NO
-

Deleted: gnunet/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limited_peer2.conf  
2011-10-17 09:47:50 UTC (rev 17524)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limited_peer2.conf  
2011-10-17 09:59:05 UTC (rev 17525)
@@ -1,35 +0,0 @@
address@hidden@ test_core_defaults.conf
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/
-DEFAULTCONFIG = test_core_quota_asymmetric_send_limited_peer2.conf
-
-[transport-tcp]
-PORT = 22428
-
-[arm]
-PORT = 22426
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-arm.sock
-
-[statistics]
-PORT = 22427
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-statistics.sock
-
-[resolver]
-PORT = 22424
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 22429
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-peerinfo.sock
-
-[transport]
-PORT = 22425
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-transport.sock
-
-[core]
-PORT = 22430
-TOTAL_QUOTA_IN = 1000000
-TOTAL_QUOTA_OUT = 1000000
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock
-DEBUG = NO
-

Modified: gnunet/src/core/test_core_quota_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer1.conf  2011-10-17 09:47:50 UTC (rev 
17524)
+++ gnunet/src/core/test_core_quota_peer1.conf  2011-10-17 09:59:05 UTC (rev 
17525)
@@ -33,3 +33,7 @@
 UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock
 DEBUG = NO
 
+[ats]
+PORT = 12481
+UNIXPATH = /tmp/gnunet-core-sym-p1-service-ats.sock
+

Modified: gnunet/src/core/test_core_quota_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer2.conf  2011-10-17 09:47:50 UTC (rev 
17524)
+++ gnunet/src/core/test_core_quota_peer2.conf  2011-10-17 09:59:05 UTC (rev 
17525)
@@ -33,3 +33,7 @@
 UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock
 DEBUG = NO
 
+[ats]
+PORT = 22482
+UNIXPATH = /tmp/gnunet-core-sym-p2-service-ats.sock
+