/*
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
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.
*/
/**
* @file testbed/testbed_api_barriers.c
* @brief API implementation for testbed barriers
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
*/
#include "platform.h"
* The controller handle given while initiliasing this barrier
*/
struct GNUNET_TESTBED_Controller *c;
-
+
/**
* The name of the barrier
*/
* the closure for the above callback
*/
void *cls;
-
+
/**
* Should the barrier crossed status message be echoed back to the controller?
*/
struct GNUNET_TESTBED_Barrier *barrier;
char *emsg;
const char *name;
- struct GNUNET_HashCode key;
+ struct GNUNET_HashCode key;
size_t emsg_len;
int status;
uint16_t msize;
uint16_t name_len;
-
+
emsg = NULL;
barrier = NULL;
- msize = ntohs (msg->header.size);
+ msize = ntohs (msg->header.size);
name = msg->data;
name_len = ntohs (msg->name_len);
LOG_DEBUG ("Received BARRIER_STATUS msg\n");
return GNUNET_SYSERR;
}
status = ntohs (msg->status);
- if (BARRIER_STATUS_ERROR == status)
+ if (GNUNET_TESTBED_BARRIERSTATUS_ERROR == status)
{
status = -1;
emsg_len = msize - (sizeof (struct GNUNET_TESTBED_BarrierStatusMsg) + name_len
goto cleanup;
}
GNUNET_assert (NULL != barrier->cb);
- if ((GNUNET_YES == barrier->echo) && (BARRIER_STATUS_CROSSED == status))
+ if ((GNUNET_YES == barrier->echo) && (GNUNET_TESTBED_BARRIERSTATUS_CROSSED == status))
GNUNET_TESTBED_queue_message_ (c, GNUNET_copy_message (&msg->header));
barrier->cb (barrier->cls, name, barrier, status, emsg);
- if (BARRIER_STATUS_INITIALISED == status)
+ if (GNUNET_TESTBED_BARRIERSTATUS_INITIALISED == status)
return GNUNET_OK; /* just initialised; skip cleanup */
cleanup:
struct GNUNET_HashCode key;
size_t name_len;
uint16_t msize;
-
+
GNUNET_assert (quorum <= 100);
GNUNET_assert (NULL != cb);
name_len = strlen (name);
return NULL;
}
LOG_DEBUG ("Initialising barrier `%s'\n", name);
- barrier = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Barrier));
+ barrier = GNUNET_new (struct GNUNET_TESTBED_Barrier);
barrier->c = controller;
barrier->name = GNUNET_strdup (name);
barrier->cb = cb;
* The name of the barrier
*/
char *name;
-
+
/**
* Then configuration used for the client connection
*/
- struct GNUNET_CONFIGURATION_Handle *cfg;
+ struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* The client connection
struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
const struct GNUNET_TESTBED_BarrierStatusMsg *msg;
uint16_t msize;
-
+
if (NULL == message)
{
GNUNET_break_op (0);
{
GNUNET_break_op (0);
goto fail;
- }
+ }
msize = ntohs (message->size);
if (msize <= sizeof (struct GNUNET_TESTBED_BarrierStatusMsg))
{
GNUNET_break_op (0);
goto fail;
- }
+ }
msg = (const struct GNUNET_TESTBED_BarrierStatusMsg *) message;
switch (ntohs (msg->status))
{
- case BARRIER_STATUS_ERROR:
+ case GNUNET_TESTBED_BARRIERSTATUS_ERROR:
goto fail;
- case BARRIER_STATUS_INITIALISED:
+ case GNUNET_TESTBED_BARRIERSTATUS_INITIALISED:
GNUNET_break (0); /* FIXME */
goto destroy;
- case BARRIER_STATUS_CROSSED:
+ case GNUNET_TESTBED_BARRIERSTATUS_CROSSED:
h->cb (h->cls, h->name, GNUNET_OK);
goto destroy;
default:
{
struct GNUNET_TESTBED_BarrierWaitHandle *h = cls;
uint16_t msize;
-
+
h->tx = NULL;
if ((0 == size) || (NULL == buf))
{
GNUNET_CONFIGURATION_destroy (cfg);
return NULL;
}
- h = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_BarrierWaitHandle));
+ h = GNUNET_new (struct GNUNET_TESTBED_BarrierWaitHandle);
h->name = GNUNET_strdup (name);
h->cfg = cfg;
h->conn = GNUNET_CLIENT_connect ("testbed-barrier", h->cfg);
msg->header.size = htons (msize);
(void) memcpy (msg->name, name, name_len);
h->msg = &msg->header;
- h->tx =
+ h->tx =
GNUNET_CLIENT_notify_transmit_ready (h->conn, msize,
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_NO,