/*
This file is part of GNUnet
- (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008, 2009, 2012 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ 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.
+ Affero 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.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
#include "gnunet_arm_service.h"
#include "gnunet_testing_lib.h"
-#define LOG(kind,...) \
- GNUNET_log_from (kind, "testing-api", __VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from (kind, "testing-api", __VA_ARGS__)
/**
* We need pipe control only on WINDOWS
*/
-#if WINDOWS
-#define PIPE_CONTROL GNUNET_YES
-#else
#define PIPE_CONTROL GNUNET_NO
-#endif
/**
{
/**
* Prefix (i.e. "/tmp/gnunet-testing/") we prepend to each
- * SERVICEHOME. */
+ * GNUNET_HOME.
+ */
char *tmppath;
/**
char *hostkeys_data;
/**
- * memory map for 'hostkeys_data'.
+ * memory map for @e hostkeys_data.
*/
struct GNUNET_DISK_MapHandle *map;
* by one for each configured peer. Even if peers are destroyed,
* we never re-use path counters.
*/
- uint32_t path_counter;
+ uint32_t path_counter;
/**
* The number of hostkeys
/**
* Binary to be executed during 'GNUNET_TESTING_peer_start'.
- * Typically 'gnunet-service-arm' (but can be set to a
+ * Typically 'gnunet-service-arm' (but can be set to a
* specific service by 'GNUNET_TESTING_service_run' if
* necessary).
- */
+ */
char *main_binary;
char *args;
-
+
/**
* Handle to the running binary of the service, NULL if the
* peer/service is currently not running.
*/
struct GNUNET_ARM_Handle *ah;
- /**
- * Handle to ARM monitoring
- */
- struct GNUNET_ARM_MonitorHandle *mh;
-
/**
* The config of the peer
*/
/**
* The callback to call asynchronously when a peer is stopped
- */
+ */
GNUNET_TESTING_PeerStopCallback cb;
-
+
/**
* The closure for the above callback
*/
void *cb_cls;
-
+
/**
* The cached identity of this peer. Will be populated on call to
* GNUNET_TESTING_peer_get_identity()
* startup. This function loads such keys into memory from a file.
*
* @param system the testing system handle
- * @return GNUNET_OK on success; GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success; #GNUNET_SYSERR on error
*/
static int
hostkeys_load (struct GNUNET_TESTING_System *system)
{
- uint64_t fs;
+ uint64_t fs;
char *data_dir;
char *filename;
struct GNUNET_DISK_FileHandle *fd;
GNUNET_assert (NULL == system->hostkeys_data);
data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
GNUNET_asprintf (&filename, "%s/testing_hostkeys.ecc", data_dir);
- GNUNET_free (data_dir);
+ GNUNET_free (data_dir);
if (GNUNET_YES != GNUNET_DISK_file_test (filename))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Hostkeys file not found: %s\n"), filename);
+ _ ("Hostkeys file not found: %s\n"),
+ filename);
GNUNET_free (filename);
return GNUNET_SYSERR;
}
/* Check hostkey file size, read entire thing into memory */
- if (GNUNET_OK !=
+ if (GNUNET_OK !=
GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
fs = 0;
if (0 == fs)
{
GNUNET_free (filename);
- return GNUNET_SYSERR; /* File is empty */
+ return GNUNET_SYSERR; /* File is empty */
}
if (0 != (fs % GNUNET_TESTING_HOSTKEYFILESIZE))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Incorrect hostkey file format: %s\n"), filename);
+ _ ("Incorrect hostkey file format: %s\n"),
+ filename);
GNUNET_free (filename);
return GNUNET_SYSERR;
}
- fd = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ,
- GNUNET_DISK_PERM_NONE);
+ fd = GNUNET_DISK_file_open (filename,
+ GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
if (NULL == fd)
{
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", filename);
return GNUNET_SYSERR;
}
GNUNET_free (filename);
- system->hostkeys_data = GNUNET_DISK_file_map (fd,
- &system->map,
- GNUNET_DISK_MAP_TYPE_READ,
- fs);
+ system->hostkeys_data =
+ GNUNET_DISK_file_map (fd, &system->map, GNUNET_DISK_MAP_TYPE_READ, fs);
GNUNET_DISK_file_close (fd);
if (NULL == system->hostkeys_data)
return GNUNET_SYSERR;
* @param value value of the option
*/
static void
-cfg_copy_iterator (void *cls, const char *section,
- const char *option, const char *value)
+cfg_copy_iterator (void *cls,
+ const char *section,
+ const char *option,
+ const char *value)
{
struct GNUNET_CONFIGURATION_Handle *cfg2 = cls;
*
* @param testdir only the directory name without any path. This is used for
* all service homes; the directory will be created in a temporary
- * location depending on the underlying OS
+ * location depending on the underlying OS. This variable will be
+ * overridden with the value of the environmental variable
+ * GNUNET_TESTING_PREFIX, if it exists.
* @param trusted_ip the ip address which will be set as TRUSTED HOST in all
* service configurations generated to allow control connections from
* this ip. This can either be a single ip address or a network address
* @return handle to this system, NULL on error
*/
struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create_with_portrange (const char *testdir,
- const char *trusted_ip,
- const char *hostname,
- const struct
- GNUNET_TESTING_SharedService *
- shared_services,
- uint16_t lowport,
- uint16_t highport)
+GNUNET_TESTING_system_create_with_portrange (
+ const char *testdir,
+ const char *trusted_ip,
+ const char *hostname,
+ const struct GNUNET_TESTING_SharedService *shared_services,
+ uint16_t lowport,
+ uint16_t highport)
{
struct GNUNET_TESTING_System *system;
struct GNUNET_TESTING_SharedService tss;
unsigned int cnt;
GNUNET_assert (NULL != testdir);
- system = GNUNET_malloc (sizeof (struct GNUNET_TESTING_System));
- system->tmppath = GNUNET_DISK_mkdtemp (testdir);
+ system = GNUNET_new (struct GNUNET_TESTING_System);
+ if (NULL == (system->tmppath = getenv (GNUNET_TESTING_PREFIX)))
+ system->tmppath = GNUNET_DISK_mkdtemp (testdir);
+ else
+ system->tmppath = GNUNET_strdup (system->tmppath);
system->lowport = lowport;
system->highport = highport;
if (NULL == system->tmppath)
for (cnt = 0; NULL != shared_services[cnt].service; cnt++)
{
tss = shared_services[cnt];
- ss = GNUNET_malloc (sizeof (struct SharedService));
+ ss = GNUNET_new (struct SharedService);
ss->sname = GNUNET_strdup (tss.service);
ss->cfg = GNUNET_CONFIGURATION_create ();
- GNUNET_CONFIGURATION_iterate_section_values (tss.cfg, ss->sname,
- &cfg_copy_iterator, ss->cfg);
- GNUNET_CONFIGURATION_iterate_section_values (tss.cfg, "TESTING",
- &cfg_copy_iterator, ss->cfg);
+ GNUNET_CONFIGURATION_iterate_section_values (tss.cfg,
+ ss->sname,
+ &cfg_copy_iterator,
+ ss->cfg);
+ GNUNET_CONFIGURATION_iterate_section_values (tss.cfg,
+ "TESTING",
+ &cfg_copy_iterator,
+ ss->cfg);
+ GNUNET_CONFIGURATION_iterate_section_values (tss.cfg,
+ "PATHS",
+ &cfg_copy_iterator,
+ ss->cfg);
ss->share = tss.share;
- GNUNET_array_append (system->shared_services, system->n_shared_services,
+ GNUNET_array_append (system->shared_services,
+ system->n_shared_services,
ss);
}
return system;
*
* @param testdir only the directory name without any path. This is used for all
* service homes; the directory will be created in a temporary location
- * depending on the underlying OS
+ * depending on the underlying OS. This variable will be
+ * overridden with the value of the environmental variable
+ * GNUNET_TESTING_PREFIX, if it exists.
* @param trusted_ip the ip address which will be set as TRUSTED HOST in all
* service configurations generated to allow control connections from
* this ip. This can either be a single ip address or a network address
* @return handle to this system, NULL on error
*/
struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create (const char *testdir,
- const char *trusted_ip,
- const char *hostname,
- const struct GNUNET_TESTING_SharedService *
- shared_services)
+GNUNET_TESTING_system_create (
+ const char *testdir,
+ const char *trusted_ip,
+ const char *hostname,
+ const struct GNUNET_TESTING_SharedService *shared_services)
{
return GNUNET_TESTING_system_create_with_portrange (testdir,
- trusted_ip,
- hostname,
+ trusted_ip,
+ hostname,
shared_services,
- LOW_PORT,
- HIGH_PORT);
+ LOW_PORT,
+ HIGH_PORT);
}
+
static void
cleanup_shared_service_instance (struct SharedServiceInstance *i)
{
GNUNET_free (i);
}
+
static int
start_shared_service_instance (struct SharedServiceInstance *i)
{
GNUNET_free (binary);
i->proc = GNUNET_OS_start_process (PIPE_CONTROL,
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
- NULL, NULL,
+ NULL,
+ NULL,
+ NULL,
libexec_binary,
libexec_binary,
"-c",
stop_shared_service_instance (struct SharedServiceInstance *i)
{
GNUNET_break (0 == i->n_refs);
- if (0 != GNUNET_OS_process_kill (i->proc, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (i->proc, GNUNET_TERM_SIG))
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Killing shared service instance (%s) failed\n", i->ss->sname);
+ "Killing shared service instance (%s) failed\n",
+ i->ss->sname);
(void) GNUNET_OS_process_wait (i->proc);
GNUNET_OS_process_destroy (i->proc);
i->proc = NULL;
*/
void
GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
- int remove_paths)
+ int remove_paths)
{
struct SharedService *ss;
struct SharedServiceInstance *i;
* @param system system to use for reservation tracking
* @return 0 if no free port was available
*/
-uint16_t
+uint16_t
GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system)
{
struct GNUNET_NETWORK_Handle *socket;
uint16_t pos;
/*
- FIXME: Instead of using getaddrinfo we should try to determine the port
+ FIXME: Instead of using getaddrinfo we should try to determine the port
status by the following heurestics.
-
- On systems which support both IPv4 and IPv6, only ports open on both
- address families are considered open.
- On system with either IPv4 or IPv6. A port is considered open if it's
- open in the respective address family
- */
- hint.ai_family = AF_UNSPEC; /* IPv4 and IPv6 */
+
+ On systems which support both IPv4 and IPv6, only ports open on both
+ address families are considered open.
+ On system with either IPv4 or IPv6. A port is considered open if it's
+ open in the respective address family
+ */hint.ai_family = AF_UNSPEC; /* IPv4 and IPv6 */
hint.ai_socktype = 0;
hint.ai_protocol = 0;
hint.ai_addrlen = 0;
hint.ai_addr = NULL;
hint.ai_canonname = NULL;
hint.ai_next = NULL;
- hint.ai_flags = AI_PASSIVE | AI_NUMERICSERV; /* Wild card address */
+ hint.ai_flags = AI_PASSIVE | AI_NUMERICSERV; /* Wild card address */
port_buckets = system->reserved_ports;
- for (index = (system->lowport / 32) + 1; index < (system->highport / 32); index++)
+ for (index = (system->lowport / 32) + 1; index < (system->highport / 32);
+ index++)
{
xor_image = (UINT32_MAX ^ port_buckets[index]);
- if (0 == xor_image) /* Ports in the bucket are full */
+ if (0 == xor_image) /* Ports in the bucket are full */
continue;
pos = system->lowport % 32;
while (pos < 32)
}
open_port = (index * 32) + pos;
if (open_port >= system->highport)
- return 0;
+ return 0;
GNUNET_asprintf (&open_port_str, "%u", (unsigned int) open_port);
ret = NULL;
GNUNET_assert (0 == getaddrinfo (NULL, open_port_str, &hint, &ret));
socket = GNUNET_NETWORK_socket_create (ai->ai_family, SOCK_STREAM, 0);
if (NULL == socket)
continue;
- bind_status = GNUNET_NETWORK_socket_bind (socket,
- ai->ai_addr,
- ai->ai_addrlen,
- 0);
+ bind_status =
+ GNUNET_NETWORK_socket_bind (socket, ai->ai_addr, ai->ai_addrlen);
GNUNET_NETWORK_socket_close (socket);
if (GNUNET_OK != bind_status)
break;
socket = GNUNET_NETWORK_socket_create (ai->ai_family, SOCK_DGRAM, 0);
if (NULL == socket)
continue;
- bind_status = GNUNET_NETWORK_socket_bind (socket,
- ai->ai_addr,
- ai->ai_addrlen,
- 0);
+ bind_status =
+ GNUNET_NETWORK_socket_bind (socket, ai->ai_addr, ai->ai_addrlen);
GNUNET_NETWORK_socket_close (socket);
if (GNUNET_OK != bind_status)
break;
}
- port_buckets[index] |= (1U << pos); /* Set the port bit */
+ port_buckets[index] |= (1U << pos); /* Set the port bit */
freeaddrinfo (ret);
if (GNUNET_OK == bind_status)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Found a free port %u\n", (unsigned int) open_port);
- return open_port;
+ "Found a free port %u\n",
+ (unsigned int) open_port);
+ return open_port;
}
pos++;
}
/**
* Release reservation of a TCP or UDP port for a peer
- * (used during GNUNET_TESTING_peer_destroy).
+ * (used during #GNUNET_TESTING_peer_destroy()).
*
* @param system system to use for reservation tracking
* @param port reserved port to release
*/
void
GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
- uint16_t port)
+ uint16_t port)
{
uint32_t *port_buckets;
uint16_t bucket;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Releasing port %u\n", port);
if (0 == (port_buckets[bucket] & (1U << pos)))
{
- GNUNET_break(0); /* Port was not reserved by us using reserve_port() */
+ GNUNET_break (0); /* Port was not reserved by us using reserve_port() */
return;
}
port_buckets[bucket] &= ~(1U << pos);
* faster peer startup. This function can be used to
* access the n-th key of those pre-created hostkeys; note
* that these keys are ONLY useful for testing and not
- * secure as the private keys are part of the public
+ * secure as the private keys are part of the public
* GNUnet source code.
*
* This is primarily a helper function used internally
- * by 'GNUNET_TESTING_peer_configure'.
+ * by #GNUNET_TESTING_peer_configure.
*
* @param system the testing system handle
* @param key_number desired pre-created hostkey to obtain
* @param id set to the peer's identity (hash of the public
- * key; if NULL, GNUNET_SYSERR is returned immediately
+ * key; if NULL, NULL is returned immediately
* @return NULL on error (not enough keys)
*/
-struct GNUNET_CRYPTO_EccPrivateKey *
+struct GNUNET_CRYPTO_EddsaPrivateKey *
GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
- uint32_t key_number,
- struct GNUNET_PeerIdentity *id)
-{
- struct GNUNET_CRYPTO_EccPrivateKey *private_key;
- struct GNUNET_CRYPTO_EccPublicKey public_key;
-
+ uint32_t key_number,
+ struct GNUNET_PeerIdentity *id)
+{
+ struct GNUNET_CRYPTO_EddsaPrivateKey *private_key;
+
if ((NULL == id) || (NULL == system->hostkeys_data))
return NULL;
if (key_number >= system->total_hostkeys)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Key number %u does not exist\n"), key_number);
- return NULL;
- }
- private_key = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
- memcpy (private_key,
- system->hostkeys_data +
- (key_number * GNUNET_TESTING_HOSTKEYFILESIZE),
- GNUNET_TESTING_HOSTKEYFILESIZE);
- if (NULL == private_key)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Error while decoding key %u\n"), key_number);
+ _ ("Key number %u does not exist\n"),
+ key_number);
return NULL;
}
- GNUNET_CRYPTO_ecc_key_get_public (private_key, &public_key);
- GNUNET_CRYPTO_hash (&public_key,
- sizeof (struct GNUNET_CRYPTO_EccPublicKey),
- &(id->hashPubKey));
+ private_key = GNUNET_new (struct GNUNET_CRYPTO_EddsaPrivateKey);
+ GNUNET_memcpy (private_key,
+ system->hostkeys_data
+ + (key_number * GNUNET_TESTING_HOSTKEYFILESIZE),
+ GNUNET_TESTING_HOSTKEYFILESIZE);
+ GNUNET_CRYPTO_eddsa_key_get_public (private_key, &id->public_key);
return private_key;
}
* The system for which we are building configurations
*/
struct GNUNET_TESTING_System *system;
-
+
/**
* The configuration we are building
*/
/**
* The customized service home path for this peer
*/
- char *service_home;
+ char *gnunet_home;
/**
* Array of ports currently allocated to this peer. These ports will be
* @param value value of the option
*/
static void
-update_config (void *cls, const char *section, const char *option,
+update_config (void *cls,
+ const char *section,
+ const char *option,
const char *value)
{
struct UpdateContext *uc = cls;
unsigned int ival;
char cval[12];
- char uval[128];
+ char uval[PATH_MAX];
char *single_variable;
char *per_host_variable;
unsigned long long num_per_host;
if (GNUNET_OK != uc->status)
return;
- if (! ((0 == strcmp (option, "PORT"))
- || (0 == strcmp (option, "UNIXPATH"))
- || (0 == strcmp (option, "HOSTNAME"))))
+ if (! ((0 == strcmp (option, "PORT")) || (0 == strcmp (option, "UNIXPATH")) ||
+ (0 == strcmp (option, "HOSTNAME"))))
return;
GNUNET_asprintf (&single_variable, "single_%s_per_host", section);
GNUNET_asprintf (&per_host_variable, "num_%s_per_host", section);
- if ((0 == strcmp (option, "PORT")) && (1 == SSCANF (value, "%u", &ival)))
+ if ((0 == strcmp (option, "PORT")) && (1 == sscanf (value, "%u", &ival)))
{
if ((ival != 0) &&
- (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
- single_variable)))
+ (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
+ "testing",
+ single_variable)))
{
new_port = GNUNET_TESTING_reserve_port (uc->system);
if (0 == new_port)
GNUNET_free (per_host_variable);
return;
}
- GNUNET_snprintf (cval, sizeof (cval), "%u", new_port);
+ GNUNET_snprintf (cval, sizeof(cval), "%u", new_port);
value = cval;
GNUNET_array_append (uc->ports, uc->nports, new_port);
}
else if ((ival != 0) &&
(GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
+ GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
+ "testing",
single_variable)) &&
- GNUNET_CONFIGURATION_get_value_number (uc->cfg, "testing",
+ GNUNET_CONFIGURATION_get_value_number (uc->cfg,
+ "testing",
per_host_variable,
&num_per_host))
{
/* GNUNET_snprintf (cval, sizeof (cval), "%u", */
/* ival + ctx->fdnum % num_per_host); */
/* value = cval; */
- GNUNET_break (0); /* FIXME */
+ GNUNET_break (0); /* FIXME */
}
}
if (0 == strcmp (option, "UNIXPATH"))
{
- if (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
- single_variable))
+ if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
+ "testing",
+ single_variable))
{
- GNUNET_snprintf (uval, sizeof (uval), "%s/%s.sock",
- uc->service_home, section);
+ GNUNET_snprintf (uval,
+ sizeof(uval),
+ "%s/%s.sock",
+ uc->gnunet_home,
+ section);
value = uval;
}
else if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_number (uc->cfg, "testing",
+ GNUNET_CONFIGURATION_get_value_number (uc->cfg,
+ "testing",
per_host_variable,
&num_per_host)) &&
(num_per_host > 0))
{
- GNUNET_break(0); /* FIXME */
+ GNUNET_break (0); /* FIXME */
}
}
if (0 == strcmp (option, "HOSTNAME"))
* @param section name of the section
*/
static void
-update_config_sections (void *cls,
- const char *section)
+update_config_sections (void *cls, const char *section)
{
- struct UpdateContext *uc = cls;
+ struct UpdateContext *uc = cls;
char **ikeys;
char *val;
char *ptr;
char *ACCEPT_FROM_key;
uint16_t ikeys_cnt;
uint16_t key;
-
+
ikeys_cnt = 0;
val = NULL;
/* Ignore certain options from sections. See
https://gnunet.org/bugs/view.php?id=2476 */
- if (GNUNET_YES == GNUNET_CONFIGURATION_have_value (uc->cfg, section,
- "TESTING_IGNORE_KEYS"))
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_have_value (uc->cfg, section, "TESTING_IGNORE_KEYS"))
{
- GNUNET_assert
- (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string (uc->cfg, section,
- "TESTING_IGNORE_KEYS", &val));
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_string (uc->cfg,
+ section,
+ "TESTING_IGNORE_KEYS",
+ &val));
ptr = val;
for (ikeys_cnt = 0; NULL != (ptr = strstr (ptr, ";")); ikeys_cnt++)
ptr++;
GNUNET_break (0);
else
{
- ikeys = GNUNET_malloc ((sizeof (char *)) * ikeys_cnt);
+ ikeys = GNUNET_malloc ((sizeof(char *)) * ikeys_cnt);
ptr = val;
for (key = 0; key < ikeys_cnt; key++)
{
ikeys[key] = ptr;
ptr = strstr (ptr, ";");
+ GNUNET_assert (NULL != ptr); /* worked just before... */
*ptr = '\0';
ptr++;
}
for (key = 0; key < ikeys_cnt; key++)
{
if (NULL != strstr (ikeys[key], "ADVERTISED_PORT"))
- break;
+ break;
}
if ((key == ikeys_cnt) &&
- (GNUNET_YES == GNUNET_CONFIGURATION_have_value (uc->cfg, section,
- "ADVERTISED_PORT")))
+ (GNUNET_YES ==
+ GNUNET_CONFIGURATION_have_value (uc->cfg, section, "ADVERTISED_PORT")))
{
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (uc->cfg, section, "PORT", &ptr))
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (uc->cfg,
+ section,
+ "PORT",
+ &ptr))
{
- GNUNET_CONFIGURATION_set_value_string (uc->cfg, section,
- "ADVERTISED_PORT", ptr);
- GNUNET_free (ptr);
+ GNUNET_CONFIGURATION_set_value_string (uc->cfg,
+ section,
+ "ADVERTISED_PORT",
+ ptr);
+ GNUNET_free (ptr);
}
}
for (key = 0; key < ikeys_cnt; key++)
GNUNET_free (ikeys);
}
GNUNET_free_non_null (val);
- ACCEPT_FROM_key = "ACCEPT_FROM";
- if ((NULL != uc->system->trusted_ip) &&
+ ACCEPT_FROM_key = "ACCEPT_FROM";
+ if ((NULL != uc->system->trusted_ip) &&
(NULL != strstr (uc->system->trusted_ip, ":"))) /* IPv6 in use */
ACCEPT_FROM_key = "ACCEPT_FROM6";
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (uc->cfg, section, ACCEPT_FROM_key,
- &orig_allowed_hosts))
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (uc->cfg,
+ section,
+ ACCEPT_FROM_key,
+ &orig_allowed_hosts))
{
orig_allowed_hosts = GNUNET_strdup ("127.0.0.1;");
}
if (NULL == uc->system->trusted_ip)
allowed_hosts = GNUNET_strdup (orig_allowed_hosts);
else
- GNUNET_asprintf (&allowed_hosts, "%s%s;", orig_allowed_hosts,
+ GNUNET_asprintf (&allowed_hosts,
+ "%s%s;",
+ orig_allowed_hosts,
uc->system->trusted_ip);
GNUNET_free (orig_allowed_hosts);
- GNUNET_CONFIGURATION_set_value_string (uc->cfg, section, ACCEPT_FROM_key,
+ GNUNET_CONFIGURATION_set_value_string (uc->cfg,
+ section,
+ ACCEPT_FROM_key,
allowed_hosts);
- GNUNET_free (allowed_hosts);
+ GNUNET_free (allowed_hosts);
}
+
static struct SharedServiceInstance *
associate_shared_service (struct GNUNET_TESTING_System *system,
struct SharedService *ss,
{
struct SharedServiceInstance *i;
struct GNUNET_CONFIGURATION_Handle *temp;
- char *service_home;
+ char *gnunet_home;
uint32_t port;
ss->n_peers++;
- if ( ((0 == ss->share) && (NULL == ss->instances))
- ||
- ( (0 != ss->share)
- && (ss->n_instances < ((ss->n_peers + ss->share - 1) / ss->share)) ) )
- {
- i = GNUNET_malloc (sizeof (struct SharedServiceInstance));
+ if (((0 == ss->share) && (NULL == ss->instances)) ||
+ ((0 != ss->share) &&
+ (ss->n_instances < ((ss->n_peers + ss->share - 1) / ss->share))))
+ {
+ i = GNUNET_new (struct SharedServiceInstance);
i->ss = ss;
- (void) GNUNET_asprintf (&service_home, "%s/shared/%s/%u",
- system->tmppath, ss->sname, ss->n_instances);
- (void) GNUNET_asprintf (&i->unix_sock, "%s/sock", service_home);
+ (void) GNUNET_asprintf (&gnunet_home,
+ "%s/shared/%s/%u",
+ system->tmppath,
+ ss->sname,
+ ss->n_instances);
+ (void) GNUNET_asprintf (&i->unix_sock, "%s/sock", gnunet_home);
port = GNUNET_TESTING_reserve_port (system);
if (0 == port)
{
- GNUNET_free (service_home);
+ GNUNET_free (gnunet_home);
cleanup_shared_service_instance (i);
return NULL;
}
GNUNET_array_append (ss->instances, ss->n_instances, i);
temp = GNUNET_CONFIGURATION_dup (ss->cfg);
(void) GNUNET_asprintf (&i->port_str, "%u", port);
- (void) GNUNET_asprintf (&i->cfg_fn, "%s/config", service_home);
- GNUNET_CONFIGURATION_set_value_string (temp, "PATHS", "SERVICEHOME",
- service_home);
- GNUNET_free (service_home);
- GNUNET_CONFIGURATION_set_value_string (temp, ss->sname, "UNIXPATH",
+ (void) GNUNET_asprintf (&i->cfg_fn, "%s/config", gnunet_home);
+ GNUNET_CONFIGURATION_set_value_string (temp,
+ "PATHS",
+ "GNUNET_HOME",
+ gnunet_home);
+ GNUNET_free (gnunet_home);
+ GNUNET_CONFIGURATION_set_value_string (temp,
+ ss->sname,
+ "UNIXPATH",
i->unix_sock);
- GNUNET_CONFIGURATION_set_value_string (temp, ss->sname, "PORT",
+ GNUNET_CONFIGURATION_set_value_string (temp,
+ ss->sname,
+ "PORT",
i->port_str);
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_write (temp, i->cfg_fn))
{
GNUNET_assert (0 < ss->n_instances);
i = ss->instances[ss->n_instances - 1];
}
- GNUNET_CONFIGURATION_iterate_section_values(ss->cfg, ss->sname,
- &cfg_copy_iterator, cfg);
- GNUNET_CONFIGURATION_set_value_string (cfg, ss->sname, "UNIXPATH",
+ GNUNET_CONFIGURATION_iterate_section_values (ss->cfg,
+ ss->sname,
+ &cfg_copy_iterator,
+ cfg);
+ GNUNET_CONFIGURATION_set_value_string (cfg,
+ ss->sname,
+ "UNIXPATH",
i->unix_sock);
GNUNET_CONFIGURATION_set_value_string (cfg, ss->sname, "PORT", i->port_str);
return i;
* Create a new configuration using the given configuration as a template;
* ports and paths will be modified to select available ports on the local
* system. The default configuration will be available in PATHS section under
- * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS
+ * the option DEFAULTCONFIG after the call. GNUNET_HOME is also set in PATHS
* section to the temporary directory specific to this configuration. If we run
- * out of "*port" numbers, return SYSERR.
+ * out of "*port" numbers, return #GNUNET_SYSERR.
*
* This is primarily a helper function used internally
* by 'GNUNET_TESTING_peer_configure'.
* @param ports array with port numbers used in the created configuration.
* Will be updated upon successful return. Can be NULL
* @param nports the size of the `ports' array. Will be updated.
- * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration will
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - the configuration will
* be incomplete and should not be used there upon
*/
static int
unsigned int *nports)
{
struct UpdateContext uc;
- char *default_config;
+ char *default_config;
uc.system = system;
uc.cfg = cfg;
uc.status = GNUNET_OK;
uc.ports = NULL;
uc.nports = 0;
- GNUNET_asprintf (&uc.service_home, "%s/%u", system->tmppath,
+ GNUNET_asprintf (&uc.gnunet_home,
+ "%s/%u",
+ system->tmppath,
system->path_counter++);
- GNUNET_asprintf (&default_config, "%s/config", uc.service_home);
- GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG",
- default_config);
- GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG",
+ GNUNET_asprintf (&default_config, "%s/config", uc.gnunet_home);
+ GNUNET_CONFIGURATION_set_value_string (cfg,
+ "PATHS",
+ "DEFAULTCONFIG",
default_config);
+ GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG", default_config);
GNUNET_free (default_config);
- GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "SERVICEHOME",
- uc.service_home);
+ GNUNET_CONFIGURATION_set_value_string (cfg,
+ "PATHS",
+ "GNUNET_HOME",
+ uc.gnunet_home);
/* make PORTs and UNIXPATHs unique */
GNUNET_CONFIGURATION_iterate (cfg, &update_config, &uc);
/* allow connections to services from system trusted_ip host */
GNUNET_CONFIGURATION_iterate_sections (cfg, &update_config_sections, &uc);
/* enable loopback-based connections between peers */
- GNUNET_CONFIGURATION_set_value_string (cfg,
- "nat",
- "USE_LOCALADDR", "YES");
- GNUNET_free (uc.service_home);
+ GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "USE_LOCALADDR", "YES");
+ GNUNET_free (uc.gnunet_home);
if ((NULL != ports) && (NULL != nports))
{
*ports = uc.ports;
* Create a new configuration using the given configuration as a template;
* ports and paths will be modified to select available ports on the local
* system. The default configuration will be available in PATHS section under
- * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS
+ * the option DEFAULTCONFIG after the call. GNUNET_HOME is also set in PATHS
* section to the temporary directory specific to this configuration. If we run
- * out of "*port" numbers, return SYSERR.
+ * out of "*port" numbers, return #GNUNET_SYSERR.
*
* This is primarily a helper function used internally
- * by 'GNUNET_TESTING_peer_configure'.
+ * by #GNUNET_TESTING_peer_configure().
*
* @param system system to use to coordinate resource usage
* @param cfg template configuration to update
- * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration will
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - the configuration will
* be incomplete and should not be used there upon
*/
int
GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+ struct GNUNET_CONFIGURATION_Handle *cfg)
{
return GNUNET_TESTING_configuration_create_ (system, cfg, NULL, NULL);
}
/**
* Configure a GNUnet peer. GNUnet must be installed on the local
- * system and available in the PATH.
+ * system and available in the PATH.
*
* @param system system to use to coordinate resource usage
* @param cfg configuration to use; will be UPDATED (to reflect needed
* changes in port numbers and paths)
* @param key_number number of the hostkey to use for the peer
* @param id identifier for the daemon, will be set, can be NULL
- * @param emsg set to freshly allocated error message (set to NULL on success),
+ * @param emsg set to freshly allocated error message (set to NULL on success),
* can be NULL
* @return handle to the peer, NULL on error
*/
struct GNUNET_TESTING_Peer *
GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
- struct GNUNET_CONFIGURATION_Handle *cfg,
- uint32_t key_number,
- struct GNUNET_PeerIdentity *id,
- char **emsg)
+ struct GNUNET_CONFIGURATION_Handle *cfg,
+ uint32_t key_number,
+ struct GNUNET_PeerIdentity *id,
+ char **emsg)
{
struct GNUNET_TESTING_Peer *peer;
struct GNUNET_DISK_FileHandle *fd;
char *config_filename;
char *libexec_binary;
char *emsg_;
- struct GNUNET_CRYPTO_EccPrivateKey *pk;
+ struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
uint16_t *ports;
struct SharedService *ss;
struct SharedServiceInstance **ss_instances;
unsigned int cnt;
- unsigned int nports;
+ unsigned int nports;
ports = NULL;
nports = 0;
*emsg = NULL;
if (key_number >= system->total_hostkeys)
{
- GNUNET_asprintf (&emsg_,
- _("You attempted to create a testbed with more than %u hosts. Please precompute more hostkeys first.\n"),
- (unsigned int) system->total_hostkeys);
+ GNUNET_asprintf (
+ &emsg_,
+ _ (
+ "You attempted to create a testbed with more than %u hosts. Please precompute more hostkeys first.\n"),
+ (unsigned int) system->total_hostkeys);
goto err_ret;
}
pk = NULL;
(NULL == (pk = GNUNET_TESTING_hostkey_get (system, key_number, id))))
{
GNUNET_asprintf (&emsg_,
- _("Failed to initialize hostkey for peer %u\n"),
- (unsigned int) key_number);
+ _ ("Failed to initialize hostkey for peer %u\n"),
+ (unsigned int) key_number);
goto err_ret;
- }
+ }
if (NULL != pk)
- GNUNET_CRYPTO_ecc_key_free (pk);
- if (GNUNET_NO ==
- GNUNET_CONFIGURATION_have_value (cfg, "PEER", "PRIVATE_KEY"))
+ GNUNET_free (pk);
+ if (GNUNET_NO == GNUNET_CONFIGURATION_have_value (cfg, "PEER", "PRIVATE_KEY"))
{
- GNUNET_asprintf (&emsg_,
- _("PRIVATE_KEY option in PEER section missing in configuration\n"));
+ GNUNET_asprintf (
+ &emsg_,
+ _ ("PRIVATE_KEY option in PEER section missing in configuration\n"));
goto err_ret;
}
/* Remove sections for shared services */
ss = system->shared_services[cnt];
GNUNET_CONFIGURATION_remove_section (cfg, ss->sname);
}
- if (GNUNET_OK != GNUNET_TESTING_configuration_create_ (system, cfg,
- &ports, &nports))
+ if (GNUNET_OK !=
+ GNUNET_TESTING_configuration_create_ (system, cfg, &ports, &nports))
{
GNUNET_asprintf (&emsg_,
- _("Failed to create configuration for peer "
- "(not enough free ports?)\n"));
+ _ ("Failed to create configuration for peer "
+ "(not enough free ports?)\n"));
goto err_ret;
}
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (cfg, "PEER",
- "PRIVATE_KEY",
- &hostkey_filename));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "PEER",
+ "PRIVATE_KEY",
+ &hostkey_filename));
fd = GNUNET_DISK_file_open (hostkey_filename,
GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE,
- GNUNET_DISK_PERM_USER_READ
+ GNUNET_DISK_PERM_USER_READ
| GNUNET_DISK_PERM_USER_WRITE);
if (NULL == fd)
{
- GNUNET_asprintf (&emsg_, _("Cannot open hostkey file: %s\n"),
- STRERROR (errno));
+ GNUNET_asprintf (&emsg_,
+ _ ("Cannot open hostkey file `%s': %s\n"),
+ hostkey_filename,
+ strerror (errno));
+ GNUNET_free (hostkey_filename);
goto err_ret;
}
+ GNUNET_free (hostkey_filename);
if (GNUNET_TESTING_HOSTKEYFILESIZE !=
- GNUNET_DISK_file_write (fd, system->hostkeys_data
- + (key_number * GNUNET_TESTING_HOSTKEYFILESIZE),
- GNUNET_TESTING_HOSTKEYFILESIZE))
+ GNUNET_DISK_file_write (fd,
+ system->hostkeys_data
+ + (key_number * GNUNET_TESTING_HOSTKEYFILESIZE),
+ GNUNET_TESTING_HOSTKEYFILESIZE))
{
GNUNET_asprintf (&emsg_,
- _("Failed to write hostkey file for peer %u: %s\n"),
- (unsigned int) key_number,
- STRERROR (errno));
+ _ ("Failed to write hostkey file for peer %u: %s\n"),
+ (unsigned int) key_number,
+ strerror (errno));
GNUNET_DISK_file_close (fd);
goto err_ret;
}
GNUNET_DISK_file_close (fd);
- ss_instances = GNUNET_malloc (sizeof (struct SharedServiceInstance *)
+ ss_instances = GNUNET_malloc (sizeof(struct SharedServiceInstance *)
* system->n_shared_services);
- for (cnt=0; cnt < system->n_shared_services; cnt++)
+ for (cnt = 0; cnt < system->n_shared_services; cnt++)
{
ss = system->shared_services[cnt];
ss_instances[cnt] = associate_shared_service (system, ss, cfg);
if (NULL == ss_instances[cnt])
+ {
+ emsg_ = GNUNET_strdup ("FIXME");
goto err_ret;
- }
+ }
+ }
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string
- (cfg, "PATHS", "DEFAULTCONFIG", &config_filename));
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "PATHS",
+ "DEFAULTCONFIG",
+ &config_filename));
if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config_filename))
{
GNUNET_asprintf (&emsg_,
- _("Failed to write configuration file `%s' for peer %u: %s\n"),
- config_filename,
- (unsigned int) key_number,
- STRERROR (errno));
+ _ (
+ "Failed to write configuration file `%s' for peer %u: %s\n"),
+ config_filename,
+ (unsigned int) key_number,
+ strerror (errno));
GNUNET_free (config_filename);
goto err_ret;
}
- peer = GNUNET_malloc (sizeof (struct GNUNET_TESTING_Peer));
+ peer = GNUNET_new (struct GNUNET_TESTING_Peer);
peer->ss_instances = ss_instances;
peer->cfgfile = config_filename; /* Free in peer_destroy */
peer->cfg = GNUNET_CONFIGURATION_dup (cfg);
libexec_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg, "arm", "PREFIX", &peer->main_binary))
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "arm",
+ "PREFIX",
+ &peer->main_binary))
{
/* No prefix */
- GNUNET_asprintf(&peer->main_binary, "%s", libexec_binary);
- peer->args = strdup ("");
+ GNUNET_asprintf (&peer->main_binary, "%s", libexec_binary);
+ peer->args = GNUNET_strdup ("");
}
else
- peer->args = strdup (libexec_binary);
+ {
+ peer->args = GNUNET_strdup (libexec_binary);
+ }
peer->system = system;
peer->key_number = key_number;
GNUNET_free (libexec_binary);
- peer->ports = ports; /* Free in peer_destroy */
+ peer->ports = ports; /* Free in peer_destroy */
peer->nports = nports;
return peer;
- err_ret:
+err_ret:
GNUNET_free_non_null (ss_instances);
GNUNET_free_non_null (ports);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", emsg_);
*/
void
GNUNET_TESTING_peer_get_identity (struct GNUNET_TESTING_Peer *peer,
- struct GNUNET_PeerIdentity *id)
+ struct GNUNET_PeerIdentity *id)
{
if (NULL != peer->id)
{
- memcpy (id, peer->id, sizeof (struct GNUNET_PeerIdentity));
+ GNUNET_memcpy (id, peer->id, sizeof(struct GNUNET_PeerIdentity));
return;
}
- peer->id = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
- GNUNET_CRYPTO_ecc_key_free (GNUNET_TESTING_hostkey_get (peer->system,
- peer->key_number,
- peer->id));
- memcpy (id, peer->id, sizeof (struct GNUNET_PeerIdentity));
+ peer->id = GNUNET_new (struct GNUNET_PeerIdentity);
+ GNUNET_free (
+ GNUNET_TESTING_hostkey_get (peer->system, peer->key_number, peer->id));
+ GNUNET_memcpy (id, peer->id, sizeof(struct GNUNET_PeerIdentity));
}
/**
- * Start the peer.
+ * Start the peer.
*
* @param peer peer to start
- * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already running)
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error (i.e. peer already running)
*/
int
GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer)
{
GNUNET_break (0);
return GNUNET_SYSERR;
- }
+ }
GNUNET_assert (NULL != peer->cfgfile);
for (cnt = 0; cnt < peer->system->n_shared_services; cnt++)
{
i = peer->ss_instances[cnt];
- if ((0 == i->n_refs)
- && (GNUNET_SYSERR == start_shared_service_instance (i)) )
+ if ((0 == i->n_refs) &&
+ (GNUNET_SYSERR == start_shared_service_instance (i)))
return GNUNET_SYSERR;
i->n_refs++;
}
- peer->main_process = GNUNET_OS_start_process (PIPE_CONTROL,
- GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
- NULL, NULL,
- peer->main_binary,
- peer->main_binary,
- peer->args,
- "-c",
- peer->cfgfile,
- NULL);
+ peer->main_binary =
+ GNUNET_CONFIGURATION_expand_dollar (peer->cfg, peer->main_binary);
+ peer->main_process =
+ GNUNET_OS_start_process_s (PIPE_CONTROL,
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL,
+ peer->main_binary,
+ peer->args,
+ "-c",
+ peer->cfgfile,
+ NULL);
if (NULL == peer->main_process)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to start `%s': %s\n"),
- peer->main_binary,
- STRERROR (errno));
+ _ ("Failed to start `%s': %s\n"),
+ peer->main_binary,
+ strerror (errno));
return GNUNET_SYSERR;
}
return GNUNET_OK;
}
-/**
- * Start a service at a peer using its ARM service
- *
- * @param peer the peer whose service has to be started
- * @param service_name name of the service to start
- * @param timeout how long should the ARM API try to send the request to start
- * the service
- * @param cont the callback to call with result and status from ARM API
- * @param cont_cls the closure for the above callback
- * @return GNUNET_OK upon successfully queuing the service start request;
- * GNUNET_SYSERR upon error
- */
-int
-GNUNET_TESTING_peer_service_start (struct GNUNET_TESTING_Peer *peer,
- const char *service_name,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_ARM_ResultCallback cont,
- void *cont_cls)
-{
- if (NULL == peer->ah)
- return GNUNET_SYSERR;
- GNUNET_ARM_request_service_start (peer->ah,
- service_name,
- GNUNET_OS_INHERIT_STD_ALL,
- timeout,
- cont, cont_cls);
- return GNUNET_OK;
-}
-
-
-/**
- * Stop a service at a peer using its ARM service
- *
- * @param peer the peer whose service has to be stopped
- * @param service_name name of the service to stop
- * @param timeout how long should the ARM API try to send the request to stop
- * the service
- * @param cont the callback to call with result and status from ARM API
- * @param cont_cls the closure for the above callback
- * @return GNUNET_OK upon successfully queuing the service stop request;
- * GNUNET_SYSERR upon error
- */
-int
-GNUNET_TESTING_peer_service_stop (struct GNUNET_TESTING_Peer *peer,
- const char *service_name,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_ARM_ResultCallback cont,
- void *cont_cls)
-{
- if (NULL == peer->ah)
- return GNUNET_SYSERR;
- GNUNET_ARM_request_service_stop (peer->ah,
- service_name,
- timeout,
- cont, cont_cls);
- return GNUNET_OK;
-}
-
-
/**
* Sends SIGTERM to the peer's main process
*
* @param peer the handle to the peer
- * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL
+ * @return #GNUNET_OK if successful; #GNUNET_SYSERR if the main process is NULL
* or upon any error while sending SIGTERM
*/
int
GNUNET_break (0);
return GNUNET_SYSERR;
}
- if (0 != GNUNET_OS_process_kill (peer->main_process, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (peer->main_process, GNUNET_TERM_SIG))
return GNUNET_SYSERR;
for (cnt = 0; cnt < peer->system->n_shared_services; cnt++)
{
* Waits for a peer to terminate. The peer's main process will also be destroyed.
*
* @param peer the handle to the peer
- * @return GNUNET_OK if successful; GNUNET_SYSERR if the main process is NULL
+ * @return #GNUNET_OK if successful; #GNUNET_SYSERR if the main process is NULL
* or upon any error while waiting
*/
int
/**
- * Stop the peer.
+ * Stop the peer.
*
* @param peer peer to stop
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
int
GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer)
* Function called whenever we connect to or disconnect from ARM.
*
* @param cls closure
- * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected,
- * GNUNET_SYSERR on error.
+ * @param connected #GNUNET_YES if connected, #GNUNET_NO if disconnected,
+ * #GNUNET_SYSERR on error.
*/
static void
-disconn_status (void *cls,
- int connected)
+disconn_status (void *cls, int connected)
{
struct GNUNET_TESTING_Peer *peer = cls;
return;
}
GNUNET_break (GNUNET_OK == GNUNET_TESTING_peer_wait (peer));
- GNUNET_ARM_disconnect_and_free (peer->ah);
+ GNUNET_ARM_disconnect (peer->ah);
peer->ah = NULL;
peer->cb (peer->cb_cls, peer, GNUNET_YES);
}
* @param peer the peer to stop
* @param cb the callback to signal peer shutdown
* @param cb_cls closure for the above callback
- * @return GNUNET_OK upon successfully giving the request to the ARM API (this
- * does not mean that the peer is successfully stopped); GNUNET_SYSERR
+ * @return #GNUNET_OK upon successfully giving the request to the ARM API (this
+ * does not mean that the peer is successfully stopped); #GNUNET_SYSERR
* upon any error.
*/
int
void *cb_cls)
{
if (NULL == peer->main_process)
- return GNUNET_SYSERR;
+ return GNUNET_SYSERR;
peer->ah = GNUNET_ARM_connect (peer->cfg, &disconn_status, peer);
if (NULL == peer->ah)
return GNUNET_SYSERR;
*/
void
GNUNET_TESTING_peer_stop_async_cancel (struct GNUNET_TESTING_Peer *peer)
-{
+{
GNUNET_assert (NULL != peer->ah);
- GNUNET_ARM_disconnect_and_free (peer->ah);
+ GNUNET_ARM_disconnect (peer->ah);
peer->ah = NULL;
}
if (NULL != peer->main_process)
GNUNET_TESTING_peer_stop (peer);
if (NULL != peer->ah)
- GNUNET_ARM_disconnect_and_free (peer->ah);
- if (NULL != peer->mh)
- GNUNET_ARM_monitor_disconnect_and_free (peer->mh);
+ GNUNET_ARM_disconnect (peer->ah);
GNUNET_free (peer->cfgfile);
if (NULL != peer->cfg)
GNUNET_CONFIGURATION_destroy (peer->cfg);
* Starts a peer using the given configuration and then invokes the
* given callback. This function ALSO initializes the scheduler loop
* and should thus be called directly from "main". The testcase
- * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
+ * should self-terminate by invoking #GNUNET_SCHEDULER_shutdown().
*
* @param testdir only the directory name without any path. This is used for
* all service homes; the directory will be created in a temporary
* @param cfgfilename name of the configuration file to use;
* use NULL to only run with defaults
* @param tm main function of the testcase
- * @param tm_cls closure for 'tm'
+ * @param tm_cls closure for @a tm
* @return 0 on success, 1 on error
*/
int
GNUNET_TESTING_peer_run (const char *testdir,
- const char *cfgfilename,
- GNUNET_TESTING_TestMain tm,
- void *tm_cls)
+ const char *cfgfilename,
+ GNUNET_TESTING_TestMain tm,
+ void *tm_cls)
{
- return GNUNET_TESTING_service_run (testdir, "arm",
- cfgfilename, tm, tm_cls);
+ return GNUNET_TESTING_service_run (testdir, "arm", cfgfilename, tm, tm_cls);
}
* Callback to signal service startup
*/
GNUNET_TESTING_TestMain tm;
-
+
/**
* The peer in which the service is run.
*/
* Callback to be called when SCHEDULER has been started
*
* @param cls the ServiceContext
- * @param tc the TaskContext
*/
static void
-service_run_main (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+service_run_main (void *cls)
{
struct ServiceContext *sc = cls;
* Starts a service using the given configuration and then invokes the
* given callback. This function ALSO initializes the scheduler loop
* and should thus be called directly from "main". The testcase
- * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
+ * should self-terminate by invoking #GNUNET_SCHEDULER_shutdown().
*
* This function is useful if the testcase is for a single service
* and if that service doesn't itself depend on other services.
* @param cfgfilename name of the configuration file to use;
* use NULL to only run with defaults
* @param tm main function of the testcase
- * @param tm_cls closure for 'tm'
+ * @param tm_cls closure for @a tm
* @return 0 on success, 1 on error
*/
int
GNUNET_TESTING_service_run (const char *testdir,
- const char *service_name,
- const char *cfgfilename,
- GNUNET_TESTING_TestMain tm,
- void *tm_cls)
+ const char *service_name,
+ const char *cfgfilename,
+ GNUNET_TESTING_TestMain tm,
+ void *tm_cls)
{
struct ServiceContext sc;
struct GNUNET_TESTING_System *system;
if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfgfilename))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to load configuration from %s\n"), cfgfilename);
+ _ ("Failed to load configuration from %s\n"),
+ cfgfilename);
GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_TESTING_system_destroy (system, GNUNET_YES);
return 1;
GNUNET_free (peer->args);
GNUNET_asprintf (&binary, "gnunet-service-%s", service_name);
libexec_binary = GNUNET_OS_get_libexec_binary_path (binary);
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg, service_name, "PREFIX", &peer->main_binary))
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ service_name,
+ "PREFIX",
+ &peer->main_binary))
{
/* No prefix */
- GNUNET_asprintf(&peer->main_binary, "%s", libexec_binary);
- peer->args = strdup ("");
+ GNUNET_asprintf (&peer->main_binary, "%s", libexec_binary);
+ peer->args = GNUNET_strdup ("");
}
else
- peer->args = strdup (libexec_binary);
+ peer->args = GNUNET_strdup (libexec_binary);
GNUNET_free (libexec_binary);
GNUNET_free (binary);
if (GNUNET_OK != GNUNET_TESTING_peer_start (peer))
- {
+ {
GNUNET_TESTING_peer_destroy (peer);
GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_TESTING_system_destroy (system, GNUNET_YES);
sc.tm = tm;
sc.tm_cls = tm_cls;
sc.peer = peer;
- GNUNET_SCHEDULER_run (&service_run_main, &sc); /* Scheduler loop */
+ GNUNET_SCHEDULER_run (&service_run_main, &sc); /* Scheduler loop */
if ((NULL != peer->main_process) &&
(GNUNET_OK != GNUNET_TESTING_peer_stop (peer)))
{
* Sometimes we use the binary name to determine which specific
* test to run. In those cases, the string after the last "_"
* in 'argv[0]' specifies a string that determines the configuration
- * file or plugin to use.
+ * file or plugin to use.
*
* This function returns the respective substring, taking care
* of issues such as binaries ending in '.exe' on W32.
*
* @param argv0 the name of the binary
* @return string between the last '_' and the '.exe' (or the end of the string),
- * NULL if argv0 has no '_'
+ * NULL if argv0 has no '_'
*/
char *
GNUNET_TESTING_get_testname_from_underscore (const char *argv0)
char *ret;
char *dot;
- memcpy (sbuf, argv0, slen);
+ GNUNET_memcpy (sbuf, argv0, slen);
ret = strrchr (sbuf, '_');
if (NULL == ret)
return NULL;
projects / oweals / gnunet.git / blobdiff