summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/gnunet_testbed_ng_service.h4
-rw-r--r--src/testbed/Makefile.am2
-rw-r--r--src/testbed/testbed_api_cmd_peer.c17
3 files changed, 12 insertions, 11 deletions
diff --git a/src/include/gnunet_testbed_ng_service.h b/src/include/gnunet_testbed_ng_service.h
index ec14d0539..a6f30889f 100644
--- a/src/include/gnunet_testbed_ng_service.h
+++ b/src/include/gnunet_testbed_ng_service.h
@@ -66,7 +66,7 @@ struct ServiceState
const char *servicename;
};
-struct PeerState
+struct PeerCmdState
{
/**
* The label of a controller command.
@@ -239,7 +239,7 @@ void
GNUNET_TESTBED_shutdown_controller (struct ControllerState *cs);
void
-GNUNET_TESTBED_shutdown_peer (struct PeerState *ps);
+GNUNET_TESTBED_shutdown_peer (struct PeerCmdState *ps);
void
GNUNET_TESTBED_shutdown_service (struct ServiceState *ss);
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 26013ea1c..7a59670cb 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -96,7 +96,7 @@ libgnunettestbed_la_SOURCES = \
testbed_api_hosts.c testbed_api_hosts.h testbed_helper.h \
testbed_api_cmd_controller.c \
testbed_api_cmd_peer.c \
- #testbed_api_cmd_service.c \
+ testbed_api_cmd_service.c \
testbed_api_operations.c testbed_api_operations.h \
testbed_api_peers.c testbed_api_peers.h \
testbed_api_services.c \
diff --git a/src/testbed/testbed_api_cmd_peer.c b/src/testbed/testbed_api_cmd_peer.c
index f229a1596..4a727bc94 100644
--- a/src/testbed/testbed_api_cmd_peer.c
+++ b/src/testbed/testbed_api_cmd_peer.c
@@ -29,6 +29,7 @@
#include "gnunet_testing_ng_lib.h"
#include "gnunet_testbed_ng_service.h"
#include "gnunet-service-testbed.h"
+#include "testbed_api_peers.h"
/**
@@ -81,7 +82,7 @@ peer_cleanup (void *cls,
static void
do_abort (void *cls)
{
- struct PeerState *ps = cls;
+ struct PeerCmdState *ps = cls;
if (GNUNET_NO == ps->peer_ready)
{
@@ -103,7 +104,7 @@ static void
peer_started_cb (void *cls,
const char *emsg)
{
- struct PeerState *ps = cls;
+ struct PeerCmdState *ps = cls;
GNUNET_TESTBED_operation_done (ps->operation);
if (NULL == emsg)
@@ -134,7 +135,7 @@ peer_create_cb (void *cls,
struct GNUNET_TESTBED_Peer *peer,
const char *emsg)
{
- struct PeerState *ps = cls;
+ struct PeerCmdState *ps = cls;
ps->peer = peer;
GNUNET_TESTBED_operation_done (ps->operation);
@@ -150,7 +151,7 @@ peer_run (void *cls,
const struct GNUNET_TESTING_Command *cmd,
struct GNUNET_TESTING_Interpreter *is)
{
- struct PeerState *ps = cls;
+ struct PeerCmdState *ps = cls;
const struct GNUNET_TESTING_Command *controller_cmd;
struct GNUNET_TESTBED_Controller *controller;
@@ -180,7 +181,7 @@ void
peer_stopped_cb (void *cls,
const char *emsg)
{
- struct PeerState *ps = cls;
+ struct PeerCmdState *ps = cls;
if (NULL != emsg)
{
@@ -198,7 +199,7 @@ peer_stopped_cb (void *cls,
* @param cs controller state.
*/
void
-GNUNET_TESTBED_shutdown_peer (struct PeerState *ps)
+GNUNET_TESTBED_shutdown_peer (struct PeerCmdState *ps)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Shutting down...\n");
@@ -227,9 +228,9 @@ GNUNET_TESTBED_cmd_peer (const char *label,
uint16_t port,
struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct PeerState *ps;
+ struct PeerCmdState *ps;
- ps = GNUNET_new (struct PeerState);
+ ps = GNUNET_new (struct PeerCmdState);
ps->hostname = hostname;
ps->username = username;
ps->port = port;