summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-10-29 12:22:33 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-10-29 12:22:33 +0000
commit3c96ac35df35d267713bd89a0bc9cd8df99215bc (patch)
tree5ae259ba3a16f34774d7377a29e2a989b56556c6 /src
parentd028f7bccb02874f92c60127c5dbd90112a79202 (diff)
Adding quota compliance test for http
Diffstat (limited to 'src')
-rw-r--r--src/transport/Makefile.am22
-rw-r--r--src/transport/test_quota_compliance.c24
-rw-r--r--src/transport/test_quota_compliance_http_peer1.conf108
-rw-r--r--src/transport/test_quota_compliance_http_peer2.conf117
-rw-r--r--src/transport/test_quota_compliance_tcp_peer1.conf (renamed from src/transport/test_quota_compliance_peer1.conf)4
-rw-r--r--src/transport/test_quota_compliance_tcp_peer2.conf (renamed from src/transport/test_quota_compliance_peer2.conf)2
6 files changed, 256 insertions, 21 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 3fae21572..067e882a2 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -201,7 +201,8 @@ check_PROGRAMS = \
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 @@ TESTS = \
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,9 +307,15 @@ test_transport_api_reliability_https_LDADD = \
$(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
@@ -335,5 +343,7 @@ EXTRA_DIST = \
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
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 5a41f20ca..0c5acbdc3 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -578,31 +578,33 @@ run (void *cls,
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);
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
new file mode 100644
index 000000000..190410d91
--- /dev/null
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -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
+
+
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
new file mode 100644
index 000000000..b69e77200
--- /dev/null
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -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
+
+
diff --git a/src/transport/test_quota_compliance_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index 32e422a71..258f9ba98 100644
--- a/src/transport/test_quota_compliance_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -1,8 +1,6 @@
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_peer1.conf
-
-
+DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
[fs]
AUTOSTART = NO
diff --git a/src/transport/test_quota_compliance_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index ded0d096c..117e3d1ca 100644
--- a/src/transport/test_quota_compliance_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -1,6 +1,6 @@
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_peer2.conf
+DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
[transport-udp]
PORT = 3094