[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23467 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23467 - gnunet/src/transport |
Date: |
Tue, 28 Aug 2012 11:55:43 +0200 |
Author: wachs
Date: 2012-08-28 11:55:43 +0200 (Tue, 28 Aug 2012)
New Revision: 23467
Modified:
gnunet/src/transport/Makefile.am
gnunet/src/transport/plugin_transport_http_common.h
gnunet/src/transport/test_transport_api_http_peer2.conf
gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
Log:
test conf updates
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2012-08-28 09:15:43 UTC (rev 23466)
+++ gnunet/src/transport/Makefile.am 2012-08-28 09:55:43 UTC (rev 23467)
@@ -27,19 +27,20 @@
if HAVE_MHD
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
+
+ HTTPS_API_TEST = test_transport_api_https
endif
endif
-if FALSE
- HTTP_API_TEST = test_transport_api_http
- HTTP_NAT_API_TEST = test_transport_api_http_nat
- HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
+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_API_TEST = test_transport_api_https
HTTPS_NAT_API_TEST = test_transport_api_https_nat
HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
HTTPS_REL_TEST = test_transport_api_reliability_https
@@ -381,7 +382,6 @@
$(UNIX_PLUGIN_TEST) \
$(UNIX_PLUGIN_TIMEOUT_TEST) \
test_transport_api_udp_nat \
- test_transport_api_http \
$(HTTP_API_TEST) \
$(HTTP_NAT_API_TEST) \
$(HTTP_API_TIMEOUT_TEST) \
@@ -663,26 +663,42 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-# HTTP/S tests
-
+# HTTP tests
test_transport_api_http_SOURCES = \
test_transport_api.c
test_transport_api_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
-
-if FALSE
-
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+
test_transport_api_timeout_http_SOURCES = \
test_transport_api_timeout.c
test_transport_api_timeout_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_transport_api_reliability_http_SOURCES = \
+ test_transport_api_reliability.c
+test_transport_api_reliability_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
+# HTTPS tests
+test_transport_api_https_SOURCES = \
+ test_transport_api.c
+test_transport_api_https_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
+
+if FALSE
+
test_transport_api_timeout_https_SOURCES = \
test_transport_api_timeout.c
test_transport_api_timeout_https_LDADD = \
@@ -699,14 +715,6 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-test_transport_api_reliability_http_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_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_transport_api_reliability_http_nat_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_http_nat_LDADD = \
@@ -715,14 +723,6 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransporttesting.la
-test_transport_api_https_SOURCES = \
- test_transport_api.c
-test_transport_api_https_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_transport_api_https_nat_SOURCES = \
test_transport_api.c
test_transport_api_https_nat_LDADD = \
Modified: gnunet/src/transport/plugin_transport_http_common.h
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.h 2012-08-28 09:15:43 UTC
(rev 23466)
+++ gnunet/src/transport/plugin_transport_http_common.h 2012-08-28 09:55:43 UTC
(rev 23467)
@@ -30,7 +30,7 @@
/**
* Timeout values for testing
*/
-#define TESTING GNUNET_YES
+#define TESTING GNUNET_NO
#if TESTING
Modified: gnunet/src/transport/test_transport_api_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer2.conf 2012-08-28
09:15:43 UTC (rev 23466)
+++ gnunet/src/transport/test_transport_api_http_peer2.conf 2012-08-28
09:55:43 UTC (rev 23467)
@@ -5,6 +5,8 @@
[transport-http_server]
PORT = 12090
+USE_IPv6 = NO
+BINDTO = 127.0.0.1
[arm]
PORT = 12095
@@ -28,4 +30,4 @@
PORT = 12091
PLUGINS = http_server
UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2012-08-28 09:15:43 UTC (rev 23466)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2012-08-28 09:55:43 UTC (rev 23467)
@@ -3,6 +3,8 @@
SERVICEHOME = /tmp/test-transport/api-http-p1/
DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf
+[transport-http_client]
+
[transport-tcp]
TIMEOUT = 5 s
@@ -27,7 +29,7 @@
[transport]
PORT = 12181
-PLUGINS = http
+PLUGINS = http_client
UNIXPATH = /tmp/gnunet-p1-service-transport.sock
#DEBUG = YES
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
2012-08-28 09:15:43 UTC (rev 23466)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
2012-08-28 09:55:43 UTC (rev 23467)
@@ -3,8 +3,10 @@
SERVICEHOME = /tmp/test-transport/api-http-p2/
DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf
-[transport-http]
-PORT = 12190
+[transport-http_server]
+PORT = 12090
+USE_IPv6 = NO
+BINDTO = 127.0.0.1
[arm]
PORT = 12195
@@ -24,7 +26,7 @@
[transport]
PORT = 12191
-PLUGINS = http
+PLUGINS = http_server
UNIXPATH = /tmp/gnunet-p2-service-transport.sock
#DEBUG = YES
Modified: gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
2012-08-28 09:15:43 UTC (rev 23466)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
2012-08-28 09:55:43 UTC (rev 23467)
@@ -1,12 +1,11 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_http_peer1.conf
+DEFAULTCONFIG = test_transport_api_timeout_http_peer1.conf
[nat]
-[transport-http]
-PORT = 12080
+[transport-http_client]
[arm]
PORT = 12085
@@ -28,7 +27,7 @@
[transport]
#DEBUG = YES
PORT = 12081
-PLUGINS = http
+PLUGINS = http_client
#BINARY = .libs/gnunet-service-transport
UNIXPATH = /tmp/gnunet-p1-service-transport.sock
#PREFIX = valgrind --leak-check=full
Modified: gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
2012-08-28 09:15:43 UTC (rev 23466)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
2012-08-28 09:55:43 UTC (rev 23467)
@@ -1,13 +1,16 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_http_peer2.conf
+DEFAULTCONFIG = test_transport_api_timeout_http_peer2.conf
[nat]
-[transport-http]
+[transport-http_server]
PORT = 12090
+USE_IPv6 = NO
+BINDTO = 127.0.0.1
+
[arm]
PORT = 12095
DEFAULTSERVICES = transport
@@ -28,6 +31,6 @@
[transport]
#DEBUG = YES
PORT = 12091
-PLUGINS = http
+PLUGINS = http_server
UNIXPATH = /tmp/gnunet-p2-service-transport.sock
#PREFIX = valgrind --leak-check=full
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23467 - gnunet/src/transport,
gnunet <=