master_context->client = client;
master_context->host_id = ntohl (msg->host_id);
master_context->master_ip = GNUNET_strdup (controller_hostname);
- LOG_DEBUG ("Master Controller IP: %s\n", master_context->master_ip);
+ LOG_DEBUG ("Our IP: %s\n", master_context->master_ip);
master_context->system =
GNUNET_TESTING_system_create ("testbed", master_context->master_ip, hostname);
host =
/**
* Function to destroy a peer
*
- * @param the peer structure to destroy
+ * @param peer the peer structure to destroy
*/
static void
destroy_peer (struct Peer *peer)
/* rhc is now set to the existing one from the hash map by
reghost_match_iterator() */
/* if queue is empty then ignore creating focc and proceed with
- normal forwarding */
- if (NULL == rhc->focc_dll_head)
+ normal forwarding */
+ if (RHC_OL_CONNECT == rhc->state)
skip_focc = GNUNET_YES;
}
if (GNUNET_NO == skip_focc)
if ((peer2_host_id >= slave_list_size)
|| (NULL ==slave_list[peer2_host_id]))
{
- struct GNUNET_TESTBED_NeedControllerConfig *reply;
-
- LOG_DEBUG ("Need controller configuration for connecting peers %u and %u\n",
- p1, p2);
- reply = GNUNET_malloc (sizeof (struct
- GNUNET_TESTBED_NeedControllerConfig));
- reply->header.size = htons (sizeof (struct
- GNUNET_TESTBED_NeedControllerConfig));
- reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_NEEDCONTROLLERCONFIG);
- reply->controller_host_id = msg->peer2_host_id;
- reply->operation_id = msg->operation_id;
- queue_message (client, &reply->header);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Configuration of peer2's controller missing for connecting peers"
+ "%u and %u\n", p1, p2);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- else
+ peer2_controller = slave_list[peer2_host_id]->controller;
+ if (NULL == peer2_controller)
{
- //occ->peer2_controller = slave_list[peer2_host_id]->controller;
- peer2_controller = slave_list[peer2_host_id]->controller;
- if (NULL == peer2_controller)
- {
- GNUNET_break (0); /* What's going on? */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ GNUNET_break (0); /* What's going on? */
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
}
}
else
cleanup_focc (focc);
}
if (NULL != rhc->sub_op)
- GNUNET_TESTBED_operation_cancel (rhc->sub_op);
+ GNUNET_TESTBED_operation_done (rhc->sub_op);
if (NULL != rhc->client)
GNUNET_SERVER_client_drop (rhc->client);
GNUNET_free (value);