[GNUnet-SVN] r29832 - gnunet/src/testbed

[gnunet]

Author: grothoff
Date: 2013-10-04 07:17:17 +0200 (Fri, 04 Oct 2013)
New Revision: 29832

Modified:
   gnunet/src/testbed/testbed_api.c
   gnunet/src/testbed/testbed_api_peers.c
   gnunet/src/testbed/testbed_api_peers.h
Log:
addressing name conflict with PS_STOPPED on MinGW

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2013-10-03 22:26:48 UTC (rev 29831)
+++ gnunet/src/testbed/testbed_api.c    2013-10-04 05:17:17 UTC (rev 29832)
@@ -525,7 +525,7 @@
   GNUNET_assert (NULL != data->peer);
   peer = data->peer;
   GNUNET_assert (peer->unique_id == ntohl (msg->peer_id));
-  peer->state = PS_CREATED;
+  peer->state = TESTBED_PS_CREATED;
   GNUNET_TESTBED_peer_register_ (peer);
   cb = data->cb;
   cls = data->cls;
@@ -589,12 +589,12 @@
   switch (event.type)
   {
   case GNUNET_TESTBED_ET_PEER_START:
-    peer->state = PS_STARTED;
+    peer->state = TESTBED_PS_STARTED;
     event.details.peer_start.host = peer->host;
     event.details.peer_start.peer = peer;
     break;
   case GNUNET_TESTBED_ET_PEER_STOP:
-    peer->state = PS_STOPPED;
+    peer->state = TESTBED_PS_STOPPED;
     event.details.peer_stop.peer = peer;
     break;
   default:

Modified: gnunet/src/testbed/testbed_api_peers.c
===================================================================
--- gnunet/src/testbed/testbed_api_peers.c      2013-10-03 22:26:48 UTC (rev 
29831)
+++ gnunet/src/testbed/testbed_api_peers.c      2013-10-04 05:17:17 UTC (rev 
29832)
@@ -217,7 +217,7 @@
   GNUNET_assert (OP_PEER_START == opc->type);
   GNUNET_assert (NULL != (data = opc->data));
   GNUNET_assert (NULL != (peer = data->peer));
-  GNUNET_assert ((PS_CREATED == peer->state) || (PS_STOPPED == peer->state));
+  GNUNET_assert ((TESTBED_PS_CREATED == peer->state) || (TESTBED_PS_STOPPED == 
peer->state));
   opc->state = OPC_STATE_STARTED;
   msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStartMessage));
   msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStartMessage));
@@ -269,7 +269,7 @@
 
   GNUNET_assert (NULL != (data = opc->data));
   GNUNET_assert (NULL != (peer = data->peer));
-  GNUNET_assert (PS_STARTED == peer->state);
+  GNUNET_assert (TESTBED_PS_STARTED == peer->state);
   opc->state = OPC_STATE_STARTED;
   msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStopMessage));
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER);
@@ -574,7 +574,7 @@
   peer->controller = controller;
   peer->host = host;
   peer->unique_id = id_gen++;
-  peer->state = PS_INVALID;
+  peer->state = TESTBED_PS_INVALID;
   data = GNUNET_malloc (sizeof (struct PeerCreateData));
   data->host = host;
   data->cfg = cfg;
@@ -842,7 +842,7 @@
   struct OperationContext *opc;
   struct OverlayConnectData *data;
 
-  GNUNET_assert ((PS_STARTED == p1->state) && (PS_STARTED == p2->state));
+  GNUNET_assert ((TESTBED_PS_STARTED == p1->state) && (TESTBED_PS_STARTED == 
p2->state));
   data = GNUNET_malloc (sizeof (struct OverlayConnectData));
   data->p1 = p1;
   data->p2 = p2;
@@ -948,7 +948,7 @@
   struct OperationContext *opc;
   size_t msize;
 
-  GNUNET_assert (PS_STARTED == peer->state); /* peer is not running? */
+  GNUNET_assert (TESTBED_PS_STARTED == peer->state); /* peer is not running? */
   msize = strlen (service_name) + 1;
   msize += sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage);
   if (GNUNET_SERVER_MAX_MESSAGE_SIZE < msize)

Modified: gnunet/src/testbed/testbed_api_peers.h
===================================================================
--- gnunet/src/testbed/testbed_api_peers.h      2013-10-03 22:26:48 UTC (rev 
29831)
+++ gnunet/src/testbed/testbed_api_peers.h      2013-10-04 05:17:17 UTC (rev 
29832)
@@ -40,22 +40,22 @@
     /**
      * State to signify that this peer is invalid
      */
-  PS_INVALID,
+  TESTBED_PS_INVALID,
 
     /**
      * The peer has been created
      */
-  PS_CREATED,
+  TESTBED_PS_CREATED,
 
     /**
      * The peer is running
      */
-  PS_STARTED,
+  TESTBED_PS_STARTED,
 
     /**
      * The peer is stopped
      */
-  PS_STOPPED,
+  TESTBED_PS_STOPPED,
 };