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

[gnunet]

Author: wachs
Date: 2012-08-28 12:51:34 +0200 (Tue, 28 Aug 2012)
New Revision: 23470

Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/test_quota_compliance_http_peer1.conf
   gnunet/src/transport/test_quota_compliance_http_peer2.conf
Log:
qutoa


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2012-08-28 10:19:37 UTC (rev 23469)
+++ gnunet/src/transport/Makefile.am    2012-08-28 10:51:34 UTC (rev 23470)
@@ -29,7 +29,10 @@
  HTTP_API_TEST = test_transport_api_http
  HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
  HTTP_REL_TEST = test_transport_api_reliability_http
+ HTTP_QUOTA_TEST = test_quota_compliance_http \
+                  test_quota_compliance_http_asymmetric
  
+ 
  HTTPS_API_TEST = test_transport_api_https
 endif
 endif 
@@ -38,8 +41,6 @@
 
  HTTP_REL_TEST = test_transport_api_reliability_http
  HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat
- HTTP_QUOTA_TEST = test_quota_compliance_http \
-                  test_quota_compliance_http_asymmetric
 
  HTTPS_NAT_API_TEST = test_transport_api_https_nat
  HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
@@ -688,6 +689,23 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
+test_quota_compliance_http_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_http_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la 
+
+test_quota_compliance_http_asymmetric_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_http_asymmetric_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
+
 # HTTPS tests
 test_transport_api_https_SOURCES = \
  test_transport_api.c
@@ -755,13 +773,6 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
-test_quota_compliance_http_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_http_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
 
 test_quota_compliance_https_SOURCES = \
  test_quota_compliance.c

Modified: gnunet/src/transport/test_quota_compliance_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer1.conf  2012-08-28 
10:19:37 UTC (rev 23469)
+++ gnunet/src/transport/test_quota_compliance_http_peer1.conf  2012-08-28 
10:51:34 UTC (rev 23470)
@@ -3,8 +3,7 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1
 DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
 
-[transport-http]
-PORT = 4010
+[transport-http_client]
 
 [arm]
 PORT = 4015
@@ -24,7 +23,7 @@
 
 [transport]
 PORT = 4011
-PLUGINS = http
+PLUGINS = http_client
 UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock
 
 

Modified: gnunet/src/transport/test_quota_compliance_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer2.conf  2012-08-28 
10:19:37 UTC (rev 23469)
+++ gnunet/src/transport/test_quota_compliance_http_peer2.conf  2012-08-28 
10:51:34 UTC (rev 23470)
@@ -3,9 +3,12 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
 
-[transport-http]
+[transport-http_server]
 PORT = 3010
+USE_IPv6 = NO
+BINDTO = 127.0.0.1
 
+
 [arm]
 PORT = 3015
 UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock
@@ -24,7 +27,7 @@
 
 [transport]
 PORT = 3011
-PLUGINS = http
+PLUGINS = http_server
 UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock