From cdf3b6745f83502a6fd246cb92a225f09bc4de0d Mon Sep 17 00:00:00 2001 From: lurchi Date: Sat, 8 Jul 2017 21:50:20 +0200 Subject: implement GNUNET_h2s2 for printing two hashes in one log output line --- src/util/common_logging.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 34481fe13..33edb9b1a 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -1155,6 +1155,27 @@ GNUNET_h2s (const struct GNUNET_HashCode * hc) } +/** + * Convert a hash to a string (for printing debug messages). + * This is one of the very few calls in the entire API that is + * NOT reentrant! Identical to #GNUNET_h2s(), except that another + * buffer is used so both #GNUNET_h2s() and #GNUNET_i2s2() can be + * used within the same log statement. + * + * @param hc the hash code + * @return string form; will be overwritten by next call to GNUNET_h2s. + */ +const char * +GNUNET_h2s2 (const struct GNUNET_HashCode * hc) +{ + static struct GNUNET_CRYPTO_HashAsciiEncoded ret; + + GNUNET_CRYPTO_hash_to_enc (hc, &ret); + ret.encoding[8] = '\0'; + return (const char *) ret.encoding; +} + + /** * @ingroup logging * Convert a short hash value to a string (for printing debug messages). -- cgit v1.2.3 From 6d96643709856bd59c47e7cca2b40636435a40f8 Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Sat, 8 Jul 2017 19:50:21 +0000 Subject: -very unimportant typo fixed --- src/util/common_logging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 33edb9b1a..3e71fa476 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -1159,7 +1159,7 @@ GNUNET_h2s (const struct GNUNET_HashCode * hc) * Convert a hash to a string (for printing debug messages). * This is one of the very few calls in the entire API that is * NOT reentrant! Identical to #GNUNET_h2s(), except that another - * buffer is used so both #GNUNET_h2s() and #GNUNET_i2s2() can be + * buffer is used so both #GNUNET_h2s() and #GNUNET_h2s2() can be * used within the same log statement. * * @param hc the hash code -- cgit v1.2.3 From f0bca33f0011119bc103ba0e4c5ab83de2f00199 Mon Sep 17 00:00:00 2001 From: xrs Date: Thu, 13 Jul 2017 17:10:04 +0200 Subject: multicast: fix bugs --- src/multicast/gnunet-service-multicast.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index 39623e7b1..896f75c56 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c @@ -767,10 +767,11 @@ cadet_send_join_decision_cb (void *cls, { chn->join_status = JOIN_REFUSED; } - cadet_send_channel (chn, &hdcsn->header); - return GNUNET_NO; + return GNUNET_YES; } + + // return GNUNET_YES to continue the multihashmap_get iteration return GNUNET_YES; } @@ -845,13 +846,13 @@ cadet_notify_connect (void *cls, struct GNUNET_CADET_Channel *channel, const struct GNUNET_PeerIdentity *source) { - struct Channel *chn = GNUNET_malloc (sizeof *chn); + struct Channel *chn = GNUNET_malloc (sizeof (struct Channel)); chn->group = cls; chn->channel = channel; chn->direction = DIR_INCOMING; chn->join_status = JOIN_NOT_ASKED; - - GNUNET_CONTAINER_multihashmap_put (channels_in, &chn->group_pub_hash, chn, + + GNUNET_CONTAINER_multihashmap_put (channels_in, &chn->group->pub_key_hash, chn, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); return chn; } @@ -1395,7 +1396,7 @@ handle_client_origin_start (void *cls, orig->cadet_port = GNUNET_CADET_open_port (cadet, &grp->cadet_port_hash, cadet_notify_connect, - NULL, + grp, cadet_notify_window_change, cadet_notify_disconnect, cadet_handlers); @@ -1458,7 +1459,7 @@ handle_client_member_join (void *cls, GNUNET_CRYPTO_ecdsa_key_get_public (&msg->member_key, &mem_pub_key); GNUNET_CRYPTO_hash (&mem_pub_key, sizeof (mem_pub_key), &mem_pub_key_hash); GNUNET_CRYPTO_hash (&msg->group_pub_key, sizeof (msg->group_pub_key), &pub_key_hash); - + struct GNUNET_CONTAINER_MultiHashMap * grp_mem = GNUNET_CONTAINER_multihashmap_get (group_members, &pub_key_hash); struct Member *mem = NULL; @@ -1468,6 +1469,7 @@ handle_client_member_join (void *cls, { mem = GNUNET_CONTAINER_multihashmap_get (grp_mem, &mem_pub_key_hash); } + if (NULL == mem) { mem = GNUNET_new (struct Member); @@ -1483,15 +1485,16 @@ handle_client_member_join (void *cls, grp->pub_key = msg->group_pub_key; grp->pub_key_hash = pub_key_hash; group_set_cadet_port_hash (grp); - + if (NULL == grp_mem) { grp_mem = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); - GNUNET_CONTAINER_multihashmap_put (group_members, &grp->pub_key_hash, grp_mem, + ret = GNUNET_CONTAINER_multihashmap_put (group_members, &grp->pub_key_hash, grp_mem, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); } GNUNET_CONTAINER_multihashmap_put (grp_mem, &mem->pub_key_hash, mem, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + GNUNET_CONTAINER_multihashmap_put (members, &grp->pub_key_hash, mem, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); } @@ -1508,7 +1511,7 @@ handle_client_member_join (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client connected to group %s as member %s (%s).\n", GNUNET_h2s (&grp->pub_key_hash), - GNUNET_h2s (&mem->pub_key_hash), + GNUNET_h2s2 (&mem->pub_key_hash), str); GNUNET_free (str); @@ -1636,7 +1639,8 @@ handle_client_join_decision (void *cls, "%p ..and member %s: %p\n", grp, GNUNET_h2s (&member_key_hash), mem); } - if (NULL != mem) + + if (NULL != mem) { /* Found local member */ client_send_join_decision (mem, hdcsn); } -- cgit v1.2.3 From 94d4a65182acfb68cf1d4acdcddae1399d6e561f Mon Sep 17 00:00:00 2001 From: xrs Date: Thu, 13 Jul 2017 17:11:33 +0200 Subject: test_multicast_multipeer: fix bug --- src/multicast/test_multicast_multipeer.c | 153 +++++++++++++++++-------------- 1 file changed, 85 insertions(+), 68 deletions(-) diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c index 5c3664f35..29ee1e48f 100644 --- a/src/multicast/test_multicast_multipeer.c +++ b/src/multicast/test_multicast_multipeer.c @@ -33,7 +33,7 @@ #include "gnunet_testbed_service.h" #include "gnunet_multicast_service.h" -#define NUM_PEERS 2 +#define NUM_PEERS 10 struct multicast_peer { @@ -44,6 +44,18 @@ struct multicast_peer int test_ok; }; +enum pingpong +{ + PING = 1, + PONG = 2 +}; + +struct pingpong_msg +{ + int peer; + enum pingpong msg; +}; + static void service_connect (void *cls, struct GNUNET_TESTBED_Operation *op, void *ca_result, @@ -61,8 +73,9 @@ static struct GNUNET_MULTICAST_Member *member[NUM_PEERS]; /* first element alway static struct GNUNET_SCHEDULER_Task *timeout_tid; -static struct GNUNET_CRYPTO_EddsaPrivateKey *group_key; -static struct GNUNET_CRYPTO_EddsaPublicKey *group_pub_key; +static struct GNUNET_CRYPTO_EddsaPrivateKey group_key; +static struct GNUNET_CRYPTO_EddsaPublicKey group_pub_key; +static struct GNUNET_HashCode group_pub_key_hash; static struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key[NUM_PEERS]; static struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key[NUM_PEERS]; @@ -143,12 +156,15 @@ notify (void *cls, { struct multicast_peer *mc_peer = (struct multicast_peer*)cls; - char text[] = "ping"; - *data_size = strlen(text)+1; - GNUNET_memcpy(data, text, *data_size); + struct pingpong_msg *pp_msg = GNUNET_new (struct pingpong_msg); + pp_msg->peer = mc_peer->peer; + pp_msg->msg = PING; + + *data_size = sizeof (struct pingpong_msg); + GNUNET_memcpy(data, pp_msg, *data_size); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Peer #%u sents message to origin: %s\n", mc_peer->peer, text); + "Peer #%u sents ping to origin\n", mc_peer->peer); return GNUNET_YES; } @@ -203,28 +219,19 @@ member_message (void *cls, const struct GNUNET_MULTICAST_MessageHeader *msg) { struct multicast_peer *mc_peer = (struct multicast_peer*)cls; + struct pingpong_msg *pp_msg = (struct pingpong_msg*) &(msg[1]); - if (0 != strncmp ("pong", (char *)&msg[1], 4)) + if (PONG == pp_msg->msg && mc_peer->peer == pp_msg->peer) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "peer #%i (%s) did not receive pong\n", + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "peer #%i (%s) receives a pong\n", mc_peer->peer, GNUNET_i2s (mc_peers[mc_peer->peer]->id)); - result = GNUNET_SYSERR; - GNUNET_SCHEDULER_shutdown (); + mc_peer->test_ok = GNUNET_OK; } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "peer #%i (%s) receives: %s\n", - mc_peer->peer, - GNUNET_i2s (mc_peers[mc_peer->peer]->id), - (char *)&msg[1]); - - mc_peer->test_ok = GNUNET_OK; - - // FIXME: ugly test function - // (we start with 1 because 0 is origin) + // Test for completeness of received PONGs for (int i=1; itest_ok) return; @@ -298,11 +305,15 @@ origin_notify (void *cls, size_t *data_size, void *data) { - char text[] = "pong"; - *data_size = strlen(text)+1; - memcpy(data, text, *data_size); + struct pingpong_msg *rcv_pp_msg = (struct pingpong_msg*)cls; + struct pingpong_msg *pp_msg = GNUNET_new (struct pingpong_msg); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends (to all): %s\n", text); + pp_msg->peer = rcv_pp_msg->peer; + pp_msg->msg = PONG; + *data_size = sizeof (struct pingpong_msg); + memcpy(data, pp_msg, *data_size); + + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends pong (to all)\n"); return GNUNET_YES; } @@ -312,9 +323,12 @@ static void origin_request (void *cls, const struct GNUNET_MULTICAST_RequestHeader *req) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin receives: %s\n", (char *)&req[1]); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin receives a msg\n"); + + req++; + struct pingpong_msg *pp_msg = (struct pingpong_msg *) req; - if (0 != strncmp ("ping", (char *)&req[1], 4)) { + if (1 != pp_msg->msg) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "origin didn't reveice a correct request"); } @@ -322,7 +336,7 @@ origin_request (void *cls, 0, 0, origin_notify, - cls); + pp_msg); } @@ -366,15 +380,17 @@ multicast_ca (void *cls, struct multicast_peer *mc_peer = (struct multicast_peer*)cls; struct GNUNET_MessageHeader *join_msg; char data[64]; - + if (0 == mc_peer->peer) { - group_pub_key = GNUNET_new (struct GNUNET_CRYPTO_EddsaPublicKey); - group_key = GNUNET_CRYPTO_eddsa_key_create (); - GNUNET_CRYPTO_eddsa_key_get_public (group_key, group_pub_key); + struct GNUNET_CRYPTO_EddsaPrivateKey *key = GNUNET_CRYPTO_eddsa_key_create (); + GNUNET_CRYPTO_eddsa_key_get_public (key, &group_pub_key); + GNUNET_CRYPTO_hash (&group_pub_key, sizeof (group_pub_key), &group_pub_key_hash); - return GNUNET_MULTICAST_origin_start (cfg, - group_key, + group_key = *key; + + origin = GNUNET_MULTICAST_origin_start (cfg, + &group_key, 0, origin_join_request, origin_replay_frag, @@ -382,6 +398,20 @@ multicast_ca (void *cls, origin_request, origin_message, cls); + + if (NULL == origin) { + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Peer #%u could not create a multicast group", + mc_peer->peer); + return NULL; + } + + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Peer #%u connected as origin to group %s\n", + mc_peer->peer, + GNUNET_h2s (&group_pub_key_hash)); + + return origin; } else { @@ -401,23 +431,25 @@ multicast_ca (void *cls, GNUNET_memcpy (&join_msg[1], data, data_size); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Peer #%u (%s) tries to join multicast group\n", + "Peer #%u (%s) tries to join multicast group %s\n", mc_peer->peer, - GNUNET_i2s (mc_peers[mc_peer->peer]->id)); - - return GNUNET_MULTICAST_member_join (cfg, - group_pub_key, - member_key[mc_peer->peer], - mc_peers[0]->id, - 0, - NULL, - join_msg, /* join message */ - member_join_request, - member_join_decision, - member_replay_frag, - member_replay_msg, - member_message, - cls); + GNUNET_i2s (mc_peers[mc_peer->peer]->id), + GNUNET_h2s (&group_pub_key_hash)); + + member[mc_peer->peer] = GNUNET_MULTICAST_member_join (cfg, + &group_pub_key, + member_key[mc_peer->peer], + mc_peers[0]->id, + 0, + NULL, + join_msg, /* join message */ + member_join_request, + member_join_decision, + member_replay_frag, + member_replay_msg, + member_message, + cls); + return member[mc_peer->peer]; } } @@ -485,19 +517,9 @@ service_connect (void *cls, GNUNET_SCHEDULER_shutdown(); } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Connected to multicast service of peer #%u (%s)\n", - mc_peer->peer, - GNUNET_i2s (mc_peers[mc_peer->peer]->id)); - if (0 == mc_peer->peer) { - origin = ca_result; - - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Connected to multicast service of origin\n"); - - // Get GNUnet identity of members + // Get GNUnet identity of members for (int i = 0; ipeer] = ca_result; - } } @@ -529,8 +547,7 @@ service_connect (void *cls, * @param num_peers size of the 'peers' array * @param links_succeeded number of links between peers that were created * @param links_failed number of links testbed was unable to establish - */ -static void + */ static void testbed_master (void *cls, struct GNUNET_TESTBED_RunHandle *h, unsigned int num_peers, -- cgit v1.2.3 From d2308f5bdabd352fa9f6242586b60147006f8081 Mon Sep 17 00:00:00 2001 From: xrs Date: Thu, 13 Jul 2017 17:12:04 +0200 Subject: add comment --- src/multicast/test_multicast.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf index 8e80650db..45bf39618 100644 --- a/src/multicast/test_multicast.conf +++ b/src/multicast/test_multicast.conf @@ -6,6 +6,7 @@ OVERLAY_TOPOLOGY = STAR GLOBAL_POSTFIX=-L ERROR [hostlist] +# Do not use a hostlist server SERVERS = [multicast] -- cgit v1.2.3 From 68c41dc23e1cc33ed023c810285b3f23892d8605 Mon Sep 17 00:00:00 2001 From: xrs Date: Thu, 13 Jul 2017 17:14:55 +0200 Subject: missing clean up --- src/multicast/gnunet-service-multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index 896f75c56..2f4dc8a14 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c @@ -1489,7 +1489,7 @@ handle_client_member_join (void *cls, if (NULL == grp_mem) { grp_mem = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); - ret = GNUNET_CONTAINER_multihashmap_put (group_members, &grp->pub_key_hash, grp_mem, + GNUNET_CONTAINER_multihashmap_put (group_members, &grp->pub_key_hash, grp_mem, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); } GNUNET_CONTAINER_multihashmap_put (grp_mem, &mem->pub_key_hash, mem, -- cgit v1.2.3 From cd8ffdb973670871d8fae691671fc0eb0f3c7ba3 Mon Sep 17 00:00:00 2001 From: xrs Date: Thu, 13 Jul 2017 21:24:29 +0200 Subject: add local test again --- src/multicast/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am index a680a9d5a..f26c6ef4b 100644 --- a/src/multicast/Makefile.am +++ b/src/multicast/Makefile.am @@ -50,13 +50,12 @@ gnunet_service_multicast_LDADD = \ $(GN_LIBINTL) check_PROGRAMS = \ + test_multicast \ test_multicast_multipeer -# test_multicast # test_multicast_2peers if ENABLE_TEST_RUN AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME; -#AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME; export GNUNET_FORCE_LOG=';;;;INFO'; TESTS = $(check_PROGRAMS) endif -- cgit v1.2.3 From 29f76b6fe373cd5ca7504be2ffdaad5500406b8b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 18 Jul 2017 22:55:09 +0200 Subject: simplify installation of nss plugins in build system, require user(s) to move plugins into place manually (#5078) --- configure.ac | 47 -------------------- src/gns/Makefile.am | 2 - src/gns/nss/Makefile.am | 26 +----------- src/gns/nss/install-nss-plugin.sh | 8 ---- src/gns/nss/uninstall-nss-plugin.sh | 8 ---- src/util/Makefile.am | 8 ++-- src/util/resolver_api.c | 85 +++++++++++++++++++++++-------------- 7 files changed, 60 insertions(+), 124 deletions(-) delete mode 100755 src/gns/nss/install-nss-plugin.sh delete mode 100755 src/gns/nss/uninstall-nss-plugin.sh diff --git a/configure.ac b/configure.ac index c16fbdcba..101fc77cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1116,45 +1116,6 @@ AC_SUBST(SUDO_BINARY) AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "x" -o -w /]) -# test for nssdir -AC_MSG_CHECKING(with nssdir) -AC_ARG_WITH(nssdir, - [ --with-nssdir=PATH where to install NSS plugins], - [AC_MSG_RESULT("$with_nssdir") - case $with_nssdir in - no) - NSS_DIR= - install_nss=0 - ;; - yes) - NSS_DIR="/lib" - install_nss=1 - ;; - *) - NSS_DIR=$with_nssdir - install_nss=1 - ;; - esac - ], - [ -# This test is inappropriate when installation with DESTDIR is -# run much later and uid will be root when needed. Enabling this -# code breaks the gnunet.ebuild for gentoo. -# -# if test "x$SUDO_BINARY" != "x" -o -w / -# then - NSS_DIR="/lib" - install_nss=1 - AC_MSG_RESULT([yes, to /lib]) -# else -# NSS_DIR= -# install_nss=0 -# AC_MSG_RESULT([no]) -# fi - ]) -AC_SUBST(NSS_DIR) -AM_CONDITIONAL([INSTALL_NSS], [test "x$install_nss" != "x0"]) - # test for gnunetdns group name GNUNETDNS_GROUP=gnunetdns AC_MSG_CHECKING(for gnunetdns group name) @@ -1793,14 +1754,6 @@ then AC_MSG_NOTICE([Mac OS X framework build enabled.]) fi -if test "x$install_nss" = "x0" -then - AC_MSG_NOTICE([WARNING: Will not install GNS NSS library]) -else - AC_MSG_NOTICE([NOTICE: Will install GNS NSS library to $NSS_DIR]) -fi - - AC_MSG_NOTICE([******************************************** Please make sure NOW that you have created a user and group 'gnunet' and additionally a group 'gnunetdns'. On Debian and Ubuntu GNU/Linux, type: diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 464bbbca1..977eb87e3 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am @@ -2,10 +2,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include if HAVE_GLIBCNSS -if INSTALL_NSS NSS_SUBDIR = nss endif -endif SUBDIRS = . $(NSS_SUBDIR) diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am index 2551b9562..5d42f777f 100644 --- a/src/gns/nss/Makefile.am +++ b/src/gns/nss/Makefile.am @@ -18,28 +18,17 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 # USA. -EXTRA_DIST = map-file \ - install-nss-plugin.sh \ - uninstall-nss-plugin.sh +EXTRA_DIST = map-file AM_LDFLAGS=-avoid-version -module -export-dynamic -nssdir = $(NSS_DIR) - -LIBTOOL = $(LIBTOOL_SUDO_BINARY) $(SHELL) $(top_builddir)/libtool +nssdir = $(libdir)/gnunet/nss if !MINGW -if INSTALL_NSS nss_LTLIBRARIES = \ libnss_gns.la \ libnss_gns4.la \ libnss_gns6.la - -install-nssLTLIBRARIES: - LIBTOOL_SUDO_BINARY=$(SUDO_BINARY) -uninstall-nssLTLIBRARIES: - LIBTOOL_SUDO_BINARY=$(SUDO_BINARY) -endif endif sources = nss_gns_query.h nss_gns_query.c @@ -57,14 +46,3 @@ libnss_gns6_la_SOURCES=$(libnss_gns_la_SOURCES) libnss_gns6_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV6_ONLY=1 libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS) -if INSTALL_NSS -if !MINGW -install-data-hook: - $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) $(top_builddir) $(DESTDIR)$(nssdir) $(SUDO_BINARY) - -uninstall-hook: - $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns.so.2" $(SUDO_BINARY) - $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns4.so.2" $(SUDO_BINARY) - $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns6.so.2" $(SUDO_BINARY) -endif -endif diff --git a/src/gns/nss/install-nss-plugin.sh b/src/gns/nss/install-nss-plugin.sh deleted file mode 100755 index 1aab8ca69..000000000 --- a/src/gns/nss/install-nss-plugin.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $1 - shell -# $2 - top_builddir -# $3 - nssdir -# $4 - sudo binary (empty if root) -$4 $1 $2/libtool --mode=finish $3 -echo LTINST: $4 $1 $2/libtool --mode=finish $3 -$4 rm -f $3/libnss_gns.la $3/libnss_gns4.la $3/libnss_gns6.la diff --git a/src/gns/nss/uninstall-nss-plugin.sh b/src/gns/nss/uninstall-nss-plugin.sh deleted file mode 100755 index 3d8cec110..000000000 --- a/src/gns/nss/uninstall-nss-plugin.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $1 - shell -# $2 - top_builddir -# $3 - nssdir+path of library to remove -# $4 - sudo binary (empty if root) -$4 $1 $2/libtool --mode=uninstall $3 - - diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 9be572bb6..c26e3e84b 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -336,10 +336,10 @@ test_client_unix_nc_SOURCES = \ test_client_unix_nc_LDADD = \ libgnunetutil.la -test_socks_nc_SOURCES = \ - test_socks.c -test_socks_nc_LDADD = \ - libgnunetutil.la +#test_socks_nc_SOURCES = \ +# test_socks.c +#test_socks_nc_LDADD = \ +# libgnunetutil.la test_common_allocation_SOURCES = \ test_common_allocation.c diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c index e7bba3000..33a340729 100644 --- a/src/util/resolver_api.c +++ b/src/util/resolver_api.c @@ -179,7 +179,6 @@ static int check_config () { char *hostname; - unsigned int i; struct sockaddr_in v4; struct sockaddr_in6 v6; @@ -206,15 +205,16 @@ check_config () "resolver"); return GNUNET_SYSERR; } - if ((1 == inet_pton (AF_INET, hostname, &v4)) || - (1 == inet_pton (AF_INET6, hostname, &v6))) + if ( (1 == inet_pton (AF_INET, hostname, &v4)) || + (1 == inet_pton (AF_INET6, hostname, &v6)) ) { GNUNET_free (hostname); return GNUNET_OK; } - i = 0; - while (NULL != loopback[i]) - if (0 == strcasecmp (loopback[i++], hostname)) + for (unsigned int i = 0; + NULL != loopback[i]; + i++) + if (0 == strcasecmp (loopback[i], hostname)) { GNUNET_free (hostname); return GNUNET_OK; @@ -297,9 +297,9 @@ shutdown_task (void *cls) static void check_disconnect () { - struct GNUNET_RESOLVER_RequestHandle *rh; - - for (rh = req_head; NULL != rh; rh = rh->next) + for (struct GNUNET_RESOLVER_RequestHandle *rh = req_head; + NULL != rh; + rh = rh->next) if (GNUNET_SYSERR != rh->was_transmitted) return; if (NULL != r_task) @@ -336,7 +336,10 @@ no_resolve (int af, if (ip_len != sizeof (struct in_addr)) return NULL; if (NULL == - inet_ntop (AF_INET, ip, buf, sizeof (buf))) + inet_ntop (AF_INET, + ip, + buf, + sizeof (buf))) { LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop"); @@ -347,7 +350,10 @@ no_resolve (int af, if (ip_len != sizeof (struct in6_addr)) return NULL; if (NULL == - inet_ntop (AF_INET6, ip, buf, sizeof (buf))) + inet_ntop (AF_INET6, + ip, + buf, + sizeof (buf))) { LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop"); @@ -422,8 +428,8 @@ process_requests () msg->direction = htonl (rh->direction); msg->af = htonl (rh->af); GNUNET_memcpy (&msg[1], - &rh[1], - rh->data_len); + &rh[1], + rh->data_len); LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting DNS resolution request to DNS service\n"); GNUNET_MQ_send (mq, @@ -611,14 +617,19 @@ numeric_resolution (void *cls) v6.sin6_len = sizeof (v6); #endif hostname = (const char *) &rh[1]; - if (((rh->af == AF_UNSPEC) || (rh->af == AF_INET)) && - (1 == inet_pton (AF_INET, hostname, &v4.sin_addr))) + if ( ( (rh->af == AF_UNSPEC) || + (rh->af == AF_INET) ) && + (1 == inet_pton (AF_INET, + hostname, + &v4.sin_addr)) ) { rh->addr_callback (rh->cls, (const struct sockaddr *) &v4, sizeof (v4)); - if ((rh->af == AF_UNSPEC) && - (1 == inet_pton (AF_INET6, hostname, &v6.sin6_addr))) + if ( (rh->af == AF_UNSPEC) && + (1 == inet_pton (AF_INET6, + hostname, + &v6.sin6_addr)) ) { /* this can happen on some systems IF "hostname" is "localhost" */ rh->addr_callback (rh->cls, @@ -872,7 +883,6 @@ GNUNET_RESOLVER_ip_get (const char *hostname, { struct GNUNET_RESOLVER_RequestHandle *rh; size_t slen; - unsigned int i; struct in_addr v4; struct in6_addr v6; @@ -897,19 +907,26 @@ GNUNET_RESOLVER_ip_get (const char *hostname, rh->timeout = GNUNET_TIME_relative_to_absolute (timeout); rh->direction = GNUNET_NO; /* first, check if this is a numeric address */ - if (((1 == inet_pton (AF_INET, hostname, &v4)) && - ((af == AF_INET) || (af == AF_UNSPEC))) || - ((1 == inet_pton (AF_INET6, hostname, &v6)) && - ((af == AF_INET6) || (af == AF_UNSPEC)))) + if ( ( (1 == inet_pton (AF_INET, + hostname, + &v4)) && + ( (af == AF_INET) || + (af == AF_UNSPEC) ) ) || + ( (1 == inet_pton (AF_INET6, + hostname, + &v6)) && + ( (af == AF_INET6) || + (af == AF_UNSPEC)) ) ) { rh->task = GNUNET_SCHEDULER_add_now (&numeric_resolution, rh); return rh; } /* then, check if this is a loopback address */ - i = 0; - while (NULL != loopback[i]) - if (0 == strcasecmp (loopback[i++], + for (unsigned int i = 0; + NULL != loopback[i]; + i++) + if (0 == strcasecmp (loopback[i], hostname)) { rh->task = GNUNET_SCHEDULER_add_now (&loopback_resolution, @@ -1029,8 +1046,8 @@ GNUNET_RESOLVER_hostname_get (const struct sockaddr *sa, rh->af = sa->sa_family; rh->timeout = GNUNET_TIME_relative_to_absolute (timeout); GNUNET_memcpy (&rh[1], - ip, - ip_len); + ip, + ip_len); rh->data_len = ip_len; rh->direction = GNUNET_YES; rh->received_response = GNUNET_NO; @@ -1067,7 +1084,8 @@ GNUNET_RESOLVER_local_fqdn_get () { char hostname[GNUNET_OS_get_hostname_max_length () + 1]; - if (0 != gethostname (hostname, sizeof (hostname) - 1)) + if (0 != gethostname (hostname, + sizeof (hostname) - 1)) { LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "gethostname"); @@ -1082,7 +1100,10 @@ GNUNET_RESOLVER_local_fqdn_get () int ret; char *rval; - if (0 != (ret = getaddrinfo (hostname, NULL, NULL, &ai))) + if (0 != (ret = getaddrinfo (hostname, + NULL, + NULL, + &ai))) { LOG (GNUNET_ERROR_TYPE_ERROR, _("Could not resolve our FQDN: %s\n"), @@ -1100,9 +1121,11 @@ GNUNET_RESOLVER_local_fqdn_get () { struct hostent *host; - host = gethostbyname2 (hostname, AF_INET); + host = gethostbyname2 (hostname, + AF_INET); if (NULL == host) - host = gethostbyname2 (hostname, AF_INET6); + host = gethostbyname2 (hostname, + AF_INET6); if (NULL == host) { LOG (GNUNET_ERROR_TYPE_ERROR, -- cgit v1.2.3 From 07b12468549c690048d38a30e2c4db8dc0583eda Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 18 Jul 2017 22:59:39 +0200 Subject: fix #5107 --- src/fs/gnunet-search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c index ef1743436..89811669f 100644 --- a/src/fs/gnunet-search.c +++ b/src/fs/gnunet-search.c @@ -164,7 +164,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) info->value.search.specifics.result.meta, NULL); uri = GNUNET_FS_uri_to_string (info->value.search.specifics.result.uri); - printf ("#%u:\n", cnt++); + printf ("#%u:\n", ++cnt); filename = GNUNET_CONTAINER_meta_data_get_by_type (info->value.search. specifics.result.meta, -- cgit v1.2.3 From 5494e5f35f201244247c07fcddfe134f2234485b Mon Sep 17 00:00:00 2001 From: lurchi Date: Tue, 18 Jul 2017 22:59:42 +0200 Subject: forgot declaration of GNUNET_h2s2 --- src/include/gnunet_common.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index bda011fb2..d7f7b76ff 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h @@ -582,6 +582,21 @@ const char * GNUNET_h2s (const struct GNUNET_HashCode * hc); +/** + * @ingroup logging + * Convert a hash value to a string (for printing debug messages). + * This is one of the very few calls in the entire API that is + * NOT reentrant! Identical to #GNUNET_h2s(), except that another + * buffer is used so both #GNUNET_h2s() and #GNUNET_h2s2() can be + * used within the same log statement. + * + * @param hc the hash code + * @return string + */ +const char * +GNUNET_h2s2 (const struct GNUNET_HashCode * hc); + + /** * @ingroup logging * Convert a hash value to a string (for printing debug messages). -- cgit v1.2.3 From b669f8b6bd975be760fd9e63d8c63d1d1afdc4fc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 21 Jul 2017 14:12:07 +0200 Subject: get psd test to pass on my system --- src/fs/test_gnunet_fs_psd.py.in | 1 - 1 file changed, 1 deletion(-) diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index 2efac58ae..c5966d48a 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.py.in @@ -62,7 +62,6 @@ try: s = pexpect () s.spawn (None, [search, '-V', '-t', '1000 ms', '-N', '1', '-c', 'test_gnunet_fs_psd_data.conf', 'tst'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) s.expect ("stdout", re.compile (r'gnunet-download -o "test_gnunet_fs_rec_data.tgz" gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822\r?\n')) - s.expect ("stdout", re.compile (r"\s*description: Test archive\r?\n")) down = pexpect () down.spawn (None, [download, '-c', 'test_gnunet_fs_psd_data.conf', '-o', 'test_gnunet_fs_rec_data.tar.gz', 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) -- cgit v1.2.3 From 09d06d08c6a55abc81557a87a778660f739ba327 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 24 Jul 2017 18:56:26 +0200 Subject: fix #5094 as suggested by reporter --- src/fs/test_gnunet_fs_psd.py.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index c5966d48a..87fcf1130 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.py.in @@ -24,6 +24,11 @@ import subprocess import re import shutil +# Force encoding to utf-8, as this test otherwise fails +# on some systems (see #5094). +reload(sys) +sys.setdefaultencoding('utf8') + srcdir = "../.." gnunet_pyexpect_dir = os.path.join (srcdir, "contrib") if gnunet_pyexpect_dir not in sys.path: -- cgit v1.2.3 From 2ee79796bd4693a43f20f984a781ffcaf0e4df10 Mon Sep 17 00:00:00 2001 From: xrs Date: Wed, 2 Aug 2017 23:37:07 +0200 Subject: test_multicast: test 12 peers in line and star topology --- src/multicast/Makefile.am | 14 +++++--- src/multicast/test_multicast.conf | 56 ----------------------------- src/multicast/test_multicast_line.conf | 60 ++++++++++++++++++++++++++++++++ src/multicast/test_multicast_multipeer.c | 46 +++++++++++++++--------- src/multicast/test_multicast_star.conf | 60 ++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 76 deletions(-) delete mode 100644 src/multicast/test_multicast.conf create mode 100644 src/multicast/test_multicast_line.conf create mode 100644 src/multicast/test_multicast_star.conf diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am index f26c6ef4b..13212bca3 100644 --- a/src/multicast/Makefile.am +++ b/src/multicast/Makefile.am @@ -51,7 +51,8 @@ gnunet_service_multicast_LDADD = \ check_PROGRAMS = \ test_multicast \ - test_multicast_multipeer + test_multicast_multipeer_star \ + test_multicast_multipeer_line # test_multicast_2peers if ENABLE_TEST_RUN @@ -65,10 +66,15 @@ test_multicast_LDADD = \ libgnunetmulticast.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la - -test_multicast_multipeer_SOURCES = \ +test_multicast_multipeer_star_SOURCES = \ + test_multicast_multipeer.c +test_multicast_multipeer_star_LDADD = \ + libgnunetmulticast.la \ + $(top_builddir)/src/testbed/libgnunettestbed.la \ + $(top_builddir)/src/util/libgnunetutil.la +test_multicast_multipeer_line_SOURCES = \ test_multicast_multipeer.c -test_multicast_multipeer_LDADD = \ +test_multicast_multipeer_line_LDADD = \ libgnunetmulticast.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/util/libgnunetutil.la diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf deleted file mode 100644 index 45bf39618..000000000 --- a/src/multicast/test_multicast.conf +++ /dev/null @@ -1,56 +0,0 @@ -[testbed] -HOSTNAME = localhost -OVERLAY_TOPOLOGY = STAR - -[arm] -GLOBAL_POSTFIX=-L ERROR - -[hostlist] -# Do not use a hostlist server -SERVERS = - -[multicast] -#PREFIX = tmux split-window -v gdb -x ./cmd.gdb --args -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock - -[vpn] -AUTOSTART = NO - -[peerinfo] -# Do not use shipped gnunet HELLOs -USE_INCLUDED_HELLOS = NO - -# Option to disable all disk IO; only useful for testbed runs -# (large-scale experiments); disables persistence of HELLOs! -NO_IO = YES - -[nat] -ENABLE_UPNP = NO - -[fs] -FORCESTART = NO -AUTOSTART = NO - -[vpn] -FORCESTART = NO -AUTOSTART = NO - -[revocation] -FORCESTART = NO -AUTOSTART = NO - -[gns] -FORCESTART = NO -AUTOSTART = NO - -[namestore] -FORCESTART = NO -AUTOSTART = NO - -[namecache] -FORCESTART = NO -AUTOSTART = NO - -[topology] -FORCESTART = NO -AUTOSTART = NO diff --git a/src/multicast/test_multicast_line.conf b/src/multicast/test_multicast_line.conf new file mode 100644 index 000000000..23358e565 --- /dev/null +++ b/src/multicast/test_multicast_line.conf @@ -0,0 +1,60 @@ +[testbed] +HOSTNAME = localhost +OVERLAY_TOPOLOGY = LINE + +[arm] +GLOBAL_POSTFIX=-L ERROR + +[multicast] +#PREFIX = tmux new-window gdb -x ./cmd.gdb --args +#PREFIX = valgrind --leak-check=full +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock + +[vpn] +AUTOSTART = NO + +[peerinfo] +# Do not use shipped gnunet HELLOs +USE_INCLUDED_HELLOS = NO + +# Option to disable all disk IO; only useful for testbed runs +# (large-scale experiments); disables persistence of HELLOs! +NO_IO = YES + +[cadet] +ID_ANNOUNCE_TIME = 5 s + +[hostlist] +FORCESTART = NO +AUTOSTART = NO + +[nat] +ENABLE_UPNP = NO + +[fs] +FORCESTART = NO +AUTOSTART = NO + +[vpn] +FORCESTART = NO +AUTOSTART = NO + +[revocation] +FORCESTART = NO +AUTOSTART = NO + +[gns] +FORCESTART = NO +AUTOSTART = NO + +[namestore] +FORCESTART = NO +AUTOSTART = NO + +[namecache] +FORCESTART = NO +AUTOSTART = NO + +[topology] +FORCESTART = NO +AUTOSTART = NO diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c index 29ee1e48f..5f4493993 100644 --- a/src/multicast/test_multicast_multipeer.c +++ b/src/multicast/test_multicast_multipeer.c @@ -33,7 +33,7 @@ #include "gnunet_testbed_service.h" #include "gnunet_multicast_service.h" -#define NUM_PEERS 10 +#define PEERS_REQUESTED 12 struct multicast_peer { @@ -65,11 +65,11 @@ static struct multicast_peer **mc_peers; static struct GNUNET_TESTBED_Peer **peers; // FIXME: refactor -static struct GNUNET_TESTBED_Operation *op[NUM_PEERS]; -static struct GNUNET_TESTBED_Operation *pi_op[NUM_PEERS]; +static struct GNUNET_TESTBED_Operation *op[PEERS_REQUESTED]; +static struct GNUNET_TESTBED_Operation *pi_op[PEERS_REQUESTED]; static struct GNUNET_MULTICAST_Origin *origin; -static struct GNUNET_MULTICAST_Member *member[NUM_PEERS]; /* first element always empty */ +static struct GNUNET_MULTICAST_Member *member[PEERS_REQUESTED]; /* first element always empty */ static struct GNUNET_SCHEDULER_Task *timeout_tid; @@ -77,8 +77,8 @@ static struct GNUNET_CRYPTO_EddsaPrivateKey group_key; static struct GNUNET_CRYPTO_EddsaPublicKey group_pub_key; static struct GNUNET_HashCode group_pub_key_hash; -static struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key[NUM_PEERS]; -static struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key[NUM_PEERS]; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key[PEERS_REQUESTED]; +static struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key[PEERS_REQUESTED]; /** @@ -93,7 +93,7 @@ static int result; static void shutdown_task (void *cls) { - for (int i=0;itest_ok) return; @@ -313,7 +313,7 @@ origin_notify (void *cls, *data_size = sizeof (struct pingpong_msg); memcpy(data, pp_msg, *data_size); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends pong (to all)\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends pong\n"); return GNUNET_YES; } @@ -520,7 +520,7 @@ service_connect (void *cls, if (0 == mc_peer->peer) { // Get GNUnet identity of members - for (int i = 0; ipeer = i; @@ -600,12 +600,26 @@ int main (int argc, char *argv[]) { int ret; + char const *config_file; + + if (strstr (argv[0], "_line") != NULL) + { + config_file = "test_multicast_line.conf"; + } + else if (strstr(argv[0], "_star") != NULL) + { + config_file = "test_multicast_star.conf"; + } + else + { + config_file = "test_multicast_star.conf"; + } result = GNUNET_SYSERR; ret = GNUNET_TESTBED_test_run ("test-multicast-multipeer", /* test case name */ - "test_multicast.conf", /* template configuration */ - NUM_PEERS, /* number of peers to start */ + config_file, /* template configuration */ + PEERS_REQUESTED, /* number of peers to start */ 0LL, /* Event mask - set to 0 for no event notifications */ NULL, /* Controller event callback */ NULL, /* Closure for controller event callback */ diff --git a/src/multicast/test_multicast_star.conf b/src/multicast/test_multicast_star.conf new file mode 100644 index 000000000..8eb98d986 --- /dev/null +++ b/src/multicast/test_multicast_star.conf @@ -0,0 +1,60 @@ +[testbed] +HOSTNAME = localhost +OVERLAY_TOPOLOGY = STAR + +[arm] +GLOBAL_POSTFIX=-L ERROR + +[multicast] +#PREFIX = tmux new-window gdb -x ./cmd.gdb --args +#PREFIX = valgrind --leak-check=full +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock + +[vpn] +AUTOSTART = NO + +[peerinfo] +# Do not use shipped gnunet HELLOs +USE_INCLUDED_HELLOS = NO + +# Option to disable all disk IO; only useful for testbed runs +# (large-scale experiments); disables persistence of HELLOs! +NO_IO = YES + +[cadet] +ID_ANNOUNCE_TIME = 5 s + +[hostlist] +FORCESTART = NO +AUTOSTART = NO + +[nat] +ENABLE_UPNP = NO + +[fs] +FORCESTART = NO +AUTOSTART = NO + +[vpn] +FORCESTART = NO +AUTOSTART = NO + +[revocation] +FORCESTART = NO +AUTOSTART = NO + +[gns] +FORCESTART = NO +AUTOSTART = NO + +[namestore] +FORCESTART = NO +AUTOSTART = NO + +[namecache] +FORCESTART = NO +AUTOSTART = NO + +[topology] +FORCESTART = NO +AUTOSTART = NO -- cgit v1.2.3 From 0ccbed4cb2d247d3d5b974b8806cc74b7932e0a9 Mon Sep 17 00:00:00 2001 From: xrs Date: Wed, 2 Aug 2017 23:47:41 +0200 Subject: add test_multicast.conf --- src/multicast/test_multicast.conf | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/multicast/test_multicast.conf diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf new file mode 100644 index 000000000..1b50e0893 --- /dev/null +++ b/src/multicast/test_multicast.conf @@ -0,0 +1,56 @@ +[testbed] +HOSTNAME = localhost + +[arm] +GLOBAL_POSTFIX=-L ERROR + +[multicast] +#PREFIX = tmux new-window gdb -x ./cmd.gdb --args +#PREFIX = valgrind --leak-check=full +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock + +[vpn] +AUTOSTART = NO + +[peerinfo] +# Do not use shipped gnunet HELLOs +USE_INCLUDED_HELLOS = NO + +# Option to disable all disk IO; only useful for testbed runs +# (large-scale experiments); disables persistence of HELLOs! +NO_IO = YES + +[hostlist] +FORCESTART = NO +AUTOSTART = NO + +[nat] +ENABLE_UPNP = NO + +[fs] +FORCESTART = NO +AUTOSTART = NO + +[vpn] +FORCESTART = NO +AUTOSTART = NO + +[revocation] +FORCESTART = NO +AUTOSTART = NO + +[gns] +FORCESTART = NO +AUTOSTART = NO + +[namestore] +FORCESTART = NO +AUTOSTART = NO + +[namecache] +FORCESTART = NO +AUTOSTART = NO + +[topology] +FORCESTART = NO +AUTOSTART = NO -- cgit v1.2.3 From 6bcc73a1cbb1d4a609884762eab1b6de761ad1d9 Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Wed, 2 Aug 2017 21:47:42 +0000 Subject: no proof-of-work when running tests... --- src/multicast/test_multicast_line.conf | 3 +++ src/multicast/test_multicast_star.conf | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/multicast/test_multicast_line.conf b/src/multicast/test_multicast_line.conf index 23358e565..1047205cb 100644 --- a/src/multicast/test_multicast_line.conf +++ b/src/multicast/test_multicast_line.conf @@ -58,3 +58,6 @@ AUTOSTART = NO [topology] FORCESTART = NO AUTOSTART = NO + +[nse] +WORKBITS = 0 diff --git a/src/multicast/test_multicast_star.conf b/src/multicast/test_multicast_star.conf index 8eb98d986..ed690d95d 100644 --- a/src/multicast/test_multicast_star.conf +++ b/src/multicast/test_multicast_star.conf @@ -58,3 +58,7 @@ AUTOSTART = NO [topology] FORCESTART = NO AUTOSTART = NO + +[nse] +WORKBITS = 0 + -- cgit v1.2.3