[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22336 - in gnunet/src: . gns pt vpn
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r22336 - in gnunet/src: . gns pt vpn |
|
Date: |
Wed, 27 Jun 2012 12:26:21 +0200 |
Author: schanzen
Date: 2012-06-27 12:26:20 +0200 (Wed, 27 Jun 2012)
New Revision: 22336
Added:
gnunet/src/pt/test_gns_vpn.c
gnunet/src/pt/test_gns_vpn.conf
gnunet/src/pt/test_gnunet_vpn.c
gnunet/src/pt/test_gnunet_vpn.conf
Removed:
gnunet/src/vpn/test_gns_vpn.c
gnunet/src/vpn/test_gns_vpn.conf
gnunet/src/vpn/test_gnunet_vpn.c
gnunet/src/vpn/test_gnunet_vpn.conf
Modified:
gnunet/src/Makefile.am
gnunet/src/gns/gnunet-service-gns.c
gnunet/src/pt/Makefile.am
gnunet/src/vpn/Makefile.am
Log:
-fix order
Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am 2012-06-27 10:22:13 UTC (rev 22335)
+++ gnunet/src/Makefile.am 2012-06-27 10:26:20 UTC (rev 22336)
@@ -8,7 +8,7 @@
if LINUX
# All of these currently only work on GNU/Linux
- LINUX_DIR = dns vpn gns exit pt
+ LINUX_DIR = dns exit vpn gns pt
endif
if HAVE_MYSQL
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-06-27 10:22:13 UTC (rev 22335)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-06-27 10:26:20 UTC (rev 22336)
@@ -1081,7 +1081,7 @@
&max_record_put_interval))
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Record put interval: %d\n",
+ "Record put interval: %llu\n",
max_record_put_interval);
}
@@ -1091,7 +1091,7 @@
&max_parallel_bg_queries))
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Number of allowed parallel background queries: %d\n",
+ "Number of allowed parallel background queries: %llu\n",
max_parallel_bg_queries);
}
@@ -1110,7 +1110,7 @@
&default_lookup_timeout_secs))
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Default lookup timeout: %ds\n", default_lookup_timeout_secs);
+ "Default lookup timeout: %llus\n", default_lookup_timeout_secs);
default_lookup_timeout = GNUNET_TIME_relative_multiply(
GNUNET_TIME_UNIT_SECONDS,
default_lookup_timeout_secs);
Modified: gnunet/src/pt/Makefile.am
===================================================================
--- gnunet/src/pt/Makefile.am 2012-06-27 10:22:13 UTC (rev 22335)
+++ gnunet/src/pt/Makefile.am 2012-06-27 10:26:20 UTC (rev 22336)
@@ -29,3 +29,69 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/mesh/libgnunetmesh.la \
$(GN_LIBINTL)
+
+check_PROGRAMS = $(VPN_TEST)
+
+if ENABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
+
+EXTRA_DIST = \
+ test_gnunet_vpn.conf \
+ test_gns_vpn.conf
+
+if HAVE_MHD
+ VPN_TEST = \
+ test_gnunet_vpn-4_to_6 \
+ test_gnunet_vpn-6_to_4 \
+ test_gnunet_vpn-6_over \
+ test_gnunet_vpn-4_over \
+ test_gns_vpn
+endif
+
+
+test_gns_vpn_SOURCES = \
+ test_gns_vpn.c
+test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_gnunet_vpn_4_over_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
+test_gnunet_vpn_4_over_SOURCES = \
+ test_gnunet_vpn.c
+test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_gnunet_vpn_4_over_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
+test_gnunet_vpn_6_over_SOURCES = \
+ test_gnunet_vpn.c
+test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_gnunet_vpn_6_over_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
+test_gnunet_vpn_4_to_6_SOURCES = \
+ test_gnunet_vpn.c
+test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_gnunet_vpn_4_to_6_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
+test_gnunet_vpn_6_to_4_SOURCES = \
+ test_gnunet_vpn.c
+test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_gnunet_vpn_6_to_4_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
Copied: gnunet/src/pt/test_gns_vpn.c (from rev 22330,
gnunet/src/vpn/test_gns_vpn.c)
===================================================================
--- gnunet/src/pt/test_gns_vpn.c (rev 0)
+++ gnunet/src/pt/test_gns_vpn.c 2012-06-27 10:26:20 UTC (rev 22336)
@@ -0,0 +1,491 @@
+/*
+ This file is part of GNUnet
+ (C) 2007, 2009, 2011, 2012 Christian Grothoff
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file test_gns_vpn.c
+ * @brief testcase for accessing VPN services via GNS
+ * @author Martin Schanzenbach
+ */
+#include "platform.h"
+#include <curl/curl.h>
+#include <microhttpd.h>
+#include "gnunet_namestore_service.h"
+#include "gnunet_gns_service.h"
+#include "gnunet_testing_lib-new.h"
+
+#define PORT 8080
+#define TEST_DOMAIN "www.gnunet"
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+
+/**
+ * Return value for 'main'.
+ */
+static int global_ret;
+
+static struct GNUNET_NAMESTORE_Handle *namestore;
+
+static struct MHD_Daemon *mhd;
+
+static GNUNET_SCHEDULER_TaskIdentifier mhd_task_id;
+
+static GNUNET_SCHEDULER_TaskIdentifier curl_task_id;
+
+static CURL *curl;
+
+static CURLM *multi;
+
+static char *url;
+
+/**
+ * IP address of the ultimate destination.
+ */
+static const char *dest_ip;
+
+/**
+ * Address family of the dest_ip.
+ */
+static int dest_af;
+
+/**
+ * Address family to use by the curl client.
+ */
+static int src_af;
+
+static int use_v6;
+
+
+struct CBC
+{
+ char buf[1024];
+ size_t pos;
+};
+
+static struct CBC cbc;
+
+
+static size_t
+copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx)
+{
+ struct CBC *cbc = ctx;
+
+ if (cbc->pos + size * nmemb > sizeof(cbc->buf))
+ return 0; /* overflow */
+ memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb);
+ cbc->pos += size * nmemb;
+ return size * nmemb;
+}
+
+
+static int
+mhd_ahc (void *cls,
+ struct MHD_Connection *connection,
+ const char *url,
+ const char *method,
+ const char *version,
+ const char *upload_data, size_t *upload_data_size,
+ void **unused)
+{
+ static int ptr;
+ struct MHD_Response *response;
+ int ret;
+
+ if (0 != strcmp ("GET", method))
+ return MHD_NO; /* unexpected method */
+ if (&ptr != *unused)
+ {
+ *unused = &ptr;
+ return MHD_YES;
+ }
+ *unused = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MHD sends respose for request to URL
`%s'\n", url);
+ response = MHD_create_response_from_buffer (strlen (url),
+ (void *) url,
+ MHD_RESPMEM_MUST_COPY);
+ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ if (ret == MHD_NO)
+ abort ();
+ return ret;
+}
+
+
+static void
+do_shutdown ()
+{
+ if (mhd_task_id != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (mhd_task_id);
+ mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (curl_task_id != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (curl_task_id);
+ curl_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != mhd)
+ {
+ MHD_stop_daemon (mhd);
+ mhd = NULL;
+ }
+ GNUNET_free_non_null (url);
+ url = NULL;
+}
+
+
+/**
+ * Function to run the HTTP client.
+ */
+static void
+curl_main (void);
+
+
+static void
+curl_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ curl_task_id = GNUNET_SCHEDULER_NO_TASK;
+ curl_main ();
+}
+
+
+static void
+curl_main ()
+{
+ fd_set rs;
+ fd_set ws;
+ fd_set es;
+ int max;
+ struct GNUNET_NETWORK_FDSet nrs;
+ struct GNUNET_NETWORK_FDSet nws;
+ struct GNUNET_TIME_Relative delay;
+ long timeout;
+ int running;
+ struct CURLMsg *msg;
+
+ max = 0;
+ FD_ZERO (&rs);
+ FD_ZERO (&ws);
+ FD_ZERO (&es);
+ curl_multi_perform (multi, &running);
+ if (running == 0)
+ {
+ GNUNET_assert (NULL != (msg = curl_multi_info_read (multi, &running)));
+ if (msg->msg == CURLMSG_DONE)
+ {
+ if (msg->data.result != CURLE_OK)
+ {
+ fprintf (stderr,
+ "%s failed at %s:%d: `%s'\n",
+ "curl_multi_perform",
+ __FILE__,
+ __LINE__, curl_easy_strerror (msg->data.result));
+ global_ret = 1;
+ }
+ }
+ curl_multi_remove_handle (multi, curl);
+ curl_multi_cleanup (multi);
+ curl_easy_cleanup (curl);
+ curl = NULL;
+ multi = NULL;
+ if (cbc.pos != strlen ("/hello_world"))
+ {
+ GNUNET_break (0);
+ global_ret = 2;
+ }
+ if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))
+ {
+ GNUNET_break (0);
+ global_ret = 3;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download complete, shutting
down!\n");
+ do_shutdown ();
+ return;
+ }
+ GNUNET_assert (CURLM_OK == curl_multi_fdset (multi, &rs, &ws, &es, &max));
+ if ( (CURLM_OK != curl_multi_timeout (multi, &timeout)) ||
+ (-1 == timeout) )
+ delay = GNUNET_TIME_UNIT_SECONDS;
+ else
+ delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
(unsigned int) timeout);
+ GNUNET_NETWORK_fdset_copy_native (&nrs,
+ &rs,
+ max + 1);
+ GNUNET_NETWORK_fdset_copy_native (&nws,
+ &ws,
+ max + 1);
+ curl_task_id = GNUNET_SCHEDULER_add_select
(GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ delay,
+ &nrs,
+ &nws,
+ &curl_task,
+ NULL);
+}
+
+static void
+start_curl (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_asprintf (&url,
+ "http://%s/hello_world";,
+ TEST_DOMAIN);
+ curl = curl_easy_init ();
+ curl_easy_setopt (curl, CURLOPT_URL, url);
+ curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ©_buffer);
+ curl_easy_setopt (curl, CURLOPT_WRITEDATA, &cbc);
+ curl_easy_setopt (curl, CURLOPT_FAILONERROR, 1);
+ curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L);
+ curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 15L);
+ curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1);
+
+ multi = curl_multi_init ();
+ GNUNET_assert (multi != NULL);
+ GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Beginning HTTP download from `%s'\n",
url);
+ curl_main ();
+}
+
+/**
+ * Callback invoked from the namestore service once record is
+ * created.
+ *
+ * @param cls closure
+ * @param af address family, AF_INET or AF_INET6; AF_UNSPEC on error;
+ * will match 'result_af' from the request
+ * @param address IP address (struct in_addr or struct in_addr6, depending on
'af')
+ * that the VPN allocated for the redirection;
+ * traffic to this IP will now be redirected to the
+ * specified target peer; NULL on error
+ */
+static void
+commence_testing (void *cls, int32_t success, const char *emsg)
+{
+ GNUNET_NAMESTORE_disconnect (namestore);
+
+ if ((emsg != NULL) && (GNUNET_YES != success))
+ {
+ fprintf (stderr,
+ "NS failed to create record %s\n", emsg);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10), start_curl, NULL);
+
+}
+
+
+
+
+/**
+ * Function to keep the HTTP server running.
+ */
+static void
+mhd_main (void);
+
+
+static void
+mhd_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
+ MHD_run (mhd);
+ mhd_main ();
+}
+
+
+static void
+mhd_main ()
+{
+ struct GNUNET_NETWORK_FDSet nrs;
+ struct GNUNET_NETWORK_FDSet nws;
+ fd_set rs;
+ fd_set ws;
+ fd_set es;
+ int max_fd;
+ unsigned MHD_LONG_LONG timeout;
+ struct GNUNET_TIME_Relative delay;
+
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == mhd_task_id);
+ FD_ZERO (&rs);
+ FD_ZERO (&ws);
+ FD_ZERO (&es);
+ max_fd = -1;
+ GNUNET_assert (MHD_YES ==
+ MHD_get_fdset (mhd, &rs, &ws, &es, &max_fd));
+ if (MHD_YES == MHD_get_timeout (mhd, &timeout))
+ delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+ (unsigned int) timeout);
+ else
+ delay = GNUNET_TIME_UNIT_FOREVER_REL;
+ GNUNET_NETWORK_fdset_copy_native (&nrs,
+ &rs,
+ max_fd + 1);
+ GNUNET_NETWORK_fdset_copy_native (&nws,
+ &ws,
+ max_fd + 1);
+ mhd_task_id = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ delay,
+ &nrs,
+ &nws,
+ &mhd_task,
+ NULL);
+}
+
+static void
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
+{
+ enum MHD_FLAG flags;
+ struct GNUNET_PeerIdentity id;
+ struct GNUNET_CRYPTO_HashAsciiEncoded peername;
+ struct GNUNET_CRYPTO_RsaPrivateKey *host_key;
+ struct GNUNET_NAMESTORE_RecordData rd;
+ char *rd_string;
+ char *zone_keyfile;
+
+ GNUNET_TESTING_peer_get_identity (peer, &id);
+ GNUNET_CRYPTO_hash_to_enc ((struct GNUNET_HashCode*)&id, &peername);
+
+ namestore = GNUNET_NAMESTORE_connect (cfg);
+ GNUNET_assert (NULL != namestore);
+ flags = MHD_USE_DEBUG;
+ //if (GNUNET_YES == use_v6)
+ // flags |= MHD_USE_IPv6;
+ mhd = MHD_start_daemon (flags,
+ PORT,
+ NULL, NULL,
+ &mhd_ahc, NULL,
+ MHD_OPTION_END);
+ GNUNET_assert (NULL != mhd);
+ mhd_main ();
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "ZONEKEY",
+ &zone_keyfile))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
+ return;
+ }
+
+ host_key = GNUNET_CRYPTO_rsa_key_create_from_file (zone_keyfile);
+ rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value;
+ GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gnunet.");
+ GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value
(GNUNET_GNS_RECORD_VPN,
+ rd_string,
+
(void**)&rd.data,
+ &rd.data_size));
+ rd.record_type = GNUNET_GNS_RECORD_VPN;
+
+ GNUNET_NAMESTORE_record_create (namestore,
+ host_key,
+ "www",
+ &rd,
+ &commence_testing,
+ NULL);
+ GNUNET_free ((void**)rd.data);
+ GNUNET_free (rd_string);
+ GNUNET_free (zone_keyfile);
+ GNUNET_CRYPTO_rsa_key_free (host_key);
+}
+
+
+/**
+ * Test if the given AF is supported by this system.
+ *
+ * @param af to test
+ * @return GNUNET_OK if the AF is supported
+ */
+static int
+test_af (int af)
+{
+ int s;
+
+ s = socket (af, SOCK_STREAM, 0);
+ if (-1 == s)
+ {
+ if (EAFNOSUPPORT == errno)
+ return GNUNET_NO;
+ fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
+ return GNUNET_SYSERR;
+ }
+ close (s);
+ return GNUNET_OK;
+}
+
+
+int
+main (int argc, char *const *argv)
+{
+ if (0 != ACCESS ("/dev/net/tun", R_OK))
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+ "access",
+ "/dev/net/tun");
+ fprintf (stderr,
+ "WARNING: System unable to run test, skipping.\n");
+ return 0;
+ }
+ if ( (GNUNET_YES !=
+ GNUNET_OS_check_helper_binary ("gnunet-helper-vpn")) ||
+ (GNUNET_YES !=
+ GNUNET_OS_check_helper_binary ("gnunet-helper-exit")) ||
+ (GNUNET_YES !=
+ GNUNET_OS_check_helper_binary ("gnunet-helper-dns")))
+ {
+ fprintf (stderr,
+ "WARNING: gnunet-helper-{exit,vpn,dns} binaries in $PATH are not
SUID, refusing to run test (as it would have to fail).\n");
+ fprintf (stderr,
+ "Change $PATH ('.' in $PATH before $GNUNET_PREFIX/bin is
problematic) or permissions (run 'make install' as root) to fix this!\n");
+ return 0;
+ }
+ GNUNET_CRYPTO_setup_hostkey ("test_gns_vpn.conf");
+
+ dest_ip = "169.254.86.1";
+ dest_af = AF_INET;
+ src_af = AF_INET;
+
+ if (GNUNET_OK == test_af (AF_INET6))
+ use_v6 = GNUNET_YES;
+ else
+ use_v6 = GNUNET_NO;
+
+ if ( (GNUNET_OK != test_af (src_af)) ||
+ (GNUNET_OK != test_af (dest_af)) )
+ {
+ fprintf (stderr,
+ "Required address families not supported by this system, skipping
test.\n");
+ return 0;
+ }
+ if (0 != curl_global_init (CURL_GLOBAL_WIN32))
+ {
+ fprintf (stderr, "failed to initialize curl\n");
+ return 2;
+ }
+ if (0 != GNUNET_TESTING_peer_run ("test-gnunet-vpn",
+ "test_gns_vpn.conf",
+ &run, NULL))
+ return 1;
+ GNUNET_DISK_directory_remove ("/tmp/gnunet-test-vpn");
+ return global_ret;
+}
+
+/* end of test_gns_vpn.c */
+
Copied: gnunet/src/pt/test_gns_vpn.conf (from rev 22330,
gnunet/src/vpn/test_gns_vpn.conf)
===================================================================
--- gnunet/src/pt/test_gns_vpn.conf (rev 0)
+++ gnunet/src/pt/test_gns_vpn.conf 2012-06-27 10:26:20 UTC (rev 22336)
@@ -0,0 +1,52 @@
+[PATHS]
+SERVICEHOME = /tmp/gnunet-test-vpn/
+DEFAULTCONFIG = test_gnunet_vpn.conf
+
+[transport]
+PLUGINS = tcp
+
+[arm]
+DEFAULTSERVICES = statistics exit mesh vpn namestore gns
+PORT = 0
+ALLOW_SHUTDOWN = YES
+
+[exit]
+EXIT_IPV4 = YES
+EXIT_IPV6 = YES
+
+# FIXME: can we use 'lo'?
+EXIT_IFNAME = eth1
+
+[testing]
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+[nse]
+WORKBITS = 1
+
+# repeating some values from the default configurations
+# here as the respective network addresses are also
+# hard-wired in the tests and the MUST match (!)
+[vpn]
+IPV6ADDR = FC2D:FDAA:6A26::1
+IPV6PREFIX = 64
+IPV4ADDR = 169.254.20.1
+IPV4MASK = 255.255.255.0
+
+[exit]
+IPV6ADDR = FC5A:04E1:C2BA::1
+IPV6PREFIX = 96
+IPV4ADDR = 169.254.86.1
+IPV4MASK = 255.255.255.0
+
+[www.gnunet.]
+TCP_REDIRECTS = 80:localhost4:8080
+TTL = 3600000
+
+[gns]
+AUTOSTART = YES
+ZONEKEY = $SERVICEHOME/hostkey
+HIJACK_DNS = YES
+
+[namestore]
+AUTOSTART = YES
Copied: gnunet/src/pt/test_gnunet_vpn.c (from rev 22330,
gnunet/src/vpn/test_gnunet_vpn.c)
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.c (rev 0)
+++ gnunet/src/pt/test_gnunet_vpn.c 2012-06-27 10:26:20 UTC (rev 22336)
@@ -0,0 +1,535 @@
+/*
+ This file is part of GNUnet
+ (C) 2007, 2009, 2011, 2012 Christian Grothoff
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file test_gnunet_vpn.c
+ * @brief testcase for tunneling HTTP over the GNUnet VPN
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <curl/curl.h>
+#include <microhttpd.h>
+#include "gnunet_vpn_service.h"
+#include "gnunet_testing_lib-new.h"
+
+#define PORT 48080
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+
+
+/**
+ * Return value for 'main'.
+ */
+static int global_ret;
+
+static struct GNUNET_VPN_Handle *vpn;
+
+static struct MHD_Daemon *mhd;
+
+static GNUNET_SCHEDULER_TaskIdentifier mhd_task_id;
+
+static GNUNET_SCHEDULER_TaskIdentifier curl_task_id;
+
+static GNUNET_SCHEDULER_TaskIdentifier ctrl_c_task_id;
+
+static struct GNUNET_VPN_RedirectionRequest *rr;
+
+static CURL *curl;
+
+static CURLM *multi;
+
+static char *url;
+
+/**
+ * IP address of the ultimate destination.
+ */
+static const char *dest_ip;
+
+/**
+ * Address family of the dest_ip.
+ */
+static int dest_af;
+
+/**
+ * Address family to use by the curl client.
+ */
+static int src_af;
+
+
+struct CBC
+{
+ char buf[1024];
+ size_t pos;
+};
+
+static struct CBC cbc;
+
+
+static size_t
+copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx)
+{
+ struct CBC *cbc = ctx;
+
+ if (cbc->pos + size * nmemb > sizeof(cbc->buf))
+ return 0; /* overflow */
+ memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb);
+ cbc->pos += size * nmemb;
+ return size * nmemb;
+}
+
+
+static int
+mhd_ahc (void *cls,
+ struct MHD_Connection *connection,
+ const char *url,
+ const char *method,
+ const char *version,
+ const char *upload_data, size_t *upload_data_size,
+ void **unused)
+{
+ static int ptr;
+ struct MHD_Response *response;
+ int ret;
+
+ if (0 != strcmp ("GET", method))
+ return MHD_NO; /* unexpected method */
+ if (&ptr != *unused)
+ {
+ *unused = &ptr;
+ return MHD_YES;
+ }
+ *unused = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MHD sends respose for request to URL
`%s'\n", url);
+ response = MHD_create_response_from_buffer (strlen (url),
+ (void *) url,
+ MHD_RESPMEM_MUST_COPY);
+ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ if (ret == MHD_NO)
+ abort ();
+ return ret;
+}
+
+
+static void
+do_shutdown ()
+{
+ if (mhd_task_id != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (mhd_task_id);
+ mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (curl_task_id != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (curl_task_id);
+ curl_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (ctrl_c_task_id != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (ctrl_c_task_id);
+ ctrl_c_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != mhd)
+ {
+ MHD_stop_daemon (mhd);
+ mhd = NULL;
+ }
+ if (NULL != rr)
+ {
+ GNUNET_VPN_cancel_request (rr);
+ rr = NULL;
+ }
+ if (NULL != vpn)
+ {
+ GNUNET_VPN_disconnect (vpn);
+ vpn = NULL;
+ }
+ GNUNET_free_non_null (url);
+ url = NULL;
+}
+
+
+/**
+ * Function to run the HTTP client.
+ */
+static void
+curl_main (void);
+
+
+static void
+curl_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ curl_task_id = GNUNET_SCHEDULER_NO_TASK;
+ curl_main ();
+}
+
+
+static void
+curl_main ()
+{
+ fd_set rs;
+ fd_set ws;
+ fd_set es;
+ int max;
+ struct GNUNET_NETWORK_FDSet nrs;
+ struct GNUNET_NETWORK_FDSet nws;
+ struct GNUNET_TIME_Relative delay;
+ long timeout;
+ int running;
+ struct CURLMsg *msg;
+
+ max = 0;
+ FD_ZERO (&rs);
+ FD_ZERO (&ws);
+ FD_ZERO (&es);
+ curl_multi_perform (multi, &running);
+ if (running == 0)
+ {
+ GNUNET_assert (NULL != (msg = curl_multi_info_read (multi, &running)));
+ if (msg->msg == CURLMSG_DONE)
+ {
+ if (msg->data.result != CURLE_OK)
+ {
+ fprintf (stderr,
+ "%s failed at %s:%d: `%s'\n",
+ "curl_multi_perform",
+ __FILE__,
+ __LINE__, curl_easy_strerror (msg->data.result));
+ global_ret = 1;
+ }
+ }
+ curl_multi_remove_handle (multi, curl);
+ curl_multi_cleanup (multi);
+ curl_easy_cleanup (curl);
+ curl = NULL;
+ multi = NULL;
+ if (cbc.pos != strlen ("/hello_world"))
+ {
+ GNUNET_break (0);
+ global_ret = 2;
+ }
+ if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))
+ {
+ GNUNET_break (0);
+ global_ret = 3;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download complete, shutting
down!\n");
+ do_shutdown ();
+ return;
+ }
+ GNUNET_assert (CURLM_OK == curl_multi_fdset (multi, &rs, &ws, &es, &max));
+ if ( (CURLM_OK != curl_multi_timeout (multi, &timeout)) ||
+ (-1 == timeout) )
+ delay = GNUNET_TIME_UNIT_SECONDS;
+ else
+ delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
(unsigned int) timeout);
+ GNUNET_NETWORK_fdset_copy_native (&nrs,
+ &rs,
+ max + 1);
+ GNUNET_NETWORK_fdset_copy_native (&nws,
+ &ws,
+ max + 1);
+ curl_task_id = GNUNET_SCHEDULER_add_select
(GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ delay,
+ &nrs,
+ &nws,
+ &curl_task,
+ NULL);
+}
+
+
+/**
+ * Callback invoked from the VPN service once a redirection is
+ * available. Provides the IP address that can now be used to
+ * reach the requested destination (in our case, the MHD server)
+ *
+ * @param cls closure
+ * @param af address family, AF_INET or AF_INET6; AF_UNSPEC on error;
+ * will match 'result_af' from the request
+ * @param address IP address (struct in_addr or struct in_addr6, depending on
'af')
+ * that the VPN allocated for the redirection;
+ * traffic to this IP will now be redirected to the
+ * specified target peer; NULL on error
+ */
+static void
+allocation_cb (void *cls,
+ int af,
+ const void *address)
+{
+ char ips[INET6_ADDRSTRLEN];
+
+ rr = NULL;
+ if (src_af != af)
+ {
+ fprintf (stderr,
+ "VPN failed to allocate appropriate address\n");
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ GNUNET_asprintf (&url,
+ "http://%s:%u/hello_world";,
+ inet_ntop (af, address, ips, sizeof (ips)),
+ (unsigned int) PORT);
+ curl = curl_easy_init ();
+ curl_easy_setopt (curl, CURLOPT_URL, url);
+ curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ©_buffer);
+ curl_easy_setopt (curl, CURLOPT_WRITEDATA, &cbc);
+ curl_easy_setopt (curl, CURLOPT_FAILONERROR, 1);
+ curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L);
+ curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 15L);
+ curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1);
+
+ multi = curl_multi_init ();
+ GNUNET_assert (multi != NULL);
+ GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Beginning HTTP download from `%s'\n",
url);
+ curl_main ();
+}
+
+
+/**
+ * Function to keep the HTTP server running.
+ */
+static void
+mhd_main (void);
+
+
+static void
+mhd_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
+ MHD_run (mhd);
+ mhd_main ();
+}
+
+
+static void
+ctrl_c_shutdown (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ ctrl_c_task_id = GNUNET_SCHEDULER_NO_TASK;
+ do_shutdown ();
+ GNUNET_break (0);
+ global_ret = 1;
+}
+
+
+static void
+mhd_main ()
+{
+ struct GNUNET_NETWORK_FDSet nrs;
+ struct GNUNET_NETWORK_FDSet nws;
+ fd_set rs;
+ fd_set ws;
+ fd_set es;
+ int max_fd;
+ unsigned MHD_LONG_LONG timeout;
+ struct GNUNET_TIME_Relative delay;
+
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == mhd_task_id);
+ FD_ZERO (&rs);
+ FD_ZERO (&ws);
+ FD_ZERO (&es);
+ max_fd = -1;
+ GNUNET_assert (MHD_YES ==
+ MHD_get_fdset (mhd, &rs, &ws, &es, &max_fd));
+ if (MHD_YES == MHD_get_timeout (mhd, &timeout))
+ delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+ (unsigned int) timeout);
+ else
+ delay = GNUNET_TIME_UNIT_FOREVER_REL;
+ GNUNET_NETWORK_fdset_copy_native (&nrs,
+ &rs,
+ max_fd + 1);
+ GNUNET_NETWORK_fdset_copy_native (&nws,
+ &ws,
+ max_fd + 1);
+ mhd_task_id = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ delay,
+ &nrs,
+ &nws,
+ &mhd_task,
+ NULL);
+}
+
+
+static void
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
+{
+ struct in_addr v4;
+ struct in6_addr v6;
+ void *addr;
+ enum MHD_FLAG flags;
+
+ vpn = GNUNET_VPN_connect (cfg);
+ GNUNET_assert (NULL != vpn);
+ flags = MHD_USE_DEBUG;
+ if (AF_INET6 == dest_af)
+ flags |= MHD_USE_IPv6;
+ mhd = MHD_start_daemon (flags,
+ PORT,
+ NULL, NULL,
+ &mhd_ahc, NULL,
+ MHD_OPTION_END);
+ GNUNET_assert (NULL != mhd);
+ mhd_main ();
+ addr = NULL;
+ switch (dest_af)
+ {
+ case AF_INET:
+ GNUNET_assert (1 == inet_pton (dest_af, dest_ip, &v4));
+ addr = &v4;
+ break;
+ case AF_INET6:
+ GNUNET_assert (1 == inet_pton (dest_af, dest_ip, &v6));
+ addr = &v6;
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+ rr = GNUNET_VPN_redirect_to_ip (vpn,
+ src_af,
+ dest_af,
+ addr,
+ GNUNET_YES,
+ GNUNET_TIME_UNIT_FOREVER_ABS,
+ &allocation_cb, NULL);
+ ctrl_c_task_id = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &ctrl_c_shutdown,
+ NULL);
+}
+
+
+/**
+ * Test if the given AF is supported by this system.
+ *
+ * @param af to test
+ * @return GNUNET_OK if the AF is supported
+ */
+static int
+test_af (int af)
+{
+ int s;
+
+ s = socket (af, SOCK_STREAM, 0);
+ if (-1 == s)
+ {
+ if (EAFNOSUPPORT == errno)
+ return GNUNET_NO;
+ fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
+ return GNUNET_SYSERR;
+ }
+ close (s);
+ return GNUNET_OK;
+}
+
+
+int
+main (int argc, char *const *argv)
+{
+ const char *type;
+ const char *bin;
+
+ if (0 != ACCESS ("/dev/net/tun", R_OK))
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+ "access",
+ "/dev/net/tun");
+ fprintf (stderr,
+ "WARNING: System unable to run test, skipping.\n");
+ return 0;
+ }
+ if ( (GNUNET_YES !=
+ GNUNET_OS_check_helper_binary ("gnunet-helper-vpn")) ||
+ (GNUNET_YES !=
+ GNUNET_OS_check_helper_binary ("gnunet-helper-exit")) )
+ {
+ fprintf (stderr,
+ "WARNING: gnunet-helper-{exit,vpn} binaries in $PATH are not SUID,
refusing to run test (as it would have to fail).\n");
+ fprintf (stderr,
+ "Change $PATH ('.' in $PATH before $GNUNET_PREFIX/bin is
problematic) or permissions (run 'make install' as root) to fix this!\n");
+ return 0;
+ }
+ GNUNET_CRYPTO_setup_hostkey ("test_gnunet_vpn.conf");
+ bin = argv[0];
+ if (NULL != strstr (bin, "lt-"))
+ bin = strstr (bin, "lt-") + 4;
+ type = strstr (bin, "-");
+ if (NULL == type)
+ {
+ fprintf (stderr, "invalid binary name\n");
+ return 1;
+ }
+ type++;
+ if (0 == strcmp (type, "4_to_6"))
+ {
+ dest_ip = "FC5A:04E1:C2BA::1";
+ dest_af = AF_INET6;
+ src_af = AF_INET;
+ }
+ else if (0 == strcmp (type, "6_to_4"))
+ {
+ dest_ip = "169.254.86.1";
+ dest_af = AF_INET;
+ src_af = AF_INET6;
+ }
+ else if (0 == strcmp (type, "4_over"))
+ {
+ dest_ip = "169.254.86.1";
+ dest_af = AF_INET;
+ src_af = AF_INET;
+ }
+ else if (0 == strcmp (type, "6_over"))
+ {
+ dest_ip = "FC5A:04E1:C2BA::1";
+ dest_af = AF_INET6;
+ src_af = AF_INET6;
+ }
+ else
+ {
+ fprintf (stderr, "invalid binary suffix `%s'\n", type);
+ return 1;
+ }
+ if ( (GNUNET_OK != test_af (src_af)) ||
+ (GNUNET_OK != test_af (dest_af)) )
+ {
+ fprintf (stderr,
+ "Required address families not supported by this system, skipping
test.\n");
+ return 0;
+ }
+ if (0 != curl_global_init (CURL_GLOBAL_WIN32))
+ {
+ fprintf (stderr, "failed to initialize curl\n");
+ return 2;
+ }
+ if (0 != GNUNET_TESTING_peer_run ("test-gnunet-vpn",
+ "test_gnunet_vpn.conf",
+ &run, NULL))
+ return 1;
+ GNUNET_DISK_directory_remove ("/tmp/gnunet-test-vpn");
+ return global_ret;
+}
+
+/* end of test_gnunet_vpn.c */
+
Copied: gnunet/src/pt/test_gnunet_vpn.conf (from rev 22330,
gnunet/src/vpn/test_gnunet_vpn.conf)
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.conf (rev 0)
+++ gnunet/src/pt/test_gnunet_vpn.conf 2012-06-27 10:26:20 UTC (rev 22336)
@@ -0,0 +1,43 @@
+[PATHS]
+SERVICEHOME = /tmp/gnunet-test-vpn/
+DEFAULTCONFIG = test_gnunet_vpn.conf
+
+[transport]
+PLUGINS = tcp
+
+[arm]
+DEFAULTSERVICES = statistics exit vpn
+PORT = 0
+ALLOW_SHUTDOWN = YES
+
+[exit]
+EXIT_IPV4 = YES
+EXIT_IPV6 = YES
+
+# FIXME: can we use 'lo'?
+EXIT_IFNAME = eth1
+
+[testing]
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+[nse]
+WORKBITS = 1
+
+# repeating some values from the default configurations
+# here as the respective network addresses are also
+# hard-wired in the tests and the MUST match (!)
+[vpn]
+IPV6ADDR = FC2D:FDAA:6A26::1
+IPV6PREFIX = 64
+IPV4ADDR = 169.254.20.1
+IPV4MASK = 255.255.255.0
+
+[exit]
+IPV6ADDR = FC5A:04E1:C2BA::1
+IPV6PREFIX = 96
+IPV4ADDR = 169.254.86.1
+IPV4MASK = 255.255.255.0
+
+[gns]
+AUTOSTART = NO
Modified: gnunet/src/vpn/Makefile.am
===================================================================
--- gnunet/src/vpn/Makefile.am 2012-06-27 10:22:13 UTC (rev 22335)
+++ gnunet/src/vpn/Makefile.am 2012-06-27 10:26:20 UTC (rev 22336)
@@ -20,14 +20,6 @@
install-exec-hook:
$(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true
$(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true
-if HAVE_MHD
- VPN_TEST = \
- test_gnunet_vpn-4_to_6 \
- test_gnunet_vpn-6_to_4 \
- test_gnunet_vpn-6_over \
- test_gnunet_vpn-4_over \
- test_gns_vpn
-endif
else
install-exec-hook:
endif
@@ -40,18 +32,6 @@
bin_PROGRAMS = \
$(VPNBIN) gnunet-service-vpn gnunet-vpn
-
-
-check_PROGRAMS = $(VPN_TEST)
-
-if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS)
-endif
-
-EXTRA_DIST = \
- test_gnunet_vpn.conf \
- test_gns_vpn.conf
-
gnunet_helper_vpn_SOURCES = \
gnunet-helper-vpn.c
@@ -82,47 +62,4 @@
libgnunetvpn_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
-test_gns_vpn_SOURCES = \
- test_gns_vpn.c
-test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_4_over_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
-test_gnunet_vpn_4_over_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_4_over_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
-
-test_gnunet_vpn_6_over_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_6_over_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
-
-test_gnunet_vpn_4_to_6_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_4_to_6_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
-
-test_gnunet_vpn_6_to_4_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_6_to_4_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
Deleted: gnunet/src/vpn/test_gns_vpn.c
===================================================================
--- gnunet/src/vpn/test_gns_vpn.c 2012-06-27 10:22:13 UTC (rev 22335)
+++ gnunet/src/vpn/test_gns_vpn.c 2012-06-27 10:26:20 UTC (rev 22336)
@@ -1,491 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2007, 2009, 2011, 2012 Christian Grothoff
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file test_gns_vpn.c
- * @brief testcase for accessing VPN services via GNS
- * @author Martin Schanzenbach
- */
-#include "platform.h"
-#include <curl/curl.h>
-#include <microhttpd.h>
-#include "gnunet_namestore_service.h"
-#include "gnunet_gns_service.h"
-#include "gnunet_testing_lib-new.h"
-
-#define PORT 8080
-#define TEST_DOMAIN "www.gnunet"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
-
-/**
- * Return value for 'main'.
- */
-static int global_ret;
-
-static struct GNUNET_NAMESTORE_Handle *namestore;
-
-static struct MHD_Daemon *mhd;
-
-static GNUNET_SCHEDULER_TaskIdentifier mhd_task_id;
-
-static GNUNET_SCHEDULER_TaskIdentifier curl_task_id;
-
-static CURL *curl;
-
-static CURLM *multi;
-
-static char *url;
-
-/**
- * IP address of the ultimate destination.
- */
-static const char *dest_ip;
-
-/**
- * Address family of the dest_ip.
- */
-static int dest_af;
-
-/**
- * Address family to use by the curl client.
- */
-static int src_af;
-
-static int use_v6;
-
-
-struct CBC
-{
- char buf[1024];
- size_t pos;
-};
-
-static struct CBC cbc;
-
-
-static size_t
-copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx)
-{
- struct CBC *cbc = ctx;
-
- if (cbc->pos + size * nmemb > sizeof(cbc->buf))
- return 0; /* overflow */
- memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb);
- cbc->pos += size * nmemb;
- return size * nmemb;
-}
-
-
-static int
-mhd_ahc (void *cls,
- struct MHD_Connection *connection,
- const char *url,
- const char *method,
- const char *version,
- const char *upload_data, size_t *upload_data_size,
- void **unused)
-{
- static int ptr;
- struct MHD_Response *response;
- int ret;
-
- if (0 != strcmp ("GET", method))
- return MHD_NO; /* unexpected method */
- if (&ptr != *unused)
- {
- *unused = &ptr;
- return MHD_YES;
- }
- *unused = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MHD sends respose for request to URL
`%s'\n", url);
- response = MHD_create_response_from_buffer (strlen (url),
- (void *) url,
- MHD_RESPMEM_MUST_COPY);
- ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
- MHD_destroy_response (response);
- if (ret == MHD_NO)
- abort ();
- return ret;
-}
-
-
-static void
-do_shutdown ()
-{
- if (mhd_task_id != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (mhd_task_id);
- mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
- }
- if (curl_task_id != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (curl_task_id);
- curl_task_id = GNUNET_SCHEDULER_NO_TASK;
- }
- if (NULL != mhd)
- {
- MHD_stop_daemon (mhd);
- mhd = NULL;
- }
- GNUNET_free_non_null (url);
- url = NULL;
-}
-
-
-/**
- * Function to run the HTTP client.
- */
-static void
-curl_main (void);
-
-
-static void
-curl_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- curl_task_id = GNUNET_SCHEDULER_NO_TASK;
- curl_main ();
-}
-
-
-static void
-curl_main ()
-{
- fd_set rs;
- fd_set ws;
- fd_set es;
- int max;
- struct GNUNET_NETWORK_FDSet nrs;
- struct GNUNET_NETWORK_FDSet nws;
- struct GNUNET_TIME_Relative delay;
- long timeout;
- int running;
- struct CURLMsg *msg;
-
- max = 0;
- FD_ZERO (&rs);
- FD_ZERO (&ws);
- FD_ZERO (&es);
- curl_multi_perform (multi, &running);
- if (running == 0)
- {
- GNUNET_assert (NULL != (msg = curl_multi_info_read (multi, &running)));
- if (msg->msg == CURLMSG_DONE)
- {
- if (msg->data.result != CURLE_OK)
- {
- fprintf (stderr,
- "%s failed at %s:%d: `%s'\n",
- "curl_multi_perform",
- __FILE__,
- __LINE__, curl_easy_strerror (msg->data.result));
- global_ret = 1;
- }
- }
- curl_multi_remove_handle (multi, curl);
- curl_multi_cleanup (multi);
- curl_easy_cleanup (curl);
- curl = NULL;
- multi = NULL;
- if (cbc.pos != strlen ("/hello_world"))
- {
- GNUNET_break (0);
- global_ret = 2;
- }
- if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))
- {
- GNUNET_break (0);
- global_ret = 3;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download complete, shutting
down!\n");
- do_shutdown ();
- return;
- }
- GNUNET_assert (CURLM_OK == curl_multi_fdset (multi, &rs, &ws, &es, &max));
- if ( (CURLM_OK != curl_multi_timeout (multi, &timeout)) ||
- (-1 == timeout) )
- delay = GNUNET_TIME_UNIT_SECONDS;
- else
- delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
(unsigned int) timeout);
- GNUNET_NETWORK_fdset_copy_native (&nrs,
- &rs,
- max + 1);
- GNUNET_NETWORK_fdset_copy_native (&nws,
- &ws,
- max + 1);
- curl_task_id = GNUNET_SCHEDULER_add_select
(GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- delay,
- &nrs,
- &nws,
- &curl_task,
- NULL);
-}
-
-static void
-start_curl (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_asprintf (&url,
- "http://%s/hello_world";,
- TEST_DOMAIN);
- curl = curl_easy_init ();
- curl_easy_setopt (curl, CURLOPT_URL, url);
- curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ©_buffer);
- curl_easy_setopt (curl, CURLOPT_WRITEDATA, &cbc);
- curl_easy_setopt (curl, CURLOPT_FAILONERROR, 1);
- curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L);
- curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 15L);
- curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1);
-
- multi = curl_multi_init ();
- GNUNET_assert (multi != NULL);
- GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Beginning HTTP download from `%s'\n",
url);
- curl_main ();
-}
-
-/**
- * Callback invoked from the namestore service once record is
- * created.
- *
- * @param cls closure
- * @param af address family, AF_INET or AF_INET6; AF_UNSPEC on error;
- * will match 'result_af' from the request
- * @param address IP address (struct in_addr or struct in_addr6, depending on
'af')
- * that the VPN allocated for the redirection;
- * traffic to this IP will now be redirected to the
- * specified target peer; NULL on error
- */
-static void
-commence_testing (void *cls, int32_t success, const char *emsg)
-{
- GNUNET_NAMESTORE_disconnect (namestore);
-
- if ((emsg != NULL) && (GNUNET_YES != success))
- {
- fprintf (stderr,
- "NS failed to create record %s\n", emsg);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
-
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10), start_curl, NULL);
-
-}
-
-
-
-
-/**
- * Function to keep the HTTP server running.
- */
-static void
-mhd_main (void);
-
-
-static void
-mhd_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
- MHD_run (mhd);
- mhd_main ();
-}
-
-
-static void
-mhd_main ()
-{
- struct GNUNET_NETWORK_FDSet nrs;
- struct GNUNET_NETWORK_FDSet nws;
- fd_set rs;
- fd_set ws;
- fd_set es;
- int max_fd;
- unsigned MHD_LONG_LONG timeout;
- struct GNUNET_TIME_Relative delay;
-
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == mhd_task_id);
- FD_ZERO (&rs);
- FD_ZERO (&ws);
- FD_ZERO (&es);
- max_fd = -1;
- GNUNET_assert (MHD_YES ==
- MHD_get_fdset (mhd, &rs, &ws, &es, &max_fd));
- if (MHD_YES == MHD_get_timeout (mhd, &timeout))
- delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
- (unsigned int) timeout);
- else
- delay = GNUNET_TIME_UNIT_FOREVER_REL;
- GNUNET_NETWORK_fdset_copy_native (&nrs,
- &rs,
- max_fd + 1);
- GNUNET_NETWORK_fdset_copy_native (&nws,
- &ws,
- max_fd + 1);
- mhd_task_id = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- delay,
- &nrs,
- &nws,
- &mhd_task,
- NULL);
-}
-
-static void
-run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer)
-{
- enum MHD_FLAG flags;
- struct GNUNET_PeerIdentity id;
- struct GNUNET_CRYPTO_HashAsciiEncoded peername;
- struct GNUNET_CRYPTO_RsaPrivateKey *host_key;
- struct GNUNET_NAMESTORE_RecordData rd;
- char *rd_string;
- char *zone_keyfile;
-
- GNUNET_TESTING_peer_get_identity (peer, &id);
- GNUNET_CRYPTO_hash_to_enc ((struct GNUNET_HashCode*)&id, &peername);
-
- namestore = GNUNET_NAMESTORE_connect (cfg);
- GNUNET_assert (NULL != namestore);
- flags = MHD_USE_DEBUG;
- //if (GNUNET_YES == use_v6)
- // flags |= MHD_USE_IPv6;
- mhd = MHD_start_daemon (flags,
- PORT,
- NULL, NULL,
- &mhd_ahc, NULL,
- MHD_OPTION_END);
- GNUNET_assert (NULL != mhd);
- mhd_main ();
-
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
- "ZONEKEY",
- &zone_keyfile))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
- return;
- }
-
- host_key = GNUNET_CRYPTO_rsa_key_create_from_file (zone_keyfile);
- rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value;
- GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gnunet.");
- GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value
(GNUNET_GNS_RECORD_VPN,
- rd_string,
-
(void**)&rd.data,
- &rd.data_size));
- rd.record_type = GNUNET_GNS_RECORD_VPN;
-
- GNUNET_NAMESTORE_record_create (namestore,
- host_key,
- "www",
- &rd,
- &commence_testing,
- NULL);
- GNUNET_free ((void**)rd.data);
- GNUNET_free (rd_string);
- GNUNET_free (zone_keyfile);
- GNUNET_CRYPTO_rsa_key_free (host_key);
-}
-
-
-/**
- * Test if the given AF is supported by this system.
- *
- * @param af to test
- * @return GNUNET_OK if the AF is supported
- */
-static int
-test_af (int af)
-{
- int s;
-
- s = socket (af, SOCK_STREAM, 0);
- if (-1 == s)
- {
- if (EAFNOSUPPORT == errno)
- return GNUNET_NO;
- fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
- return GNUNET_SYSERR;
- }
- close (s);
- return GNUNET_OK;
-}
-
-
-int
-main (int argc, char *const *argv)
-{
- if (0 != ACCESS ("/dev/net/tun", R_OK))
- {
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
- "access",
- "/dev/net/tun");
- fprintf (stderr,
- "WARNING: System unable to run test, skipping.\n");
- return 0;
- }
- if ( (GNUNET_YES !=
- GNUNET_OS_check_helper_binary ("gnunet-helper-vpn")) ||
- (GNUNET_YES !=
- GNUNET_OS_check_helper_binary ("gnunet-helper-exit")) ||
- (GNUNET_YES !=
- GNUNET_OS_check_helper_binary ("gnunet-helper-dns")))
- {
- fprintf (stderr,
- "WARNING: gnunet-helper-{exit,vpn,dns} binaries in $PATH are not
SUID, refusing to run test (as it would have to fail).\n");
- fprintf (stderr,
- "Change $PATH ('.' in $PATH before $GNUNET_PREFIX/bin is
problematic) or permissions (run 'make install' as root) to fix this!\n");
- return 0;
- }
- GNUNET_CRYPTO_setup_hostkey ("test_gns_vpn.conf");
-
- dest_ip = "169.254.86.1";
- dest_af = AF_INET;
- src_af = AF_INET;
-
- if (GNUNET_OK == test_af (AF_INET6))
- use_v6 = GNUNET_YES;
- else
- use_v6 = GNUNET_NO;
-
- if ( (GNUNET_OK != test_af (src_af)) ||
- (GNUNET_OK != test_af (dest_af)) )
- {
- fprintf (stderr,
- "Required address families not supported by this system, skipping
test.\n");
- return 0;
- }
- if (0 != curl_global_init (CURL_GLOBAL_WIN32))
- {
- fprintf (stderr, "failed to initialize curl\n");
- return 2;
- }
- if (0 != GNUNET_TESTING_peer_run ("test-gnunet-vpn",
- "test_gns_vpn.conf",
- &run, NULL))
- return 1;
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-vpn");
- return global_ret;
-}
-
-/* end of test_gns_vpn.c */
-
Deleted: gnunet/src/vpn/test_gns_vpn.conf
===================================================================
--- gnunet/src/vpn/test_gns_vpn.conf 2012-06-27 10:22:13 UTC (rev 22335)
+++ gnunet/src/vpn/test_gns_vpn.conf 2012-06-27 10:26:20 UTC (rev 22336)
@@ -1,52 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/gnunet-test-vpn/
-DEFAULTCONFIG = test_gnunet_vpn.conf
-
-[transport]
-PLUGINS = tcp
-
-[arm]
-DEFAULTSERVICES = statistics exit mesh vpn namestore gns
-PORT = 0
-ALLOW_SHUTDOWN = YES
-
-[exit]
-EXIT_IPV4 = YES
-EXIT_IPV6 = YES
-
-# FIXME: can we use 'lo'?
-EXIT_IFNAME = eth1
-
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[nse]
-WORKBITS = 1
-
-# repeating some values from the default configurations
-# here as the respective network addresses are also
-# hard-wired in the tests and the MUST match (!)
-[vpn]
-IPV6ADDR = FC2D:FDAA:6A26::1
-IPV6PREFIX = 64
-IPV4ADDR = 169.254.20.1
-IPV4MASK = 255.255.255.0
-
-[exit]
-IPV6ADDR = FC5A:04E1:C2BA::1
-IPV6PREFIX = 96
-IPV4ADDR = 169.254.86.1
-IPV4MASK = 255.255.255.0
-
-[www.gnunet.]
-TCP_REDIRECTS = 80:localhost4:8080
-TTL = 3600000
-
-[gns]
-AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/hostkey
-HIJACK_DNS = YES
-
-[namestore]
-AUTOSTART = YES
Deleted: gnunet/src/vpn/test_gnunet_vpn.c
===================================================================
--- gnunet/src/vpn/test_gnunet_vpn.c 2012-06-27 10:22:13 UTC (rev 22335)
+++ gnunet/src/vpn/test_gnunet_vpn.c 2012-06-27 10:26:20 UTC (rev 22336)
@@ -1,535 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2007, 2009, 2011, 2012 Christian Grothoff
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file test_gnunet_vpn.c
- * @brief testcase for tunneling HTTP over the GNUnet VPN
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <curl/curl.h>
-#include <microhttpd.h>
-#include "gnunet_vpn_service.h"
-#include "gnunet_testing_lib-new.h"
-
-#define PORT 48080
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
-
-
-/**
- * Return value for 'main'.
- */
-static int global_ret;
-
-static struct GNUNET_VPN_Handle *vpn;
-
-static struct MHD_Daemon *mhd;
-
-static GNUNET_SCHEDULER_TaskIdentifier mhd_task_id;
-
-static GNUNET_SCHEDULER_TaskIdentifier curl_task_id;
-
-static GNUNET_SCHEDULER_TaskIdentifier ctrl_c_task_id;
-
-static struct GNUNET_VPN_RedirectionRequest *rr;
-
-static CURL *curl;
-
-static CURLM *multi;
-
-static char *url;
-
-/**
- * IP address of the ultimate destination.
- */
-static const char *dest_ip;
-
-/**
- * Address family of the dest_ip.
- */
-static int dest_af;
-
-/**
- * Address family to use by the curl client.
- */
-static int src_af;
-
-
-struct CBC
-{
- char buf[1024];
- size_t pos;
-};
-
-static struct CBC cbc;
-
-
-static size_t
-copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx)
-{
- struct CBC *cbc = ctx;
-
- if (cbc->pos + size * nmemb > sizeof(cbc->buf))
- return 0; /* overflow */
- memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb);
- cbc->pos += size * nmemb;
- return size * nmemb;
-}
-
-
-static int
-mhd_ahc (void *cls,
- struct MHD_Connection *connection,
- const char *url,
- const char *method,
- const char *version,
- const char *upload_data, size_t *upload_data_size,
- void **unused)
-{
- static int ptr;
- struct MHD_Response *response;
- int ret;
-
- if (0 != strcmp ("GET", method))
- return MHD_NO; /* unexpected method */
- if (&ptr != *unused)
- {
- *unused = &ptr;
- return MHD_YES;
- }
- *unused = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MHD sends respose for request to URL
`%s'\n", url);
- response = MHD_create_response_from_buffer (strlen (url),
- (void *) url,
- MHD_RESPMEM_MUST_COPY);
- ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
- MHD_destroy_response (response);
- if (ret == MHD_NO)
- abort ();
- return ret;
-}
-
-
-static void
-do_shutdown ()
-{
- if (mhd_task_id != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (mhd_task_id);
- mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
- }
- if (curl_task_id != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (curl_task_id);
- curl_task_id = GNUNET_SCHEDULER_NO_TASK;
- }
- if (ctrl_c_task_id != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (ctrl_c_task_id);
- ctrl_c_task_id = GNUNET_SCHEDULER_NO_TASK;
- }
- if (NULL != mhd)
- {
- MHD_stop_daemon (mhd);
- mhd = NULL;
- }
- if (NULL != rr)
- {
- GNUNET_VPN_cancel_request (rr);
- rr = NULL;
- }
- if (NULL != vpn)
- {
- GNUNET_VPN_disconnect (vpn);
- vpn = NULL;
- }
- GNUNET_free_non_null (url);
- url = NULL;
-}
-
-
-/**
- * Function to run the HTTP client.
- */
-static void
-curl_main (void);
-
-
-static void
-curl_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- curl_task_id = GNUNET_SCHEDULER_NO_TASK;
- curl_main ();
-}
-
-
-static void
-curl_main ()
-{
- fd_set rs;
- fd_set ws;
- fd_set es;
- int max;
- struct GNUNET_NETWORK_FDSet nrs;
- struct GNUNET_NETWORK_FDSet nws;
- struct GNUNET_TIME_Relative delay;
- long timeout;
- int running;
- struct CURLMsg *msg;
-
- max = 0;
- FD_ZERO (&rs);
- FD_ZERO (&ws);
- FD_ZERO (&es);
- curl_multi_perform (multi, &running);
- if (running == 0)
- {
- GNUNET_assert (NULL != (msg = curl_multi_info_read (multi, &running)));
- if (msg->msg == CURLMSG_DONE)
- {
- if (msg->data.result != CURLE_OK)
- {
- fprintf (stderr,
- "%s failed at %s:%d: `%s'\n",
- "curl_multi_perform",
- __FILE__,
- __LINE__, curl_easy_strerror (msg->data.result));
- global_ret = 1;
- }
- }
- curl_multi_remove_handle (multi, curl);
- curl_multi_cleanup (multi);
- curl_easy_cleanup (curl);
- curl = NULL;
- multi = NULL;
- if (cbc.pos != strlen ("/hello_world"))
- {
- GNUNET_break (0);
- global_ret = 2;
- }
- if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))
- {
- GNUNET_break (0);
- global_ret = 3;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download complete, shutting
down!\n");
- do_shutdown ();
- return;
- }
- GNUNET_assert (CURLM_OK == curl_multi_fdset (multi, &rs, &ws, &es, &max));
- if ( (CURLM_OK != curl_multi_timeout (multi, &timeout)) ||
- (-1 == timeout) )
- delay = GNUNET_TIME_UNIT_SECONDS;
- else
- delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
(unsigned int) timeout);
- GNUNET_NETWORK_fdset_copy_native (&nrs,
- &rs,
- max + 1);
- GNUNET_NETWORK_fdset_copy_native (&nws,
- &ws,
- max + 1);
- curl_task_id = GNUNET_SCHEDULER_add_select
(GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- delay,
- &nrs,
- &nws,
- &curl_task,
- NULL);
-}
-
-
-/**
- * Callback invoked from the VPN service once a redirection is
- * available. Provides the IP address that can now be used to
- * reach the requested destination (in our case, the MHD server)
- *
- * @param cls closure
- * @param af address family, AF_INET or AF_INET6; AF_UNSPEC on error;
- * will match 'result_af' from the request
- * @param address IP address (struct in_addr or struct in_addr6, depending on
'af')
- * that the VPN allocated for the redirection;
- * traffic to this IP will now be redirected to the
- * specified target peer; NULL on error
- */
-static void
-allocation_cb (void *cls,
- int af,
- const void *address)
-{
- char ips[INET6_ADDRSTRLEN];
-
- rr = NULL;
- if (src_af != af)
- {
- fprintf (stderr,
- "VPN failed to allocate appropriate address\n");
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- GNUNET_asprintf (&url,
- "http://%s:%u/hello_world";,
- inet_ntop (af, address, ips, sizeof (ips)),
- (unsigned int) PORT);
- curl = curl_easy_init ();
- curl_easy_setopt (curl, CURLOPT_URL, url);
- curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ©_buffer);
- curl_easy_setopt (curl, CURLOPT_WRITEDATA, &cbc);
- curl_easy_setopt (curl, CURLOPT_FAILONERROR, 1);
- curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L);
- curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 15L);
- curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1);
-
- multi = curl_multi_init ();
- GNUNET_assert (multi != NULL);
- GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Beginning HTTP download from `%s'\n",
url);
- curl_main ();
-}
-
-
-/**
- * Function to keep the HTTP server running.
- */
-static void
-mhd_main (void);
-
-
-static void
-mhd_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
- MHD_run (mhd);
- mhd_main ();
-}
-
-
-static void
-ctrl_c_shutdown (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- ctrl_c_task_id = GNUNET_SCHEDULER_NO_TASK;
- do_shutdown ();
- GNUNET_break (0);
- global_ret = 1;
-}
-
-
-static void
-mhd_main ()
-{
- struct GNUNET_NETWORK_FDSet nrs;
- struct GNUNET_NETWORK_FDSet nws;
- fd_set rs;
- fd_set ws;
- fd_set es;
- int max_fd;
- unsigned MHD_LONG_LONG timeout;
- struct GNUNET_TIME_Relative delay;
-
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == mhd_task_id);
- FD_ZERO (&rs);
- FD_ZERO (&ws);
- FD_ZERO (&es);
- max_fd = -1;
- GNUNET_assert (MHD_YES ==
- MHD_get_fdset (mhd, &rs, &ws, &es, &max_fd));
- if (MHD_YES == MHD_get_timeout (mhd, &timeout))
- delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
- (unsigned int) timeout);
- else
- delay = GNUNET_TIME_UNIT_FOREVER_REL;
- GNUNET_NETWORK_fdset_copy_native (&nrs,
- &rs,
- max_fd + 1);
- GNUNET_NETWORK_fdset_copy_native (&nws,
- &ws,
- max_fd + 1);
- mhd_task_id = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- delay,
- &nrs,
- &nws,
- &mhd_task,
- NULL);
-}
-
-
-static void
-run (void *cls,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Peer *peer)
-{
- struct in_addr v4;
- struct in6_addr v6;
- void *addr;
- enum MHD_FLAG flags;
-
- vpn = GNUNET_VPN_connect (cfg);
- GNUNET_assert (NULL != vpn);
- flags = MHD_USE_DEBUG;
- if (AF_INET6 == dest_af)
- flags |= MHD_USE_IPv6;
- mhd = MHD_start_daemon (flags,
- PORT,
- NULL, NULL,
- &mhd_ahc, NULL,
- MHD_OPTION_END);
- GNUNET_assert (NULL != mhd);
- mhd_main ();
- addr = NULL;
- switch (dest_af)
- {
- case AF_INET:
- GNUNET_assert (1 == inet_pton (dest_af, dest_ip, &v4));
- addr = &v4;
- break;
- case AF_INET6:
- GNUNET_assert (1 == inet_pton (dest_af, dest_ip, &v6));
- addr = &v6;
- break;
- default:
- GNUNET_assert (0);
- }
- rr = GNUNET_VPN_redirect_to_ip (vpn,
- src_af,
- dest_af,
- addr,
- GNUNET_YES,
- GNUNET_TIME_UNIT_FOREVER_ABS,
- &allocation_cb, NULL);
- ctrl_c_task_id = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &ctrl_c_shutdown,
- NULL);
-}
-
-
-/**
- * Test if the given AF is supported by this system.
- *
- * @param af to test
- * @return GNUNET_OK if the AF is supported
- */
-static int
-test_af (int af)
-{
- int s;
-
- s = socket (af, SOCK_STREAM, 0);
- if (-1 == s)
- {
- if (EAFNOSUPPORT == errno)
- return GNUNET_NO;
- fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
- return GNUNET_SYSERR;
- }
- close (s);
- return GNUNET_OK;
-}
-
-
-int
-main (int argc, char *const *argv)
-{
- const char *type;
- const char *bin;
-
- if (0 != ACCESS ("/dev/net/tun", R_OK))
- {
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
- "access",
- "/dev/net/tun");
- fprintf (stderr,
- "WARNING: System unable to run test, skipping.\n");
- return 0;
- }
- if ( (GNUNET_YES !=
- GNUNET_OS_check_helper_binary ("gnunet-helper-vpn")) ||
- (GNUNET_YES !=
- GNUNET_OS_check_helper_binary ("gnunet-helper-exit")) )
- {
- fprintf (stderr,
- "WARNING: gnunet-helper-{exit,vpn} binaries in $PATH are not SUID,
refusing to run test (as it would have to fail).\n");
- fprintf (stderr,
- "Change $PATH ('.' in $PATH before $GNUNET_PREFIX/bin is
problematic) or permissions (run 'make install' as root) to fix this!\n");
- return 0;
- }
- GNUNET_CRYPTO_setup_hostkey ("test_gnunet_vpn.conf");
- bin = argv[0];
- if (NULL != strstr (bin, "lt-"))
- bin = strstr (bin, "lt-") + 4;
- type = strstr (bin, "-");
- if (NULL == type)
- {
- fprintf (stderr, "invalid binary name\n");
- return 1;
- }
- type++;
- if (0 == strcmp (type, "4_to_6"))
- {
- dest_ip = "FC5A:04E1:C2BA::1";
- dest_af = AF_INET6;
- src_af = AF_INET;
- }
- else if (0 == strcmp (type, "6_to_4"))
- {
- dest_ip = "169.254.86.1";
- dest_af = AF_INET;
- src_af = AF_INET6;
- }
- else if (0 == strcmp (type, "4_over"))
- {
- dest_ip = "169.254.86.1";
- dest_af = AF_INET;
- src_af = AF_INET;
- }
- else if (0 == strcmp (type, "6_over"))
- {
- dest_ip = "FC5A:04E1:C2BA::1";
- dest_af = AF_INET6;
- src_af = AF_INET6;
- }
- else
- {
- fprintf (stderr, "invalid binary suffix `%s'\n", type);
- return 1;
- }
- if ( (GNUNET_OK != test_af (src_af)) ||
- (GNUNET_OK != test_af (dest_af)) )
- {
- fprintf (stderr,
- "Required address families not supported by this system, skipping
test.\n");
- return 0;
- }
- if (0 != curl_global_init (CURL_GLOBAL_WIN32))
- {
- fprintf (stderr, "failed to initialize curl\n");
- return 2;
- }
- if (0 != GNUNET_TESTING_peer_run ("test-gnunet-vpn",
- "test_gnunet_vpn.conf",
- &run, NULL))
- return 1;
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-vpn");
- return global_ret;
-}
-
-/* end of test_gnunet_vpn.c */
-
Deleted: gnunet/src/vpn/test_gnunet_vpn.conf
===================================================================
--- gnunet/src/vpn/test_gnunet_vpn.conf 2012-06-27 10:22:13 UTC (rev 22335)
+++ gnunet/src/vpn/test_gnunet_vpn.conf 2012-06-27 10:26:20 UTC (rev 22336)
@@ -1,43 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/gnunet-test-vpn/
-DEFAULTCONFIG = test_gnunet_vpn.conf
-
-[transport]
-PLUGINS = tcp
-
-[arm]
-DEFAULTSERVICES = statistics exit vpn
-PORT = 0
-ALLOW_SHUTDOWN = YES
-
-[exit]
-EXIT_IPV4 = YES
-EXIT_IPV6 = YES
-
-# FIXME: can we use 'lo'?
-EXIT_IFNAME = eth1
-
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[nse]
-WORKBITS = 1
-
-# repeating some values from the default configurations
-# here as the respective network addresses are also
-# hard-wired in the tests and the MUST match (!)
-[vpn]
-IPV6ADDR = FC2D:FDAA:6A26::1
-IPV6PREFIX = 64
-IPV4ADDR = 169.254.20.1
-IPV4MASK = 255.255.255.0
-
-[exit]
-IPV6ADDR = FC5A:04E1:C2BA::1
-IPV6PREFIX = 96
-IPV4ADDR = 169.254.86.1
-IPV4MASK = 255.255.255.0
-
-[gns]
-AUTOSTART = NO
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22336 - in gnunet/src: . gns pt vpn,
gnunet <=