GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
* has to be made between local peers
*/
OCC_TYPE_LOCAL,
-
+
/**
* Type to be used when the first peer is local and the other peer is on a slave
* controller started by us
* contexts
*/
struct LocalPeer2Context
-{
+{
/**
* The handle for offering the HELLO of the first peer to the second
* peer.
* contexts
*/
struct RemotePeer2Context
-{
+{
/**
* Controller of peer 2; If OCC_TYPE_REMOTE_LATERAL is the type of overlay
* connection then this can be NULL until the connection to the controller is
* established
*/
struct GNUNET_TESTBED_Controller *p2c;
-
+
/**
* Operation context for the suboperation we start to get the identity of the
* second peer
*/
struct OperationContext *opc;
-
+
/**
* Notification handle acquire to connect to a remote controller. Only used
* if the type of overlay connection is OCC_TYPE_REMOTE_LATERAL.
* The neighbour handle. Only used if the type of overlay connection is
* OCC_TYPE_REMOTE_LATERAL.
*/
- struct Neighbour *p2n;
+ struct Neighbour *p2n;
};
/**
void
GST_cleanup_focc (struct ForwardedOverlayConnectContext *focc)
{
- GNUNET_SERVER_client_drop (focc->client);
+ GNUNET_SERVER_client_drop (focc->client);
GNUNET_free_non_null (focc->orig_msg);
GNUNET_free (focc);
}
focc = rhc->focc_dll_head;
GNUNET_assert (NULL != focc);
GNUNET_assert (RHC_DONE == rhc->state);
- GNUNET_assert (!INVALID_PEER_ID (focc->peer1));
+ GNUNET_assert (VALID_PEER_ID (focc->peer1));
peer = GST_peer_list[focc->peer1];
GNUNET_assert (GNUNET_YES == peer->is_remote);
GNUNET_assert (NULL != (slave = peer->details.remote.slave));
if (NULL != occ->cgh_p1th)
GST_cache_get_handle_done (occ->cgh_p1th);
GNUNET_assert (NULL != GST_peer_list);
- GNUNET_assert (occ->peer->reference_cnt > 0);
+ GNUNET_assert (occ->peer->reference_cnt > 0);
occ->peer->reference_cnt--;
if (PEER_EXPIRED (occ->peer))
GST_destroy_peer (occ->peer);
GNUNET_free_non_null (occ->emsg);
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout during TRANSPORT_try_connect() "
- "at peer %4s", occ->op_id,
- GNUNET_i2s(&occ->peer_identity));
+ "at peer %4s", occ->op_id,
+ GNUNET_i2s(&occ->other_peer_identity));
lp2c->tcc.pid = &occ->peer_identity;
lp2c->tcc.op_id = occ->op_id;
lp2c->tcc.task = GNUNET_SCHEDULER_add_now (&try_connect_task, &lp2c->tcc);
char *other_peer_str;
uint16_t msize;
uint16_t hello_size;
-
+
GNUNET_assert (OCC_TYPE_LOCAL != occ->type);
GNUNET_assert (NULL != occ->hello);
- other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
+ other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
LOG_DEBUG ("0x%llx: Offering HELLO of %s (size: %u) to %s via Remote "
"Overlay Request\n", occ->op_id,
GNUNET_i2s (&occ->peer_identity), ntohs (occ->hello->size),
return;
}
lp2c = &occ->p2ctx.local;
- other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
+ other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
LOG_DEBUG ("0x%llx: Offering HELLO of %s to %s\n", occ->op_id,
GNUNET_i2s (&occ->peer_identity), other_peer_str);
GNUNET_free (other_peer_str);
GNUNET_assert (NULL == occ->cgh_p1th);
if (OCC_TYPE_LOCAL == occ->type)
{
- GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id]));
+ GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id]));
occ->p2ctx.local.tcc.cgh_th =
GST_cache_get_handle_transport (occ->other_peer_id,
peer2->details.local.cfg,
rp2c = &occ->p2ctx.remote;
rp2c->opc = NULL;
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task);
- if (GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION != ntohs (msg->type))
+ if (GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION != ntohs (msg->type))
{
GNUNET_SCHEDULER_cancel (occ->timeout_task);
occ->timeout_task =
host_registration_comp (void *cls, const char *emsg)
{
struct RegisteredHostContext *rhc = cls;
-
+
rhc->state = RHC_DONE;
GST_process_next_focc (rhc);
}
}
+/**
+ * Checks if the given host is registered at the given slave.
+ *
+ * @param slave the slave where registration has to be checked. The check is
+ * actually done through a locally maintained hashmap. No
+ * communication with the slave is involved.
+ * @param host the host to register
+ * @return If the given host is not registered already or the registration is
+ * pending, it returns the registration context. Any overlay connects
+ * to be forwarded should be queued in the context so that they can be
+ * executed when the registration is completed. If the given host is
+ * already registered, NULL is returned.
+ */
static struct RegisteredHostContext *
-register_p2_host (struct Slave *slave, uint32_t peer2_host_id)
+register_host (struct Slave *slave, struct GNUNET_TESTBED_Host *host)
{
struct GNUNET_HashCode hash;
struct RegisteredHostContext *rhc;
-
+
rhc = GNUNET_malloc (sizeof (struct RegisteredHostContext));
- rhc->reg_host = GST_host_list[peer2_host_id];
+ rhc->reg_host = host;
rhc->host = GST_host_list[slave->host_id];
GNUNET_assert (NULL != rhc->reg_host);
GNUNET_assert (NULL != rhc->host);
p2 = ntohl (msg->peer2);
op_id = GNUNET_ntohll (msg->operation_id);
peer2_host_id = ntohl (msg->peer2_host_id);
- GNUNET_assert (! INVALID_PEER_ID (p1));
- GNUNET_assert (! INVALID_HOST_ID (peer2_host_id));
+ GNUNET_assert (VALID_PEER_ID (p1));
+ GNUNET_assert (VALID_HOST_ID (peer2_host_id));
peer = GST_peer_list[p1];
GNUNET_assert (GNUNET_YES == peer->is_remote);
LOG_DEBUG ("0x%llx: Forwarding overlay connect\n", op_id);
route_to_peer1_host = GST_find_dest_route
(peer->details.remote.remote_host_id);
GNUNET_assert (NULL != route_to_peer1_host);
- if ((NULL != route_to_peer2_host) &&
+ if ((NULL != route_to_peer2_host) &&
(route_to_peer1_host->dest == route_to_peer2_host->dest))
goto forward;
/* Peer2 is either with us OR peer1 and peer2 can be reached through
different subtrees OR peer2 is on a subtree unknown to us */
- if (NULL != (rhc = register_p2_host (peer->details.remote.slave,
- peer2_host_id)))
+ if (NULL != (rhc = register_host (peer->details.remote.slave,
+ GST_host_list[peer2_host_id])))
{
- LOG_DEBUG ("Forwarding with FOCC for connecting peers %u and %u\n", p1, p2);
+ LOG_DEBUG ("Queueing forwarding FOCC for connecting peers %u and %u\n", p1, p2);
focc = GNUNET_malloc (sizeof (struct ForwardedOverlayConnectContext));
focc->peer1 = p1;
focc->peer2 = p2;
cmsg.header.size =
htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage));
cmsg.header.type =
- htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION);
+ htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION);
cmsg.peer_id = htonl (occ->other_peer_id);
cmsg.operation_id = GNUNET_htonll (occ->op_id);
rp2c->opc =
msg = (const struct GNUNET_TESTBED_OverlayConnectMessage *) message;
p1 = ntohl (msg->peer1);
p2 = ntohl (msg->peer2);
- if INVALID_PEER_ID (p1)
+ if (!VALID_PEER_ID (p1))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
peer2_host_id = ntohl (msg->peer2_host_id);
if (GNUNET_YES == peer->is_remote)
{
- if INVALID_HOST_ID (peer2_host_id)
+ if (!VALID_HOST_ID (peer2_host_id))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return;
}
forward_overlay_connect (msg, client);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
p2n = NULL;
- occ = GNUNET_malloc (sizeof (struct OverlayConnectContext));
+ occ = GNUNET_malloc (sizeof (struct OverlayConnectContext));
occ->type = OCC_TYPE_LOCAL;
- if INVALID_PEER_ID (p2) /* May be peer2 is on a another controller */
- {
+ if (!VALID_PEER_ID (p2)) /* May be peer2 is on a another controller */
+ {
if (NULL == (p2n = GST_get_neighbour (peer2_host_id)))
{
- if (INVALID_HOST_ID (peer2_host_id))
+ if (!VALID_HOST_ID (peer2_host_id))
{
GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_WARNING,
occ->client = client;
occ->other_peer_id = p2;
GST_peer_list[p1]->reference_cnt++;
- occ->peer = GST_peer_list[p1];
+ occ->peer = GST_peer_list[p1];
occ->op_id = operation_id;
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == occ->timeout_task);
occ->timeout_task =
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while acquiring connection to peer %u's "
"host: %u\n", occ->op_id, occ->other_peer_id, peer2_host_id);
- occ->p2ctx.remote.ncn =
+ occ->p2ctx.remote.ncn =
GST_neighbour_get_connection (p2n, &p2_controller_connect_cb, occ);
break;
case OCC_TYPE_REMOTE_SLAVE:
const struct GNUNET_TESTBED_RemoteOverlayConnectMessage *msg;
struct RemoteOverlayConnectCtx *rocc;
struct Peer *peer;
+ struct GNUNET_PeerIdentity pid;
+ static char pid_str[16];
uint32_t peer_id;
uint16_t msize;
uint16_t hsize;
GNUNET_CONTAINER_DLL_insert_tail (roccq_head, roccq_tail, rocc);
memcpy (&rocc->a_id, &msg->peer_identity,
sizeof (struct GNUNET_PeerIdentity));
- LOG_DEBUG ("Received request for overlay connection with op_id: 0x%llx "
- "from local peer %u to peer %4s with hello size: %u\n",
- rocc->op_id, peer_id, GNUNET_i2s (&rocc->a_id), hsize);
+ GNUNET_TESTING_peer_get_identity (peer->details.local.peer, &pid);
+ (void) strncpy (pid_str, GNUNET_i2s (&pid), 15);
+ LOG_DEBUG ("0x%llx: Remote overlay connect %4s to peer %4s with hello size: %u\n",
+ rocc->op_id, pid_str, GNUNET_i2s (&rocc->a_id), hsize);
rocc->peer = peer;
rocc->peer->reference_cnt++;
rocc->hello = GNUNET_malloc (hsize);
memcpy (rocc->hello, msg->hello, hsize);
+ rocc->tcc.op_id = rocc->op_id;
rocc->tcc.cgh_th =
GST_cache_get_handle_transport (peer_id, rocc->peer->details.local.cfg,
&rocc_cache_get_handle_transport_cb, rocc,
projects / oweals / gnunet.git / blobdiff