X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftestbed%2Fgnunet-daemon-testbed-underlay.c;h=0b6c44710a89751c5b76e37f0e48530827a21217;hb=f0a19819c13f90c7f6692fbefc68696d40c8769c;hp=5c5b5cddf07e7accc4e600669299c3c9e687ca45;hpb=b2df9f3d5fc484516a863aebbb72ab5dc3417b77;p=oweals%2Fgnunet.git diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c index 5c5b5cddf..0b6c44710 100644 --- a/src/testbed/gnunet-daemon-testbed-underlay.c +++ b/src/testbed/gnunet-daemon-testbed-underlay.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - (C) 2008--2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ 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. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ @@ -29,6 +29,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_transport_service.h" +#include "gnunet_transport_manipulation_service.h" #include "gnunet_ats_service.h" #include "gnunet_testing_lib.h" #include @@ -74,7 +75,7 @@ static struct sqlite3 *db; * The blacklist handle we obtain from transport when we register ourselves for * access control */ -struct GNUNET_TRANSPORT_Blacklist *bh; +static struct GNUNET_TRANSPORT_Blacklist *bh; /** * The hostkeys file @@ -94,18 +95,13 @@ static void *hostkeys_data; /** * Handle to the transport service. This is used for setting link metrics */ -static struct GNUNET_TRANSPORT_Handle *transport; +static struct GNUNET_TRANSPORT_ManipulationHandle *transport; /** * The number of hostkeys in the hostkeys array */ static unsigned int num_hostkeys; -/** - * Task for shutdown - */ -static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; - /** * @ingroup hashmap @@ -158,7 +154,13 @@ check_access (void *cls, const struct GNUNET_PeerIdentity * pid) GNUNET_assert (NULL != map); contains = GNUNET_CONTAINER_multipeermap_contains (map, pid); - return (contains) ? GNUNET_OK : GNUNET_SYSERR; + if (GNUNET_YES == contains) + { + DEBUG ("Permitting `%s'\n", GNUNET_i2s (pid)); + return GNUNET_OK; + } + DEBUG ("Not permitting `%s'\n", GNUNET_i2s (pid)); + return GNUNET_SYSERR; } @@ -169,7 +171,7 @@ get_identity (unsigned int offset, struct GNUNET_PeerIdentity *id) if (offset >= num_hostkeys) return GNUNET_SYSERR; - (void) memcpy (&private_key, + GNUNET_memcpy (&private_key, hostkeys_data + (offset * GNUNET_TESTING_HOSTKEYFILESIZE), GNUNET_TESTING_HOSTKEYFILESIZE); GNUNET_CRYPTO_eddsa_key_get_public (&private_key, &id->public_key); @@ -186,12 +188,12 @@ struct WhiteListRow * Next ptr */ struct WhiteListRow *next; - + /** * The offset where to find the hostkey for the peer */ unsigned int id; - + /** * Latency to be assigned to the link */ @@ -280,14 +282,13 @@ unload_keys () * Shutdown task to cleanup our resources and exit. * * @param cls NULL - * @param tc scheduler task context */ static void -do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +do_shutdown (void *cls) { if (NULL != transport) { - GNUNET_TRANSPORT_disconnect (transport); + GNUNET_TRANSPORT_manipulation_disconnect (transport); transport = NULL; } cleanup_map (); @@ -313,7 +314,7 @@ db_read_whitelist (struct sqlite3 *db, int pid, struct WhiteListRow **wl_rows) struct WhiteListRow *lr; int nrows; int ret; - + if (SQLITE_OK != (ret = sqlite3_prepare_v2 (db, query_wl, -1, &stmt_wl, NULL))) { LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite3_prepare_v2"); @@ -359,13 +360,15 @@ run (void *cls, char *const *args, const char *cfgfile, struct WhiteListRow *wl_head; struct WhiteListRow *wl_entry; struct GNUNET_PeerIdentity identity; - struct GNUNET_ATS_Information params[1]; + struct GNUNET_ATS_Properties prop; + struct GNUNET_TIME_Relative delay; unsigned long long pid; unsigned int nrows; int ret; - if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (c, "TESTBED", - "PEERID", &pid)) + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (c, "TESTBED", + "PEERID", &pid)) { GNUNET_break (0); return; @@ -382,7 +385,7 @@ run (void *cls, char *const *args, const char *cfgfile, if (NULL != db) { LOG_SQLITE (db, NULL, GNUNET_ERROR_TYPE_ERROR, "sqlite_open_v2"); - sqlite3_close (db); + GNUNET_break (SQLITE_OK == sqlite3_close (db)); } else LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot open sqlite file %s\n", dbfile); @@ -395,8 +398,8 @@ run (void *cls, char *const *args, const char *cfgfile, wl_head = NULL; if (GNUNET_OK != load_keys (c)) goto close_db; - - transport = GNUNET_TRANSPORT_connect (c, NULL, NULL, NULL, NULL, NULL); + + transport = GNUNET_TRANSPORT_manipulation_connect (c); if (NULL == transport) { GNUNET_break (0); @@ -408,15 +411,15 @@ run (void *cls, char *const *args, const char *cfgfile, nrows = db_read_whitelist (db, pid, &wl_head); if ((GNUNET_SYSERR == nrows) || (0 == nrows)) { - GNUNET_TRANSPORT_disconnect (transport); + GNUNET_TRANSPORT_manipulation_disconnect (transport); goto close_db; } map = GNUNET_CONTAINER_multipeermap_create (nrows, GNUNET_NO); - params[0].type = GNUNET_ATS_QUALITY_NET_DELAY; while (NULL != (wl_entry = wl_head)) { wl_head = wl_entry->next; - params[0].value = wl_entry->latency; + delay.rel_value_us = wl_entry->latency; + memset (&prop, 0, sizeof (prop)); GNUNET_assert (GNUNET_OK == get_identity (wl_entry->id, &identity)); GNUNET_break (GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (map, &identity, &identity, @@ -424,20 +427,18 @@ run (void *cls, char *const *args, const char *cfgfile, DEBUG ("Setting %u ms latency to peer `%s'\n", wl_entry->latency, GNUNET_i2s (&identity)); - GNUNET_TRANSPORT_set_traffic_metric (transport, - &identity, - GNUNET_YES, - GNUNET_YES, /* FIXME: Separate inbound, outboud metrics */ - params, 1); + GNUNET_TRANSPORT_manipulation_set (transport, + &identity, + &prop, + delay, + delay); GNUNET_free (wl_entry); } bh = GNUNET_TRANSPORT_blacklist (c, &check_access, NULL); - shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, - &do_shutdown, NULL); + GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); close_db: GNUNET_break (SQLITE_OK == sqlite3_close (db)); - return; } @@ -463,7 +464,7 @@ main (int argc, char *const *argv) #endif ret = (GNUNET_OK == - GNUNET_PROGRAM_run (argc, argv, "gnunet-daemon-testbed-underlay", + GNUNET_PROGRAM_run (argc, argv, "testbed-underlay", _ ("Daemon to restrict underlay network in testbed deployments"), options, &run, NULL)) ? 0 : 1;