[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated (caf375948 -> e86eed188)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] branch master updated (caf375948 -> e86eed188) |
|
Date: |
Thu, 23 Feb 2017 23:05:59 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository gnunet.
from caf375948 implement union via sending whole set
new b29c94bfa fix termination, proper shutdown on CTRL-C
new 0c651a9ce fix typo in example
new 7056d8853 fix indentation
new 0945dcf2c fix indentation, typo, improve logging
new 2309bb75f change default port to 53, use setcap to enable binding to
low port
new cb5db4e18 log which name we are resolving
new 8f65dd2db fix use of uninitialized ID after last refactoring
new c3e03e28f use of dns2gns proxy instead of DNS interceptor in VPN test
new e86eed188 update .gitignore files
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
contrib/gnunet-gns-import.sh | 2 +-
src/block/plugin_block_template.c | 2 +-
src/gns/Makefile.am | 10 +-
src/gns/gnunet-dns2gns.c | 14 ++-
src/gns/gnunet-service-gns.c | 5 +-
src/identity/gnunet-identity.c | 64 +++++++---
src/namecache/.gitignore | 1 +
src/namestore/.gitignore | 1 +
src/peerstore/.gitignore | 1 +
src/pt/.gitignore | 5 +
src/pt/gnunet-daemon-pt.c | 3 +-
src/pt/test_gns_vpn.c | 251 ++++++++++++++++++++------------------
src/pt/test_gns_vpn.conf | 4 +
src/testing/testing.c | 4 +-
src/util/os_installation.c | 49 ++++++--
15 files changed, 258 insertions(+), 158 deletions(-)
diff --git a/contrib/gnunet-gns-import.sh b/contrib/gnunet-gns-import.sh
index 8c9d1b9d4..8614821fe 100755
--- a/contrib/gnunet-gns-import.sh
+++ b/contrib/gnunet-gns-import.sh
@@ -63,7 +63,7 @@ gnunet-identity -e master-zone -s gns-proxy $options
# Use master-zone for intercepted DNS queries
# (remove this entry to disable DNS interception by GNS service)
-gnunet-identity -e master-zone -s gns-intercept $options
+gnunet-identity -e master-zone -s dns2gns $options
# 'gns-private' is not yet used (!)
gnunet-identity -e private-zone -s gns-private $options
diff --git a/src/block/plugin_block_template.c
b/src/block/plugin_block_template.c
index 0825bd095..87adae7e9 100644
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -111,7 +111,7 @@ block_plugin_template_create_group (void *cls,
}
GNUNET_break (NULL == va_arg (va, const char *));
return GNUNET_BLOCK_GROUP_bf_create (cls,
- TEMPLATE_BF_SIZE,
+ bf_size,
BLOOMFILTER_K,
type,
nonce,
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 8c952be04..464bbbca1 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -69,8 +69,8 @@ endif
libexec_PROGRAMS = \
gnunet-service-gns \
- $(DO_W32_HELPER) \
gnunet-dns2gns \
+ $(DO_W32_HELPER) \
$(DO_PROXY)
bin_PROGRAMS = \
@@ -136,6 +136,14 @@ gnunet_dns2gns_LDADD = \
$(top_builddir)/src/dns/libgnunetdnsstub.la \
$(GN_LIBINTL)
+if LINUX
+HIJACKBIN = gnunet-dns2gns
+install-exec-hook:
+ $(SUDO_BINARY) setcap 'cap_net_bind_service=+ep'
$(DESTDIR)$(libexecdir)/gnunet-dns2gns || true
+else
+install-exec-hook:
+endif
+
gnunet_gns_proxy_SOURCES = \
gnunet-gns-proxy.c
gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(CPP_GNURL)
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index bb37a42a3..813ecdf8e 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -138,7 +138,7 @@ static char *dns_ip;
/**
* UDP Port we listen on for inbound DNS requests.
*/
-static unsigned int listen_port = 2853;
+static unsigned int listen_port = 53;
/**
* Which GNS zone do we translate incoming DNS requests to?
@@ -796,13 +796,17 @@ main (int argc,
};
int ret;
- if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv,
- &argc, &argv))
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_get_utf8_args (argc, argv,
+ &argc, &argv))
return 2;
- GNUNET_log_setup ("gnunet-dns2gns", "WARNING", NULL);
+ GNUNET_log_setup ("gnunet-dns2gns",
+ "WARNING",
+ NULL);
ret =
(GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-dns2gns",
+ GNUNET_PROGRAM_run (argc, argv,
+ "gnunet-dns2gns",
_("GNUnet DNS-to-GNS proxy (a DNS server)"),
options,
&run, NULL)) ? 0 : 1;
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 570c07fdf..0ca25ac19 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -328,11 +328,12 @@ handle_lookup (void *cls,
char *nameptr = name;
const char *utf_in;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received LOOKUP message\n");
GNUNET_SERVICE_client_continue (gc->client);
utf_in = (const char *) &sh_msg[1];
GNUNET_STRINGS_utf8_tolower (utf_in, nameptr);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received LOOKUP `%s' message\n",
+ name);
clh = GNUNET_new (struct ClientLookupHandle);
GNUNET_CONTAINER_DLL_insert (gc->clh_head,
diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index f632aa0a8..8c8485249 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -29,6 +29,12 @@
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
+
+/**
+ * Return value from main on timeout.
+ */
+#define TIMEOUT_STATUS_CODE 40
+
/**
* Handle to IDENTITY service.
*/
@@ -79,6 +85,11 @@ static struct GNUNET_IDENTITY_Operation *create_op;
*/
static struct GNUNET_IDENTITY_Operation *delete_op;
+/**
+ * Value to return from #main().
+ */
+static int global_ret;
+
/**
* Task run on shutdown.
@@ -120,7 +131,11 @@ test_finished ()
(NULL == set_ego) &&
(! list) &&
(! monitor) )
+ {
+ if (TIMEOUT_STATUS_CODE == global_ret)
+ global_ret = 0;
GNUNET_SCHEDULER_shutdown ();
+ }
}
@@ -159,9 +174,12 @@ create_finished (void *cls,
*op = NULL;
if (NULL != emsg)
+ {
fprintf (stderr,
_("Failed to create ego: %s\n"),
emsg);
+ global_ret = 1;
+ }
test_finished ();
}
@@ -178,9 +196,12 @@ set_done (void *cls,
{
set_op = NULL;
if (NULL != emsg)
+ {
fprintf (stderr,
_("Failed to set default ego: %s\n"),
emsg);
+ global_ret = 1;
+ }
test_finished ();
}
@@ -257,17 +278,23 @@ print_ego (void *cls,
}
if ( (NULL == ego) && (! monitor) )
{
- GNUNET_SCHEDULER_shutdown ();
+ list = 0;
+ test_finished ();
return;
}
if (! (list | monitor))
return;
if (NULL == ego)
return;
- GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
+ GNUNET_IDENTITY_ego_get_public_key (ego,
+ &pk);
s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
- if ( (monitor) || (NULL != identifier) )
- fprintf (stdout, "%s - %s\n", identifier, s);
+ if ( (monitor) ||
+ (NULL != identifier) )
+ fprintf (stdout,
+ "%s - %s\n",
+ identifier,
+ s);
GNUNET_free (s);
}
@@ -281,7 +308,9 @@ print_ego (void *cls,
* @param cfg configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
if ( (NULL == set_subsystem) ^
@@ -291,7 +320,9 @@ run (void *cls, char *const *args, const char *cfgfile,
"Options -e and -s must always be specified together\n");
return;
}
- sh = GNUNET_IDENTITY_connect (cfg, &print_ego, NULL);
+ sh = GNUNET_IDENTITY_connect (cfg,
+ &print_ego,
+ NULL);
if (NULL != delete_ego)
delete_op = GNUNET_IDENTITY_delete (sh,
delete_ego,
@@ -302,7 +333,8 @@ run (void *cls, char *const *args, const char *cfgfile,
create_ego,
&create_finished,
&create_op);
- GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
test_finished ();
}
@@ -317,8 +349,6 @@ run (void *cls, char *const *args, const char *cfgfile,
int
main (int argc, char *const *argv)
{
- int res;
-
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
{'C', "create", "NAME",
gettext_noop ("create ego NAME"),
@@ -340,19 +370,23 @@ main (int argc, char *const *argv)
1, &GNUNET_GETOPT_set_string, &set_subsystem},
GNUNET_GETOPT_OPTION_END
};
+ int res;
- if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
- return 2;
-
- res = GNUNET_PROGRAM_run (argc, argv, "gnunet-identity",
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_get_utf8_args (argc, argv,
+ &argc, &argv))
+ return 4;
+ global_ret = TIMEOUT_STATUS_CODE; /* timeout */
+ res = GNUNET_PROGRAM_run (argc, argv,
+ "gnunet-identity",
gettext_noop ("Maintain egos"),
options, &run,
NULL);
GNUNET_free ((void *) argv);
if (GNUNET_OK != res)
- return 1;
- return 0;
+ return 3;
+ return global_ret;
}
/* end of gnunet-identity.c */
diff --git a/src/namecache/.gitignore b/src/namecache/.gitignore
index 6d2d8488a..2abc07dfb 100644
--- a/src/namecache/.gitignore
+++ b/src/namecache/.gitignore
@@ -4,3 +4,4 @@ test_namecache_api_cache_block
test_plugin_namecache_postgres
test_plugin_namecache_sqlite
zonefiles
+test_plugin_namecache_flat
diff --git a/src/namestore/.gitignore b/src/namestore/.gitignore
index 6943b888a..4995a9e36 100644
--- a/src/namestore/.gitignore
+++ b/src/namestore/.gitignore
@@ -18,3 +18,4 @@ test_namestore_api_zone_iteration_specific_zone.nc
test_namestore_api_zone_iteration_stop.nc
test_plugin_namestore_postgres
test_plugin_namestore_sqlite
+test_plugin_namestore_flat
diff --git a/src/peerstore/.gitignore b/src/peerstore/.gitignore
index 33304d90b..7fc22bbdb 100644
--- a/src/peerstore/.gitignore
+++ b/src/peerstore/.gitignore
@@ -6,3 +6,4 @@ test_peerstore_api_store
test_peerstore_api_sync
test_peerstore_api_watch
test_plugin_peerstore_sqlite
+test_plugin_peerstore_flat
diff --git a/src/pt/.gitignore b/src/pt/.gitignore
index 22f803ed6..ea678ffe5 100644
--- a/src/pt/.gitignore
+++ b/src/pt/.gitignore
@@ -1 +1,6 @@
gnunet-daemon-pt
+test_gns_vpn
+test_gnunet_vpn-4_over
+test_gnunet_vpn-4_to_6
+test_gnunet_vpn-6_over
+test_gnunet_vpn-6_to_4
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c
index 97ac8e961..54556cc52 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -864,14 +864,13 @@ handle_dns_response (void *cls,
const struct DnsResponseMessage *msg)
{
struct CadetExit *exit = cls;
- struct GNUNET_TUN_DnsHeader dns;
size_t mlen;
struct RequestContext *rc;
mlen = ntohs (msg->header.size) - sizeof (*msg);
for (rc = exit->receive_queue_head; NULL != rc; rc = rc->next)
{
- if (dns.id == rc->dns_id)
+ if (msg->dns.id == rc->dns_id)
{
GNUNET_STATISTICS_update (stats,
gettext_noop ("# DNS replies received"),
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 4b7e817e8..53f27610b 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- Copyright (C) 2007, 2009, 2011, 2012, 2015 Christian Grothoff
+ Copyright (C) 2007, 2009, 2011, 2012, 2015, 2017 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
@@ -22,6 +22,19 @@
* @file test_gns_vpn.c
* @brief testcase for accessing VPN services via GNS
* @author Martin Schanzenbach
+ * @author Christian Grothoff
+ *
+ * This test requires libcurl/libgnurl *with* support for C-ARES.
+ * This is NOT the default on most platforms, which means the test
+ * will be skipped in many cases. Compile libcurl/libgnurl with
+ * "--enable-ares" to get this test to pass.
+ *
+ * Furthermore, the test relies on gnunet-dns2gns being able to bind
+ * to port 53. This means that 'setcap' has to have worked during
+ * 'make install'. If this failed, but everything else is OK, the
+ * test may FAIL hard even though it is just an installation issue (we
+ * cannot conveniently test for the setcap to have worked). However,
+ * you should get a warning that gnunet-dns2gns failed to 'bind'.
*/
#include "platform.h"
#if HAVE_CURL_CURL_H
@@ -39,7 +52,7 @@
#define PORT 8080
#define TEST_DOMAIN "www.gnu"
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
/**
* Return value for #main().
@@ -96,7 +109,10 @@ static struct CBC cbc;
static size_t
-copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx)
+copy_buffer (void *ptr,
+ size_t size,
+ size_t nmemb,
+ void *ctx)
{
struct CBC *cbc = ctx;
@@ -174,6 +190,11 @@ do_shutdown (void *cls)
GNUNET_NAMESTORE_cancel (qe);
qe = NULL;
}
+ if (NULL != namestore)
+ {
+ GNUNET_NAMESTORE_disconnect (namestore);
+ namestore = NULL;
+ }
GNUNET_free_non_null (url);
url = NULL;
}
@@ -280,6 +301,9 @@ curl_main ()
static void
start_curl (void *cls)
{
+ CURLcode ec;
+
+ curl_task_id = NULL;
GNUNET_asprintf (&url,
"http://%s/hello_world";,
TEST_DOMAIN);
@@ -291,7 +315,18 @@ start_curl (void *cls)
curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L);
curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 150L);
curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1);
-
+ if (CURLE_OK !=
+ (ec = curl_easy_setopt (curl,
+ CURLOPT_DNS_SERVERS,
+ "127.0.0.1:53")))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "curl build without support for CURLOPT_DNS_SERVERS (%s),
cannot run test\n",
+ curl_easy_strerror (ec));
+ global_ret = 77;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
multi = curl_multi_init ();
GNUNET_assert (multi != NULL);
GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl));
@@ -302,14 +337,6 @@ start_curl (void *cls)
}
-static void
-disco_ns (void* cls)
-{
- GNUNET_NAMESTORE_disconnect (namestore);
- namestore = NULL;
-}
-
-
/**
* Callback invoked from the namestore service once record is
* created.
@@ -328,9 +355,8 @@ commence_testing (void *cls,
const char *emsg)
{
qe = NULL;
- GNUNET_SCHEDULER_add_now (&disco_ns, NULL);
-
- if ((emsg != NULL) && (GNUNET_YES != success))
+ if ( (NULL != emsg) &&
+ (GNUNET_YES != success) )
{
fprintf (stderr,
"NS failed to create record %s\n",
@@ -338,11 +364,14 @@ commence_testing (void *cls,
GNUNET_SCHEDULER_shutdown ();
return;
}
+
/* wait a little bit before downloading, as we just created the record */
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 1),
- &start_curl,
- NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Launching cURL request\n");
+ curl_task_id
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &start_curl,
+ NULL);
}
@@ -402,7 +431,6 @@ mhd_main ()
-
/**
* Open '/dev/null' and make the result the given
* file descriptor.
@@ -448,9 +476,8 @@ fork_and_exec (const char *file,
pid = fork ();
if (-1 == pid)
{
- fprintf (stderr,
- "fork failed: %s\n",
- strerror (errno));
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+ "fork");
return 1;
}
if (0 == pid)
@@ -464,10 +491,9 @@ fork_and_exec (const char *file,
open_dev_null (1, O_WRONLY);
(void) execv (file, cmd);
/* can only get here on error */
- fprintf (stderr,
- "exec `%s' failed: %s\n",
- file,
- strerror (errno));
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+ "exec",
+ file);
_exit (1);
}
/* keep running waitpid as long as the only error we get is 'EINTR' */
@@ -475,13 +501,20 @@ fork_and_exec (const char *file,
(errno == EINTR) );
if (-1 == ret)
{
- fprintf (stderr,
- "waitpid failed: %s\n",
- strerror (errno));
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+ "waitpid");
return 1;
}
- if (! (WIFEXITED (status) && (0 == WEXITSTATUS (status))))
+ if (! (WIFEXITED (status) &&
+ (0 == WEXITSTATUS (status))) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Process `%s` returned status code %d/%d.\n",
+ file,
+ WIFEXITED (status),
+ WEXITSTATUS (status));
return 1;
+ }
/* child process completed and returned success, we're happy */
return 0;
}
@@ -572,6 +605,8 @@ identity_cb (void *cls,
&rd.data_size));
rd.record_type = GNUNET_GNSRECORD_TYPE_VPN;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating `www` record\n");
qe = GNUNET_NAMESTORE_records_store (namestore,
zone_key,
"www",
@@ -593,15 +628,18 @@ run (void *cls,
char *bin;
char *bin_identity;
char *bin_gns;
+ char *bin_arm;
char *config;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Test logic starting...\n");
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
"arm",
"CONFIG",
&config))
{
- fprintf (stderr,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to locate configuration file. Skipping test.\n");
GNUNET_SCHEDULER_shutdown ();
return;
@@ -626,18 +664,27 @@ run (void *cls,
{
"gnunet-identity",
"-e", "master-zone",
- "-s", "gns-intercept",
+ "-s", "dns2gns",
+ "-c", config,
+ NULL
+ };
+ char *const arm_args[] =
+ {
+ "gnunet-arm",
+ "-i", "dns2gns",
"-c", config,
NULL
};
char *const gns_args[] =
{
"gnunet-gns",
- "-u", "www.gns",
+ "-u", "www.gnu",
"-c", config,
NULL
};
- GNUNET_TESTING_peer_get_identity (peer, &id);
+
+ GNUNET_TESTING_peer_get_identity (peer,
+ &id);
GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
NULL);
timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
@@ -648,20 +695,24 @@ run (void *cls,
"%s/%s",
bin,
"gnunet-identity");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating `master-zone` ego\n");
if (0 != fork_and_exec (bin_identity, identity_args))
{
- fprintf (stderr,
- "Failed to run `gnunet-identity -C. Skipping test.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to run `gnunet-identity -C`. Skipping test.\n");
GNUNET_SCHEDULER_shutdown ();
GNUNET_free (bin_identity);
GNUNET_free (config);
GNUNET_free (bin);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Setting `master-zone` ego as default for `gns-master` and
`dns2gns`\n");
if (0 != fork_and_exec (bin_identity, identity2_args))
{
- fprintf (stderr,
- "Failed to run `gnunet-identity -e. Skipping test.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to run `gnunet-identity -e`. Skipping test.\n");
GNUNET_SCHEDULER_shutdown ();
GNUNET_free (bin_identity);
GNUNET_free (config);
@@ -670,8 +721,8 @@ run (void *cls,
}
if (0 != fork_and_exec (bin_identity, identity3_args))
{
- fprintf (stderr,
- "Failed to run `gnunet-identity -e. Skipping test.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to run `gnunet-identity -e`. Skipping test.\n");
GNUNET_SCHEDULER_shutdown ();
GNUNET_free (bin_identity);
GNUNET_free (config);
@@ -681,14 +732,17 @@ run (void *cls,
GNUNET_free (bin_identity);
/* do lookup just to launch GNS service */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Resolving `www.gnu` zone entry to launch GNS (will yield no
answer yet)\n");
GNUNET_asprintf (&bin_gns,
"%s/%s",
bin,
"gnunet-gns");
- if (0 != fork_and_exec (bin_gns, gns_args))
+ if (0 != fork_and_exec (bin_gns,
+ gns_args))
{
- fprintf (stderr,
- "Failed to run `gnunet-gns -u. Skipping test.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to run `gnunet-gns -u. Skipping test.\n");
GNUNET_SCHEDULER_shutdown ();
GNUNET_free (bin_gns);
GNUNET_free (config);
@@ -696,9 +750,27 @@ run (void *cls,
return;
}
GNUNET_free (bin_gns);
+
+ GNUNET_asprintf (&bin_arm,
+ "%s/%s",
+ bin,
+ "gnunet-arm");
+ if (0 != fork_and_exec (bin_arm,
+ arm_args))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to run `gnunet-arm -i dns2gns. Skipping test.\n");
+ GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free (bin_arm);
+ GNUNET_free (config);
+ GNUNET_free (bin);
+ return;
+ }
+ GNUNET_free (bin_arm);
+
GNUNET_free (config);
GNUNET_free (bin);
-
+ sleep (1); /* give dns2gns chance to really run */
namestore = GNUNET_NAMESTORE_connect (cfg);
GNUNET_assert (NULL != namestore);
@@ -720,39 +792,15 @@ run (void *cls,
int
-main (int argc, char *const *argv)
+main (int argc,
+ char *const *argv)
{
- char *sbin_iptables;
char *bin_vpn;
char *bin_exit;
- char *bin_dns;
- char *srv_dns;
- struct stat s;
- gid_t my_gid;
- char *const iptables_args[] =
- {
- "iptables", "-t", "mangle", "-L", "-v", NULL
- };
-
- if (0 == access ("/sbin/iptables", X_OK))
- sbin_iptables = "/sbin/iptables";
- else if (0 == access ("/usr/sbin/iptables", X_OK))
- sbin_iptables = "/usr/sbin/iptables";
- else
- {
- fprintf (stderr,
- "Executable iptables not found in approved directories: %s,
skipping\n",
- strerror (errno));
- return 77;
- }
-
- if (0 != fork_and_exec (sbin_iptables, iptables_args))
- {
- fprintf (stderr,
- "Failed to run `iptables -t mangle -L -v'. Skipping test.\n");
- return 77;
- }
+ GNUNET_log_setup ("test-gns-vpn",
+ "WARNING",
+ NULL);
if (0 != ACCESS ("/dev/net/tun", R_OK))
{
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
@@ -765,59 +813,26 @@ main (int argc, char *const *argv)
bin_vpn = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn");
bin_exit = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit");
- bin_dns = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns");
- srv_dns = GNUNET_OS_get_libexec_binary_path ("gnunet-service-dns");
if ( (0 != geteuid ()) &&
( (GNUNET_YES !=
- GNUNET_OS_check_helper_binary (bin_vpn, GNUNET_YES, "-d gnunet-vpn -
- 169.1.3.3.7 255.255.255.0")) || //ipv4 only please!
+ GNUNET_OS_check_helper_binary (bin_vpn,
+ GNUNET_YES,
+ "-d gnunet-vpn - - 169.1.3.3.7
255.255.255.0")) || //ipv4 only please!
(GNUNET_YES !=
- GNUNET_OS_check_helper_binary (bin_exit, GNUNET_YES, "-d gnunet-vpn -
- - 169.1.3.3.7 255.255.255.0")) || //no nat, ipv4 only
- (GNUNET_YES !=
- GNUNET_OS_check_helper_binary (bin_dns, GNUNET_YES, NULL))) ) //
TODO: once we have a windows-testcase, add test parameters here
+ GNUNET_OS_check_helper_binary (bin_exit,
+ GNUNET_YES,
+ "-d gnunet-vpn - - - 169.1.3.3.7
255.255.255.0")) ) ) //no nat, ipv4 only
{
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");
+ "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");
GNUNET_free (bin_vpn);
GNUNET_free (bin_exit);
- GNUNET_free (bin_dns);
- GNUNET_free (srv_dns);
return 77;
}
GNUNET_free (bin_vpn);
GNUNET_free (bin_exit);
- my_gid = getgid ();
- if ( (0 != stat (bin_dns, &s)) ||
- (my_gid == s.st_gid) ||
- ( (0 == (S_ISUID & s.st_mode)) && (0 != getuid()) ) )
- {
- fprintf (stderr,
- "WARNING: %s has wrong permissions (%d, %d, %d), refusing to run
test (as it would have to fail).\n",
- bin_dns,
- (0 != stat (bin_dns, &s)),
- (my_gid == s.st_gid),
- (0 == (S_ISUID & s.st_mode)) || (0 != getuid()) );
- GNUNET_free (bin_dns);
- GNUNET_free (srv_dns);
- return 77;
- }
- if ( (0 != stat (srv_dns, &s)) ||
- (my_gid == s.st_gid) ||
- (0 == (S_ISGID & s.st_mode)) )
- {
- fprintf (stderr,
- "WARNING: %s has wrong permissions (%d, %d, %d), refusing to run
test (as it would have to fail).\n",
- srv_dns,
- (0 != stat (bin_dns, &s)),
- (my_gid == s.st_gid),
- (0 == (S_ISGID & s.st_mode)) );
- GNUNET_free (bin_dns);
- GNUNET_free (srv_dns);
- return 77;
- }
- GNUNET_free (bin_dns);
- GNUNET_free (srv_dns);
dest_ip = "169.254.86.1";
dest_af = AF_INET;
@@ -842,9 +857,11 @@ main (int argc, char *const *argv)
}
- if (0 != GNUNET_TESTING_peer_run ("test-gnunet-vpn",
- "test_gns_vpn.conf",
- &run, NULL))
+ if (0 !=
+ GNUNET_TESTING_peer_run ("test_gns_vpn",
+ "test_gns_vpn.conf",
+ &run,
+ NULL))
return 1;
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-vpn");
return global_ret;
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index ac9724c04..86642465f 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -35,6 +35,10 @@ FORCESTART = YES
AUTOSTART = NO
FORCESTART = NO
+[zonemaster]
+AUTOSTART = YES
+FORCESTART = YES
+
#[vpn]
#PREFIX = valgrind
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 043bdd7d2..bab7976ea 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -1633,7 +1633,9 @@ GNUNET_TESTING_service_run (const char *testdir,
char *binary;
char *libexec_binary;
- GNUNET_log_setup (testdir, "WARNING", NULL);
+ GNUNET_log_setup (testdir,
+ "WARNING",
+ NULL);
system = GNUNET_TESTING_system_create (testdir, "127.0.0.1", NULL, NULL);
if (NULL == system)
return 1;
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index ea3ae3e79..b801f4f53 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -823,9 +823,13 @@ GNUNET_OS_check_helper_binary (const char *binary,
#ifdef MINGW
char *binaryexe;
- GNUNET_asprintf (&binaryexe, "%s.exe", binary);
- if ( (GNUNET_YES == GNUNET_STRINGS_path_is_absolute (binaryexe, GNUNET_NO,
- NULL, NULL)) ||
+ GNUNET_asprintf (&binaryexe,
+ "%s.exe",
+ binary);
+ if ( (GNUNET_YES ==
+ GNUNET_STRINGS_path_is_absolute (binaryexe,
+ GNUNET_NO,
+ NULL, NULL)) ||
(0 == strncmp (binary, "./", 2)) )
p = GNUNET_strdup (binaryexe);
else
@@ -840,16 +844,24 @@ GNUNET_OS_check_helper_binary (const char *binary,
}
GNUNET_free (binaryexe);
#else
- if ( (GNUNET_YES == GNUNET_STRINGS_path_is_absolute (binary, GNUNET_NO,
- NULL, NULL)) ||
+ if ( (GNUNET_YES ==
+ GNUNET_STRINGS_path_is_absolute (binary,
+ GNUNET_NO,
+ NULL,
+ NULL)) ||
(0 == strncmp (binary, "./", 2)) )
+ {
p = GNUNET_strdup (binary);
+ }
else
{
p = get_path_from_PATH (binary);
if (NULL != p)
{
- GNUNET_asprintf (&pf, "%s/%s", p, binary);
+ GNUNET_asprintf (&pf,
+ "%s/%s",
+ p,
+ binary);
GNUNET_free (p);
p = pf;
}
@@ -862,9 +874,12 @@ GNUNET_OS_check_helper_binary (const char *binary,
binary);
return GNUNET_SYSERR;
}
- if (0 != ACCESS (p, X_OK))
+ if (0 != ACCESS (p,
+ X_OK))
{
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "access", p);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING,
+ "access",
+ p);
GNUNET_free (p);
return GNUNET_SYSERR;
}
@@ -873,22 +888,30 @@ GNUNET_OS_check_helper_binary (const char *binary,
{
/* as we run as root, we don't insist on SUID */
GNUNET_free (p);
- return GNUNET_OK;
+ return GNUNET_YES;
}
#endif
- if (0 != STAT (p, &statbuf))
+ if (0 != STAT (p,
+ &statbuf))
{
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat", p);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING,
+ "stat",
+ p);
GNUNET_free (p);
return GNUNET_SYSERR;
}
- if (check_suid){
+ if (check_suid)
+ {
#ifndef MINGW
- if ((0 != (statbuf.st_mode & S_ISUID)) && (0 == statbuf.st_uid))
+ if ( (0 != (statbuf.st_mode & S_ISUID)) &&
+ (0 == statbuf.st_uid) )
{
GNUNET_free (p);
return GNUNET_YES;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Binary `%s' exists, but is not SUID\n"),
+ p);
/* binary exists, but not SUID */
#else
STARTUPINFO start;
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (caf375948 -> e86eed188),
gnunet <=
- [GNUnet-SVN] [gnunet] 02/09: fix typo in example, gnunet, 2017/02/23
- [GNUnet-SVN] [gnunet] 07/09: fix use of uninitialized ID after last refactoring, gnunet, 2017/02/23
- [GNUnet-SVN] [gnunet] 09/09: update .gitignore files, gnunet, 2017/02/23
- [GNUnet-SVN] [gnunet] 03/09: fix indentation, gnunet, 2017/02/23
- [GNUnet-SVN] [gnunet] 06/09: log which name we are resolving, gnunet, 2017/02/23
- [GNUnet-SVN] [gnunet] 04/09: fix indentation, typo, improve logging, gnunet, 2017/02/23
- [GNUnet-SVN] [gnunet] 05/09: change default port to 53, use setcap to enable binding to low port, gnunet, 2017/02/23
- [GNUnet-SVN] [gnunet] 01/09: fix termination, proper shutdown on CTRL-C, gnunet, 2017/02/23
- [GNUnet-SVN] [gnunet] 08/09: use of dns2gns proxy instead of DNS interceptor in VPN test, gnunet, 2017/02/23