#include "platform.h"
#include "gnunet_service_lib.h"
#include "gnunet_server_lib.h"
+#include "gnunet_transport_service.h"
#include <zlib.h>
#include "gnunet_testbed_service.h"
};
-/**
- * Slave startup context
- */
-struct SlaveContext
-{
- /**
- * The slave corresponding to this context
- */
- struct Slave *slave;
-
- /**
- * The configuration used as a template while startup
- */
- struct GNUNET_CONFIGURATION_Handle *cfg;
-};
-
-
/**
* States of LCFContext
*/
};
+/**
+ * Context information for connecting 2 peers in overlay
+ */
+struct OverlayConnectContext
+{
+ /**
+ * peer 1
+ */
+ struct Peer *peer1;
+
+ /**
+ * peer 2
+ */
+ struct Peer *peer2;
+
+ /**
+ * Transport handle of peer1
+ */
+ struct GNUNET_TRANSPORT_Handle *peer1_transport;
+
+ /**
+ * Transport handle of peer2
+ */
+ struct GNUNET_TRANSPORT_Handle *peer2_transport;
+
+ /**
+ * HELLO of peer1
+ */
+ struct GNUNET_MessageHeader *peer1_hello;
+
+ /**
+ * HELLO of peer2
+ */
+ struct GNUNET_MessageHeader *peer2_hello;
+
+ /**
+ * Get hello handle for peer1
+ */
+ struct GNUNET_TRANSPORT_GetHelloHandle *peer1_ghh;
+
+ /**
+ * Get hello handle for peer2
+ */
+ struct GNUNET_TRANSPORT_GetHelloHandle *peer2_ghh;
+};
+
+
/**
* The master context; generated with the first INIT message
*/
/* Handles */
/***********/
-/**
- * Wrapped stdin.
- */
-static struct GNUNET_DISK_FileHandle *fh;
-
/**
* Current Transmit Handle; NULL if no notify transmit exists currently
*/
*/
static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
-/******************/
-/* Testing System */
-/******************/
-
-/**
- * Our configuration; we also use this as template for starting other controllers
- */
-static struct GNUNET_CONFIGURATION_Handle *config;
-
/**
* Function called to notify a client about the connection begin ready to queue
const struct GNUNET_CONFIGURATION_Handle *cfg,
int status)
{
- struct SlaveContext *sc = cls;
+ struct Slave *slave = cls;
if (GNUNET_SYSERR == status)
{
- sc->slave->controller_proc = NULL;
+ slave->controller_proc = NULL;
LOG (GNUNET_ERROR_TYPE_WARNING,
"Unexpected slave shutdown\n");
GNUNET_SCHEDULER_shutdown (); /* We too shutdown */
return;
}
- GNUNET_CONFIGURATION_destroy (sc->cfg);
- sc->slave->controller =
- GNUNET_TESTBED_controller_connect (cfg, host_list[sc->slave->host_id],
+ slave->controller =
+ GNUNET_TESTBED_controller_connect (cfg, host_list[slave->host_id],
master_context->event_mask,
- &slave_event_callback, sc->slave);
- GNUNET_free (sc);
+ &slave_event_callback, slave);
}
LOG (GNUNET_ERROR_TYPE_WARNING,
"Cannot determine the ip of master controller: %s\n", STRERROR (errno));
GNUNET_free (addr);
+ GNUNET_free (master_context->master_ip);
GNUNET_assert (0);
}
GNUNET_free (addr);
+ if (0 == strcasecmp (master_context->master_ip, "localhost"))
+ { /* Hack for connections via unix sockets */
+ LOG_DEBUG ("May be using local sockets - assuming loopback for master ip\n");
+ GNUNET_free (master_context->master_ip);
+ master_context->master_ip = strdup ("127.0.0.1");
+ }
LOG_DEBUG ("Master Controller IP: %s\n", master_context->master_ip);
master_context->system =
GNUNET_TESTING_system_create ("testbed", master_context->master_ip);
{
const struct GNUNET_TESTBED_ControllerLinkMessage *msg;
struct GNUNET_CONFIGURATION_Handle *cfg;
- struct SlaveContext *sc;
struct LCFContextQueue *lcfq;
struct Route *route;
struct Route *new_route;
return;
}
slave = GNUNET_malloc (sizeof (struct Slave));
- slave->host_id = delegated_host_id;
- slave_list_add (slave);
- sc = GNUNET_malloc (sizeof (struct SlaveContext));
- sc->slave = slave;
- sc->cfg = cfg;
+ slave->host_id = delegated_host_id;
+ slave_list_add (slave);
if (1 == msg->is_subordinate)
{
slave->controller_proc =
GNUNET_TESTBED_controller_start (master_context->master_ip,
host_list[slave->host_id],
cfg, &slave_status_callback,
- sc);
- }
+ slave);
+ }
+ else {
+ slave->controller =
+ GNUNET_TESTBED_controller_connect (cfg, host_list[slave->host_id],
+ master_context->event_mask,
+ &slave_event_callback, slave);
+ }
+ GNUNET_CONFIGURATION_destroy (cfg);
new_route = GNUNET_malloc (sizeof (struct Route));
new_route->dest = delegated_host_id;
new_route->thru = master_context->host_id;
}
+
+/**
+ * Function called whenever there is an update to the
+ * HELLO of this peer.
+ *
+ * @param cls closure
+ * @param hello our updated HELLO
+ */
+static void
+hello_update_cb (void *cls,
+ const struct GNUNET_MessageHeader *hello)
+{
+ GNUNET_break(0);
+}
+
+
+/**
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT messages
+ *
+ * @param cls NULL
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_overlay_connect (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct GNUNET_TESTBED_OverlayConnectMessage *msg;
+ struct OverlayConnectContext *occ;
+ uint32_t p1;
+ uint32_t p2;
+
+ msg = (const struct GNUNET_TESTBED_OverlayConnectMessage *) message;
+ p1 = ntohl (msg->peer1);
+ p2 = ntohl (msg->peer2);
+ GNUNET_assert (p1 < peer_list_size);
+ GNUNET_assert (NULL != peer_list[p1]);
+ GNUNET_assert (p2 < peer_list_size);
+ GNUNET_assert (NULL != peer_list[p2]);
+ occ = GNUNET_malloc (sizeof (struct OverlayConnectContext));
+ occ->peer1 = peer_list[p1];
+ occ->peer2 = peer_list[p2];
+ occ->peer1_transport = GNUNET_TRANSPORT_connect (occ->peer1->cfg, NULL, occ,
+ NULL, NULL, NULL);
+ occ->peer2_transport = GNUNET_TRANSPORT_connect (occ->peer2->cfg, NULL, occ,
+ NULL, NULL, NULL);
+ occ->peer1_ghh = GNUNET_TRANSPORT_get_hello (occ->peer1_transport, &hello_update_cb, occ);
+ occ->peer2_ghh = GNUNET_TRANSPORT_get_hello (occ->peer2_transport, &hello_update_cb, occ);
+}
+
+
/**
* Iterator over hash map entries.
*
(void) GNUNET_CONTAINER_multihashmap_iterate (ss_map, &ss_map_free_iterator,
NULL);
GNUNET_CONTAINER_multihashmap_destroy (ss_map);
- if (NULL != fh)
- {
- GNUNET_DISK_file_close (fh);
- fh = NULL;
- }
if (NULL != lcfq_head)
{
if (GNUNET_SCHEDULER_NO_TASK != lcf_proc_task_id)
GNUNET_free_non_null (master_context->master_ip);
if (NULL != master_context->system)
GNUNET_TESTING_system_destroy (master_context->system, GNUNET_YES);
+ GNUNET_free (master_context);
+ master_context = NULL;
}
}
-/**
- * Debug shutdown task in case of stdin getting closed
- *
- * @param cls NULL
- * @param tc the TaskContext from scheduler
- */
-static void
-shutdown_task_ (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "STDIN closed ...\n");
- shutdown_task (cls, tc);
-}
-
-
/**
* Callback for client disconnect
*
hurt for now --- might need to revise this later if we ever
decide that master connections might be temporarily down
for some reason */
- GNUNET_SCHEDULER_shutdown ();
+ //GNUNET_SCHEDULER_shutdown ();
}
}
sizeof (struct GNUNET_TESTBED_PeerStopMessage)},
{&handle_peer_get_config, NULL, GNUNET_MESSAGE_TYPE_TESTBED_GETPEERCONFIG,
sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)},
+ {&handle_overlay_connect, NULL, GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT,
+ sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)},
{NULL}
};
- config = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_SERVER_add_handlers (server,
message_handlers);
GNUNET_SERVER_disconnect_notify (server,
&client_disconnect_cb,
NULL);
ss_map = GNUNET_CONTAINER_multihashmap_create (5);
- fh = GNUNET_DISK_get_handle_from_native (stdin);
- if (NULL == fh)
- shutdown_task_id =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task,
- NULL);
- else
- shutdown_task_id =
- GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
- fh,
- &shutdown_task_,
- NULL);
+ shutdown_task_id =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
LOG_DEBUG ("Testbed startup complete\n");
}
projects / oweals / gnunet.git / blobdiff