diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-08-28 10:51:34 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-08-28 10:51:34 +0000 |
commit | 023341188d45494c26044c839ce5a0be83d206c9 (patch) | |
tree | 58eb308b5ce775c81820f236b922e60ee879b2fe | |
parent | d5e22448da44609433a2f29eea6f8b4f47fc4cbc (diff) | |
download | gnunet-023341188d45494c26044c839ce5a0be83d206c9.tar.gz gnunet-023341188d45494c26044c839ce5a0be83d206c9.zip |
qutoa
-rw-r--r-- | src/transport/Makefile.am | 29 | ||||
-rw-r--r-- | src/transport/test_quota_compliance_http_peer1.conf | 5 | ||||
-rw-r--r-- | src/transport/test_quota_compliance_http_peer2.conf | 7 |
3 files changed, 27 insertions, 14 deletions
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 | |||
29 | HTTP_API_TEST = test_transport_api_http | 29 | HTTP_API_TEST = test_transport_api_http |
30 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http | 30 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http |
31 | HTTP_REL_TEST = test_transport_api_reliability_http | 31 | HTTP_REL_TEST = test_transport_api_reliability_http |
32 | HTTP_QUOTA_TEST = test_quota_compliance_http \ | ||
33 | test_quota_compliance_http_asymmetric | ||
34 | |||
32 | 35 | ||
33 | HTTPS_API_TEST = test_transport_api_https | 36 | HTTPS_API_TEST = test_transport_api_https |
34 | endif | 37 | endif |
@@ -38,8 +41,6 @@ if FALSE | |||
38 | 41 | ||
39 | HTTP_REL_TEST = test_transport_api_reliability_http | 42 | HTTP_REL_TEST = test_transport_api_reliability_http |
40 | HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat | 43 | HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat |
41 | HTTP_QUOTA_TEST = test_quota_compliance_http \ | ||
42 | test_quota_compliance_http_asymmetric | ||
43 | 44 | ||
44 | HTTPS_NAT_API_TEST = test_transport_api_https_nat | 45 | HTTPS_NAT_API_TEST = test_transport_api_https_nat |
45 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https | 46 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https |
@@ -688,6 +689,23 @@ test_transport_api_reliability_http_LDADD = \ | |||
688 | $(top_builddir)/src/util/libgnunetutil.la \ | 689 | $(top_builddir)/src/util/libgnunetutil.la \ |
689 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 690 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
690 | 691 | ||
692 | test_quota_compliance_http_SOURCES = \ | ||
693 | test_quota_compliance.c | ||
694 | test_quota_compliance_http_LDADD = \ | ||
695 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
696 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
697 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
698 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
699 | |||
700 | test_quota_compliance_http_asymmetric_SOURCES = \ | ||
701 | test_quota_compliance.c | ||
702 | test_quota_compliance_http_asymmetric_LDADD = \ | ||
703 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
704 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
705 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
706 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
707 | |||
708 | |||
691 | # HTTPS tests | 709 | # HTTPS tests |
692 | test_transport_api_https_SOURCES = \ | 710 | test_transport_api_https_SOURCES = \ |
693 | test_transport_api.c | 711 | test_transport_api.c |
@@ -755,13 +773,6 @@ test_quota_compliance_http_LDADD = \ | |||
755 | $(top_builddir)/src/util/libgnunetutil.la \ | 773 | $(top_builddir)/src/util/libgnunetutil.la \ |
756 | $(top_builddir)/src/transport/libgnunettransporttesting.la | 774 | $(top_builddir)/src/transport/libgnunettransporttesting.la |
757 | 775 | ||
758 | test_quota_compliance_http_asymmetric_SOURCES = \ | ||
759 | test_quota_compliance.c | ||
760 | test_quota_compliance_http_asymmetric_LDADD = \ | ||
761 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
762 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
763 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
764 | $(top_builddir)/src/transport/libgnunettransporttesting.la | ||
765 | 776 | ||
766 | test_quota_compliance_https_SOURCES = \ | 777 | test_quota_compliance_https_SOURCES = \ |
767 | test_quota_compliance.c | 778 | 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 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 |
4 | DEFAULTCONFIG = test_quota_compliance_http_peer1.conf | 4 | DEFAULTCONFIG = test_quota_compliance_http_peer1.conf |
5 | 5 | ||
6 | [transport-http] | 6 | [transport-http_client] |
7 | PORT = 4010 | ||
8 | 7 | ||
9 | [arm] | 8 | [arm] |
10 | PORT = 4015 | 9 | PORT = 4015 |
@@ -24,7 +23,7 @@ UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock | |||
24 | 23 | ||
25 | [transport] | 24 | [transport] |
26 | PORT = 4011 | 25 | PORT = 4011 |
27 | PLUGINS = http | 26 | PLUGINS = http_client |
28 | UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock | 27 | UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock |
29 | 28 | ||
30 | 29 | ||
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 @@ | |||
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_http_peer2.conf | 4 | DEFAULTCONFIG = test_quota_compliance_http_peer2.conf |
5 | 5 | ||
6 | [transport-http] | 6 | [transport-http_server] |
7 | PORT = 3010 | 7 | PORT = 3010 |
8 | USE_IPv6 = NO | ||
9 | BINDTO = 127.0.0.1 | ||
10 | |||
8 | 11 | ||
9 | [arm] | 12 | [arm] |
10 | PORT = 3015 | 13 | PORT = 3015 |
@@ -24,7 +27,7 @@ UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock | |||
24 | 27 | ||
25 | [transport] | 28 | [transport] |
26 | PORT = 3011 | 29 | PORT = 3011 |
27 | PLUGINS = http | 30 | PLUGINS = http_server |
28 | UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock | 31 | UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock |
29 | 32 | ||
30 | 33 | ||