diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-09-30 11:02:19 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-09-30 11:02:19 +0000 |
commit | 814457c05d62c8f0c167c6bc2015201151355249 (patch) | |
tree | 8533c8f266ee5ebec1557bcefba78a9af70ab172 /src/testbed/testbed_api_barriers.c | |
parent | ba188e0085612a599d67de0151aa514373dbbede (diff) | |
download | gnunet-814457c05d62c8f0c167c6bc2015201151355249.tar.gz gnunet-814457c05d62c8f0c167c6bc2015201151355249.zip |
- rename to GNUNET_TESTBED_BARRIERSTATUS_*
Diffstat (limited to 'src/testbed/testbed_api_barriers.c')
-rw-r--r-- | src/testbed/testbed_api_barriers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c index 9c7ee533c..2a197719f 100644 --- a/src/testbed/testbed_api_barriers.c +++ b/src/testbed/testbed_api_barriers.c | |||
@@ -148,7 +148,7 @@ GNUNET_TESTBED_handle_barrier_status_ (struct GNUNET_TESTBED_Controller *c, | |||
148 | return GNUNET_SYSERR; | 148 | return GNUNET_SYSERR; |
149 | } | 149 | } |
150 | status = ntohs (msg->status); | 150 | status = ntohs (msg->status); |
151 | if (BARRIER_STATUS_ERROR == status) | 151 | if (GNUNET_TESTBED_BARRIERSTATUS_ERROR == status) |
152 | { | 152 | { |
153 | status = -1; | 153 | status = -1; |
154 | emsg_len = msize - (sizeof (struct GNUNET_TESTBED_BarrierStatusMsg) + name_len | 154 | emsg_len = msize - (sizeof (struct GNUNET_TESTBED_BarrierStatusMsg) + name_len |
@@ -177,10 +177,10 @@ GNUNET_TESTBED_handle_barrier_status_ (struct GNUNET_TESTBED_Controller *c, | |||
177 | goto cleanup; | 177 | goto cleanup; |
178 | } | 178 | } |
179 | GNUNET_assert (NULL != barrier->cb); | 179 | GNUNET_assert (NULL != barrier->cb); |
180 | if ((GNUNET_YES == barrier->echo) && (BARRIER_STATUS_CROSSED == status)) | 180 | if ((GNUNET_YES == barrier->echo) && (GNUNET_TESTBED_BARRIERSTATUS_CROSSED == status)) |
181 | GNUNET_TESTBED_queue_message_ (c, GNUNET_copy_message (&msg->header)); | 181 | GNUNET_TESTBED_queue_message_ (c, GNUNET_copy_message (&msg->header)); |
182 | barrier->cb (barrier->cls, name, barrier, status, emsg); | 182 | barrier->cb (barrier->cls, name, barrier, status, emsg); |
183 | if (BARRIER_STATUS_INITIALISED == status) | 183 | if (GNUNET_TESTBED_BARRIERSTATUS_INITIALISED == status) |
184 | return GNUNET_OK; /* just initialised; skip cleanup */ | 184 | return GNUNET_OK; /* just initialised; skip cleanup */ |
185 | 185 | ||
186 | cleanup: | 186 | cleanup: |
@@ -396,12 +396,12 @@ receive_handler (void *cls, const struct GNUNET_MessageHeader *message) | |||
396 | msg = (const struct GNUNET_TESTBED_BarrierStatusMsg *) message; | 396 | msg = (const struct GNUNET_TESTBED_BarrierStatusMsg *) message; |
397 | switch (ntohs (msg->status)) | 397 | switch (ntohs (msg->status)) |
398 | { | 398 | { |
399 | case BARRIER_STATUS_ERROR: | 399 | case GNUNET_TESTBED_BARRIERSTATUS_ERROR: |
400 | goto fail; | 400 | goto fail; |
401 | case BARRIER_STATUS_INITIALISED: | 401 | case GNUNET_TESTBED_BARRIERSTATUS_INITIALISED: |
402 | GNUNET_break (0); /* FIXME */ | 402 | GNUNET_break (0); /* FIXME */ |
403 | goto destroy; | 403 | goto destroy; |
404 | case BARRIER_STATUS_CROSSED: | 404 | case GNUNET_TESTBED_BARRIERSTATUS_CROSSED: |
405 | h->cb (h->cls, h->name, GNUNET_OK); | 405 | h->cb (h->cls, h->name, GNUNET_OK); |
406 | goto destroy; | 406 | goto destroy; |
407 | default: | 407 | default: |