M testbed/testbed.h

naming consistency
include uncompressed config size

M    testbed/testbed_api_hosts.c
pulled host registration functions from testbed_api.c

M    testbed/testbed_api_hosts.h
export handler to handle ADD_HOST confirmation messages

M    testbed/gnunet-service-testbed.c
parse the modified ADD_HOST message

M    testbed/testbed_api.c
lose host registration code
extract configuration from ADD_HOST messages

M    testbed/testbed_api.h
include hacks

1 files changed, 19 insertions, 2 deletions

diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h
index 2d25fd596..91fea72b7 100644
--- a/src/testbed/testbed_api_hosts.h
+++ b/src/testbed/testbed_api_hosts.h
@@ -27,8 +27,9 @@
 #ifndef NEW_TESTING_API_HOSTS_H
 #define NEW_TESTING_API_HOSTS_H
 
-#include "gnunet_testbed_service.h"
-#include "testbed_helper.h"
+//#include "gnunet_testbed_service.h"
+//#include "testbed_helper.h"
+#include "testbed.h"
 
 
 /**
@@ -193,5 +194,21 @@ void
 GNUNET_TESTBED_host_queue_oc_ (struct GNUNET_TESTBED_Host *h, 
                                struct GNUNET_TESTBED_Operation *op);
 
+
+/**
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_ADDHOSTCONFIRM message from
+ * controller (testbed service)
+ *
+ * @param c the controller handler
+ * @param msg message received
+ * @return GNUNET_YES if we can continue receiving from service; GNUNET_NO if
+ *           not
+ */
+int
+GNUNET_TESTBED_host_handle_addhostconfirm_ (struct GNUNET_TESTBED_Controller *c,
+                                            const struct
+                                            GNUNET_TESTBED_HostConfirmedMessage
+                                            *msg);
+
 #endif
 /* end of testbed_api_hosts.h */