From 902dff71fb8458cedf4999ce259d0870c0d9e48e Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 5 Oct 2011 12:39:50 +0000 Subject: http/https nat tests --- src/transport/Makefile.am | 22 +++++++++++ ...t_transport_api_reliability_http_nat_peer1.conf | 44 ++++++++++++++++++++++ ...t_transport_api_reliability_http_nat_peer2.conf | 38 +++++++++++++++++++ ..._transport_api_reliability_https_nat_peer1.conf | 40 ++++++++++++++++++++ ..._transport_api_reliability_https_nat_peer2.conf | 36 ++++++++++++++++++ 5 files changed, 180 insertions(+) create mode 100644 src/transport/test_transport_api_reliability_http_nat_peer1.conf create mode 100644 src/transport/test_transport_api_reliability_http_nat_peer2.conf create mode 100644 src/transport/test_transport_api_reliability_https_nat_peer1.conf create mode 100644 src/transport/test_transport_api_reliability_https_nat_peer2.conf diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 8ca01eaf7..d8821e499 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -10,6 +10,7 @@ if HAVE_MHD HTTP_NAT_API_TEST = test_transport_api_http_nat HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http 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_recv_constant HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la @@ -17,6 +18,7 @@ if HAVE_MHD 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 + HTTPS_NAT_REL_TEST = test_transport_api_reliability_https_nat HTTPS_QUOTA_TEST = test_quota_compliance_https \ test_quota_compliance_https_asymmetric_recv_constant endif @@ -273,7 +275,9 @@ check_PROGRAMS = \ test_transport_api_unreliability_constant_udp \ $(UNIX_REL_TEST) \ $(HTTP_REL_TEST) \ + $(HTTP_NAT_REL_TEST) \ $(HTTPS_REL_TEST) \ + $(HTTPS_NAT_REL_TEST) \ test_quota_compliance_tcp \ test_quota_compliance_tcp_asymmetric_recv_constant \ test_quota_compliance_udp \ @@ -310,7 +314,9 @@ TESTS = \ test_transport_api_unreliability_constant_udp \ $(UNIX_REL_TEST) \ $(HTTP_REL_TEST) \ + $(HTTP_NAT_REL_TEST) \ $(HTTPS_REL_TEST) \ + $(HTTPS_NAT_REL_TEST) \ test_quota_compliance_tcp \ test_quota_compliance_tcp_asymmetric_recv_constant \ test_quota_compliance_udp \ @@ -492,6 +498,14 @@ test_transport_api_reliability_http_LDADD = \ $(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 = \ + $(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_SOURCES = \ test_transport_api.c test_transport_api_https_LDADD = \ @@ -516,6 +530,14 @@ test_transport_api_reliability_https_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/transport/libgnunettransporttesting.la +test_transport_api_reliability_https_nat_SOURCES = \ + test_transport_api_reliability.c +test_transport_api_reliability_https_nat_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_unreliability_unix_SOURCES = \ test_transport_api_unreliability.c test_transport_api_unreliability_unix_LDADD = \ diff --git a/src/transport/test_transport_api_reliability_http_nat_peer1.conf b/src/transport/test_transport_api_reliability_http_nat_peer1.conf new file mode 100644 index 000000000..48707a730 --- /dev/null +++ b/src/transport/test_transport_api_reliability_http_nat_peer1.conf @@ -0,0 +1,44 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-http-p1/ +DEFAULTCONFIG = test_transport_api_http_nat_peer1.conf + +[nat] +BEHIND_NAT = YES +ENABLE_NAT_SERVER = YES +DISABLEV6 = YES + +[transport-http] +PORT = 0 +USE_IPv6 = YES +USE_IPv4 = YES +DISABLEV6 = NO +#BINDTO = 127.0.0.1 +#BINDTO6 = ::1 + +[arm] +PORT = 12085 +DEFAULTSERVICES = transport +UNIXPATH = /tmp/gnunet-p1-service-arm.sock + +[statistics] +PORT = 12084 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock + +[resolver] +PORT = 12083 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock + +[peerinfo] +PORT = 12082 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock + +[transport] +#DEBUG = YES +PORT = 12081 +PLUGINS = http +#BINARY = .libs/gnunet-service-transport +UNIXPATH = /tmp/gnunet-p1-service-transport.sock +#PREFIX = valgrind --leak-check=full +#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args + diff --git a/src/transport/test_transport_api_reliability_http_nat_peer2.conf b/src/transport/test_transport_api_reliability_http_nat_peer2.conf new file mode 100644 index 000000000..d754457bc --- /dev/null +++ b/src/transport/test_transport_api_reliability_http_nat_peer2.conf @@ -0,0 +1,38 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-http-p2/ +DEFAULTCONFIG = test_transport_api_http_nat_peer2.conf + +[nat] +DISABLEV6 = NO + +[transport-http] +PORT = 12090 +USE_IPv6 = YES +USE_IPv4 = YES +DISABLEV6 = NO +#BINDTO = 127.0.0.1 + +[arm] +PORT = 12095 +DEFAULTSERVICES = transport +UNIXPATH = /tmp/gnunet-p2-service-arm.sock + +[statistics] +PORT = 12094 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock + +[resolver] +PORT = 12093 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock + +[peerinfo] +PORT = 12092 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock + +[transport] +#DEBUG = YES +PORT = 12091 +PLUGINS = http +UNIXPATH = /tmp/gnunet-p2-service-transport.sock +#PREFIX = valgrind --leak-check=full diff --git a/src/transport/test_transport_api_reliability_https_nat_peer1.conf b/src/transport/test_transport_api_reliability_https_nat_peer1.conf new file mode 100644 index 000000000..6c87aeed4 --- /dev/null +++ b/src/transport/test_transport_api_reliability_https_nat_peer1.conf @@ -0,0 +1,40 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-https-p1/ +DEFAULTCONFIG = test_transport_api_https_nat_peer1.conf + +[nat] +BEHIND_NAT = YES +ENABLE_NAT_SERVER = YES +DISABLEV6 = YES + +[transport-https] +PORT = 0 +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL +KEY_FILE = $SERVICEHOME/https_key_p1.key +CERT_FILE = $SERVICEHOME/https_cert_p1.crt +USE_IPv6 = YES +USE_IPv4 = YES + +[arm] +PORT = 12105 + +[statistics] +PORT = 12104 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock + +[resolver] +PORT = 12103 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock + +[peerinfo] +PORT = 12102 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock + +[transport] +PORT = 12101 +PLUGINS = https +UNIXPATH = /tmp/gnunet-p1-service-transport.sock +DEBUG = NO + + diff --git a/src/transport/test_transport_api_reliability_https_nat_peer2.conf b/src/transport/test_transport_api_reliability_https_nat_peer2.conf new file mode 100644 index 000000000..6833ba512 --- /dev/null +++ b/src/transport/test_transport_api_reliability_https_nat_peer2.conf @@ -0,0 +1,36 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-https-p2/ +DEFAULTCONFIG = test_transport_api_https_nat_peer2.conf + +[transport-https] +PORT = 12110 +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL +KEY_FILE = $SERVICEHOME/https_key_p2.key +CERT_FILE = $SERVICEHOME/https_cert_p2.crt +USE_IPv6 = YES +USE_IPv4 = YES + +[arm] +PORT = 12115 +UNIXPATH = /tmp/gnunet-p2-service-arm.sock + +[statistics] +PORT = 12114 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock + +[resolver] +PORT = 12113 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock + +[peerinfo] +PORT = 12112 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock + +[transport] +PORT = 12111 +PLUGINS = https +UNIXPATH = /tmp/gnunet-p2-service-transport.sock +DEBUG = NO + + -- cgit v1.2.3