From 023341188d45494c26044c839ce5a0be83d206c9 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 28 Aug 2012 10:51:34 +0000 Subject: qutoa --- src/transport/Makefile.am | 29 +++++++++++++++------- .../test_quota_compliance_http_peer1.conf | 5 ++-- .../test_quota_compliance_http_peer2.conf | 7 ++++-- 3 files changed, 27 insertions(+), 14 deletions(-) (limited to 'src/transport') diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 8ca6bf99a..a2fa0f0e9 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -29,6 +29,9 @@ if HAVE_LIBCURL 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 @@ -38,8 +41,6 @@ if FALSE 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 @@ test_transport_api_reliability_http_LDADD = \ $(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 @@ test_quota_compliance_http_LDADD = \ $(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 diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index f56b1578a..9f3fa97ad 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf @@ -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 @@ UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock [transport] PORT = 4011 -PLUGINS = http +PLUGINS = http_client UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 20ef5829f..5dd356d96 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf @@ -3,8 +3,11 @@ 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 @@ -24,7 +27,7 @@ UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock [transport] PORT = 3011 -PLUGINS = http +PLUGINS = http_server UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock -- cgit v1.2.3