diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-04 05:17:17 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-04 05:17:17 +0000 |
commit | f4bde791f640f926bc7f18961330e37b5b868914 (patch) | |
tree | 4e42b2b61deec10c83ccfbc246b77e3aa868ed52 /src | |
parent | faf0396be4edcb8f322784037f47a819f4353f3e (diff) | |
download | gnunet-f4bde791f640f926bc7f18961330e37b5b868914.tar.gz gnunet-f4bde791f640f926bc7f18961330e37b5b868914.zip |
addressing name conflict with PS_STOPPED on MinGW
Diffstat (limited to 'src')
-rw-r--r-- | src/testbed/testbed_api.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_peers.c | 10 | ||||
-rw-r--r-- | src/testbed/testbed_api_peers.h | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index e328456de..3539eae03 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -525,7 +525,7 @@ handle_peer_create_success (struct GNUNET_TESTBED_Controller *c, | |||
525 | GNUNET_assert (NULL != data->peer); | 525 | GNUNET_assert (NULL != data->peer); |
526 | peer = data->peer; | 526 | peer = data->peer; |
527 | GNUNET_assert (peer->unique_id == ntohl (msg->peer_id)); | 527 | GNUNET_assert (peer->unique_id == ntohl (msg->peer_id)); |
528 | peer->state = PS_CREATED; | 528 | peer->state = TESTBED_PS_CREATED; |
529 | GNUNET_TESTBED_peer_register_ (peer); | 529 | GNUNET_TESTBED_peer_register_ (peer); |
530 | cb = data->cb; | 530 | cb = data->cb; |
531 | cls = data->cls; | 531 | cls = data->cls; |
@@ -589,12 +589,12 @@ handle_peer_event (struct GNUNET_TESTBED_Controller *c, | |||
589 | switch (event.type) | 589 | switch (event.type) |
590 | { | 590 | { |
591 | case GNUNET_TESTBED_ET_PEER_START: | 591 | case GNUNET_TESTBED_ET_PEER_START: |
592 | peer->state = PS_STARTED; | 592 | peer->state = TESTBED_PS_STARTED; |
593 | event.details.peer_start.host = peer->host; | 593 | event.details.peer_start.host = peer->host; |
594 | event.details.peer_start.peer = peer; | 594 | event.details.peer_start.peer = peer; |
595 | break; | 595 | break; |
596 | case GNUNET_TESTBED_ET_PEER_STOP: | 596 | case GNUNET_TESTBED_ET_PEER_STOP: |
597 | peer->state = PS_STOPPED; | 597 | peer->state = TESTBED_PS_STOPPED; |
598 | event.details.peer_stop.peer = peer; | 598 | event.details.peer_stop.peer = peer; |
599 | break; | 599 | break; |
600 | default: | 600 | default: |
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c index fd1da85ef..9b21bfb3a 100644 --- a/src/testbed/testbed_api_peers.c +++ b/src/testbed/testbed_api_peers.c | |||
@@ -217,7 +217,7 @@ opstart_peer_start (void *cls) | |||
217 | GNUNET_assert (OP_PEER_START == opc->type); | 217 | GNUNET_assert (OP_PEER_START == opc->type); |
218 | GNUNET_assert (NULL != (data = opc->data)); | 218 | GNUNET_assert (NULL != (data = opc->data)); |
219 | GNUNET_assert (NULL != (peer = data->peer)); | 219 | GNUNET_assert (NULL != (peer = data->peer)); |
220 | GNUNET_assert ((PS_CREATED == peer->state) || (PS_STOPPED == peer->state)); | 220 | GNUNET_assert ((TESTBED_PS_CREATED == peer->state) || (TESTBED_PS_STOPPED == peer->state)); |
221 | opc->state = OPC_STATE_STARTED; | 221 | opc->state = OPC_STATE_STARTED; |
222 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStartMessage)); | 222 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStartMessage)); |
223 | msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStartMessage)); | 223 | msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStartMessage)); |
@@ -269,7 +269,7 @@ opstart_peer_stop (void *cls) | |||
269 | 269 | ||
270 | GNUNET_assert (NULL != (data = opc->data)); | 270 | GNUNET_assert (NULL != (data = opc->data)); |
271 | GNUNET_assert (NULL != (peer = data->peer)); | 271 | GNUNET_assert (NULL != (peer = data->peer)); |
272 | GNUNET_assert (PS_STARTED == peer->state); | 272 | GNUNET_assert (TESTBED_PS_STARTED == peer->state); |
273 | opc->state = OPC_STATE_STARTED; | 273 | opc->state = OPC_STATE_STARTED; |
274 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStopMessage)); | 274 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStopMessage)); |
275 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER); | 275 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER); |
@@ -574,7 +574,7 @@ GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller, | |||
574 | peer->controller = controller; | 574 | peer->controller = controller; |
575 | peer->host = host; | 575 | peer->host = host; |
576 | peer->unique_id = id_gen++; | 576 | peer->unique_id = id_gen++; |
577 | peer->state = PS_INVALID; | 577 | peer->state = TESTBED_PS_INVALID; |
578 | data = GNUNET_malloc (sizeof (struct PeerCreateData)); | 578 | data = GNUNET_malloc (sizeof (struct PeerCreateData)); |
579 | data->host = host; | 579 | data->host = host; |
580 | data->cfg = cfg; | 580 | data->cfg = cfg; |
@@ -842,7 +842,7 @@ GNUNET_TESTBED_overlay_connect (void *op_cls, | |||
842 | struct OperationContext *opc; | 842 | struct OperationContext *opc; |
843 | struct OverlayConnectData *data; | 843 | struct OverlayConnectData *data; |
844 | 844 | ||
845 | GNUNET_assert ((PS_STARTED == p1->state) && (PS_STARTED == p2->state)); | 845 | GNUNET_assert ((TESTBED_PS_STARTED == p1->state) && (TESTBED_PS_STARTED == p2->state)); |
846 | data = GNUNET_malloc (sizeof (struct OverlayConnectData)); | 846 | data = GNUNET_malloc (sizeof (struct OverlayConnectData)); |
847 | data->p1 = p1; | 847 | data->p1 = p1; |
848 | data->p2 = p2; | 848 | data->p2 = p2; |
@@ -948,7 +948,7 @@ GNUNET_TESTBED_peer_manage_service (void *op_cls, | |||
948 | struct OperationContext *opc; | 948 | struct OperationContext *opc; |
949 | size_t msize; | 949 | size_t msize; |
950 | 950 | ||
951 | GNUNET_assert (PS_STARTED == peer->state); /* peer is not running? */ | 951 | GNUNET_assert (TESTBED_PS_STARTED == peer->state); /* peer is not running? */ |
952 | msize = strlen (service_name) + 1; | 952 | msize = strlen (service_name) + 1; |
953 | msize += sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage); | 953 | msize += sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage); |
954 | if (GNUNET_SERVER_MAX_MESSAGE_SIZE < msize) | 954 | if (GNUNET_SERVER_MAX_MESSAGE_SIZE < msize) |
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h index 0a87bf6ee..7416e1f05 100644 --- a/src/testbed/testbed_api_peers.h +++ b/src/testbed/testbed_api_peers.h | |||
@@ -40,22 +40,22 @@ enum PeerState | |||
40 | /** | 40 | /** |
41 | * State to signify that this peer is invalid | 41 | * State to signify that this peer is invalid |
42 | */ | 42 | */ |
43 | PS_INVALID, | 43 | TESTBED_PS_INVALID, |
44 | 44 | ||
45 | /** | 45 | /** |
46 | * The peer has been created | 46 | * The peer has been created |
47 | */ | 47 | */ |
48 | PS_CREATED, | 48 | TESTBED_PS_CREATED, |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * The peer is running | 51 | * The peer is running |
52 | */ | 52 | */ |
53 | PS_STARTED, | 53 | TESTBED_PS_STARTED, |
54 | 54 | ||
55 | /** | 55 | /** |
56 | * The peer is stopped | 56 | * The peer is stopped |
57 | */ | 57 | */ |
58 | PS_STOPPED, | 58 | TESTBED_PS_STOPPED, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | 61 | ||