gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: gnunet
Subject: [GNUnet-SVN] r13453 - gnunet/src/transport
Date: Fri, 29 Oct 2010 14:22:33 +0200

Author: wachs
Date: 2010-10-29 14:22:33 +0200 (Fri, 29 Oct 2010)
New Revision: 13453

Added:
   gnunet/src/transport/test_quota_compliance_http_peer1.conf
   gnunet/src/transport/test_quota_compliance_http_peer2.conf
   gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
   gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
Removed:
   gnunet/src/transport/test_quota_compliance_peer1.conf
   gnunet/src/transport/test_quota_compliance_peer2.conf
Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/test_quota_compliance.c
Log:
Adding quota compliance test for http


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2010-10-29 12:01:31 UTC (rev 13452)
+++ gnunet/src/transport/Makefile.am    2010-10-29 12:22:33 UTC (rev 13453)
@@ -201,7 +201,8 @@
  test_transport_api_reliability_udp \
  $(HTTP_REL_TEST) \
  $(HTTPS_REL_TEST) \
- test_quota_compliance
+ test_quota_compliance_tcp \
+ test_quota_compliance_http
 # TODO: add tests for nat, etc.
 
 if !DISABLE_TEST_RUN
@@ -218,7 +219,8 @@
  test_transport_api_reliability_tcp_nat \
  $(HTTP_REL_TEST) \
  $(HTTPS_REL_TEST) \
- test_quota_compliance
+ test_quota_compliance_tcp \
+ test_quota_compliance_http
 endif
 
 test_transport_api_tcp_SOURCES = \
@@ -305,12 +307,18 @@
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
-test_quota_compliance_SOURCES = \
+test_quota_compliance_tcp_SOURCES = \
  test_quota_compliance.c
-test_quota_compliance_LDADD = \
+test_quota_compliance_tcp_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+test_quota_compliance_http_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_http_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 endif
 
 EXTRA_DIST = \
@@ -335,5 +343,7 @@
   test_plugin_transport_data_http.conf \
   test_plugin_transport_data.conf \
   test_quota_compliance_data.conf \
-  test_quota_compliance_peer1.conf \
-  test_quota_compliance_peer2.conf
\ No newline at end of file
+  test_quota_compliance_tcp_peer1.conf \
+  test_quota_compliance_tcp_peer2.conf \
+  test_quota_compliance_http_peer1.conf \
+  test_quota_compliance_http_peer2.conf
\ No newline at end of file

Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c        2010-10-29 12:01:31 UTC 
(rev 13452)
+++ gnunet/src/transport/test_quota_compliance.c        2010-10-29 12:22:33 UTC 
(rev 13453)
@@ -578,31 +578,33 @@
   send_running = GNUNET_NO;
   recv_running = GNUNET_NO;
 
-
   if (is_tcp)
     {
-      setup_peer (&p1, "test_quota_compliance_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_peer2.conf");
+      setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
+      setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
     }
   else if (is_http)
     {
-      setup_peer (&p1, "test_quota_compliance_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_peer2.conf");
+         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                     "is_http: %u \n",
+                     is_http);
+      setup_peer (&p1, "test_quota_compliance_http_peer1.conf");
+      setup_peer (&p2, "test_quota_compliance_http_peer2.conf");
     }
   else if (is_https)
     {
-      setup_peer (&p1, "test_quota_compliance_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_peer2.conf");
+      setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
+      setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
     }
   else if (is_udp)
     {
-      setup_peer (&p1, "test_quota_compliance_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_peer2.conf");
+      setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
+      setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
     }
   else if (is_tcp_nat)
     {
-      setup_peer (&p1, "test_quota_compliance_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_peer2.conf");
+      setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
+      setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
     }
   else
     GNUNET_assert (0);

Added: gnunet/src/transport/test_quota_compliance_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer1.conf                  
        (rev 0)
+++ gnunet/src/transport/test_quota_compliance_http_peer1.conf  2010-10-29 
12:22:33 UTC (rev 13453)
@@ -0,0 +1,108 @@
+[PATHS]
+SERVICEHOME = /tmp/test_quota_compliance_peer1/
+DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[hostlist]
+HTTP-PROXY = 
+SERVERS = http://gnunet.org:8080/
+OPTIONS = -b
+BINARY = gnunet-daemon-hostlist
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+HTTPPORT = 8080
+
+[topology]
+BINARY = gnunet-daemon-topology
+CONFIG = $DEFAULTCONFIG
+FRIENDS = $SERVICEHOME/friends
+TARGET-CONNECTION-COUNT = 16
+AUTOCONNECT = YES
+FRIENDS-ONLY = NO
+MINIMUM-FRIENDS = 0
+
+[core]
+AUTOSTART = NO
+
+[transport-http]
+PORT = 4389
+DEBUG = NO
+USE_IPv4 = YES
+USE_IPv6 = NO
+BINDTO4 = 127.0.0.1
+#BINDTO6 = ::1
+
+[transport]
+plugins = http
+#DEBUG = YES
+PREFIX = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+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]
+TRUST = $SERVICEHOME/data/credit/
+HOSTS = $SERVICEHOME/data/hosts/
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+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]
+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]
+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]
+DEFAULTSERVICES = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+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
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+
+[dht]
+AUTOSTART = NO
+
+

Added: gnunet/src/transport/test_quota_compliance_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer2.conf                  
        (rev 0)
+++ gnunet/src/transport/test_quota_compliance_http_peer2.conf  2010-10-29 
12:22:33 UTC (rev 13453)
@@ -0,0 +1,117 @@
+[PATHS]
+SERVICEHOME = /tmp/test_quota_compliance_peer2
+DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
+
+[transport-http]
+PORT = 3389
+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
+
+[datastore]
+AUTOSTART = NO
+
+[hostlist]
+HTTP-PROXY = 
+SERVERS = http://gnunet.org:8080/
+OPTIONS = -b
+BINARY = gnunet-daemon-hostlist
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+HTTPPORT = 8080
+
+[topology]
+BINARY = gnunet-daemon-topology
+CONFIG = $DEFAULTCONFIG
+FRIENDS = $SERVICEHOME/friends
+TARGET-CONNECTION-COUNT = 16
+AUTOCONNECT = YES
+FRIENDS-ONLY = NO
+MINIMUM-FRIENDS = 0
+
+[core]
+AUTOSTART = NO
+
+[transport]
+plugins = http
+#DEBUG = YES
+PREFIX = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+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]
+TRUST = $SERVICEHOME/data/credit/
+HOSTS = $SERVICEHOME/data/hosts/
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+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]
+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]
+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]
+DEFAULTSERVICES = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+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
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+
+[dht]
+AUTOSTART = NO
+
+

Deleted: gnunet/src/transport/test_quota_compliance_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_peer1.conf       2010-10-29 
12:01:31 UTC (rev 13452)
+++ gnunet/src/transport/test_quota_compliance_peer1.conf       2010-10-29 
12:22:33 UTC (rev 13453)
@@ -1,110 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_peer1.conf
-
-
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[core]
-AUTOSTART = NO
-
-[transport-udp]
-PORT = 4094
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 4094
-BINDTO = 127.0.0.1
-
-[transport]
-plugins = tcp
-#DEBUG = YES
-PREFIX = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-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]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-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]
-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]
-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]
-DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-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
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-
-[dht]
-AUTOSTART = NO
-
-

Deleted: gnunet/src/transport/test_quota_compliance_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_peer2.conf       2010-10-29 
12:01:31 UTC (rev 13452)
+++ gnunet/src/transport/test_quota_compliance_peer2.conf       2010-10-29 
12:22:33 UTC (rev 13453)
@@ -1,108 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_peer2.conf
-
-[transport-udp]
-PORT = 3094
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 3094
-BINDTO = 127.0.0.1
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[core]
-AUTOSTART = NO
-
-[transport]
-plugins = tcp
-#DEBUG = YES
-PREFIX = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-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]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-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]
-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]
-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]
-DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-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
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-
-[dht]
-AUTOSTART = NO
-
-

Copied: gnunet/src/transport/test_quota_compliance_tcp_peer1.conf (from rev 
13451, gnunet/src/transport/test_quota_compliance_peer1.conf)
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer1.conf                   
        (rev 0)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer1.conf   2010-10-29 
12:22:33 UTC (rev 13453)
@@ -0,0 +1,108 @@
+[PATHS]
+SERVICEHOME = /tmp/test_quota_compliance_peer1/
+DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[hostlist]
+HTTP-PROXY = 
+SERVERS = http://gnunet.org:8080/
+OPTIONS = -b
+BINARY = gnunet-daemon-hostlist
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+HTTPPORT = 8080
+
+[topology]
+BINARY = gnunet-daemon-topology
+CONFIG = $DEFAULTCONFIG
+FRIENDS = $SERVICEHOME/friends
+TARGET-CONNECTION-COUNT = 16
+AUTOCONNECT = YES
+FRIENDS-ONLY = NO
+MINIMUM-FRIENDS = 0
+
+[core]
+AUTOSTART = NO
+
+[transport-udp]
+PORT = 4094
+
+[transport-tcp]
+TIMEOUT = 300000
+PORT = 4094
+BINDTO = 127.0.0.1
+
+[transport]
+plugins = tcp
+#DEBUG = YES
+PREFIX = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+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]
+TRUST = $SERVICEHOME/data/credit/
+HOSTS = $SERVICEHOME/data/hosts/
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+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]
+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]
+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]
+DEFAULTSERVICES = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+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
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+
+[dht]
+AUTOSTART = NO
+
+

Copied: gnunet/src/transport/test_quota_compliance_tcp_peer2.conf (from rev 
13451, gnunet/src/transport/test_quota_compliance_peer2.conf)
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer2.conf                   
        (rev 0)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer2.conf   2010-10-29 
12:22:33 UTC (rev 13453)
@@ -0,0 +1,108 @@
+[PATHS]
+SERVICEHOME = /tmp/test_quota_compliance_peer2
+DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
+
+[transport-udp]
+PORT = 3094
+
+[transport-tcp]
+TIMEOUT = 300000
+PORT = 3094
+BINDTO = 127.0.0.1
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[hostlist]
+HTTP-PROXY = 
+SERVERS = http://gnunet.org:8080/
+OPTIONS = -b
+BINARY = gnunet-daemon-hostlist
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+HTTPPORT = 8080
+
+[topology]
+BINARY = gnunet-daemon-topology
+CONFIG = $DEFAULTCONFIG
+FRIENDS = $SERVICEHOME/friends
+TARGET-CONNECTION-COUNT = 16
+AUTOCONNECT = YES
+FRIENDS-ONLY = NO
+MINIMUM-FRIENDS = 0
+
+[core]
+AUTOSTART = NO
+
+[transport]
+plugins = tcp
+#DEBUG = YES
+PREFIX = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+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]
+TRUST = $SERVICEHOME/data/credit/
+HOSTS = $SERVICEHOME/data/hosts/
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+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]
+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]
+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]
+DEFAULTSERVICES = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+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
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+
+[dht]
+AUTOSTART = NO
+
+




reply via email to

[Prev in Thread] Current Thread [Next in Thread]