/**
* Message exchanged between DV services (via core), requesting a
- * message to be routed.
+ * message to be routed.
*/
struct RouteMessage
{
* with other applications.
*/
struct GNUNET_HashCode real_session_id;
-
+
/**
* Head of linked list of messages to send to this peer.
*/
* Keys are peer identities, values are 'struct Target' entries.
* Note that the distances in the targets are from the point-of-view
* of the peer, not from us!
- */
- struct GNUNET_CONTAINER_MultiHashMap *neighbor_table;
+ */
+ struct GNUNET_CONTAINER_MultiPeerMap *neighbor_table;
/**
* Updated routing table of the neighbor, under construction,
* Keys are peer identities, values are 'struct Target' entries.
* Note that the distances in the targets are from the point-of-view
* of the peer, not from us!
- */
- struct GNUNET_CONTAINER_MultiHashMap *neighbor_table_consensus;
+ */
+ struct GNUNET_CONTAINER_MultiPeerMap *neighbor_table_consensus;
/**
* Our current (exposed) routing table as a set.
/**
- * Hashmap of all of our neighbors; processing these usually requires
- * first checking to see if the peer is core-connected and if the
+ * Peermap of all of our neighbors; processing these usually requires
+ * first checking to see if the peer is core-connected and if the
* distance is 1, in which case they are direct neighbors.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *direct_neighbors;
+static struct GNUNET_CONTAINER_MultiPeerMap *direct_neighbors;
/**
- * Hashmap with all routes that we currently support; contains
+ * Hashmap with all routes that we currently support; contains
* routing information for all peers from distance 2
* up to distance DEFAULT_FISHEYE_DEPTH.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *all_routes;
+static struct GNUNET_CONTAINER_MultiPeerMap *all_routes;
/**
* Array of consensus sets we expose to the outside world. Sets
* Handle to ATS service.
*/
static struct GNUNET_ATS_PerformanceHandle *ats;
-
+
/**
* Start creating a new DV set union by initiating the connection.
* @param cls the 'struct DirectNeighbor' of the peer we're building
* a routing consensus with
* @param tc scheduler context
- */
+ */
static void
initiate_set_union (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc);
* necessary to specify the set we want to do the operation with,
* whith sometimes can be derived from the context message.
* Also necessary to specify the timeout.
- */
+ */
static void
listen_set_union (void *cls,
const struct GNUNET_PeerIdentity *other_peer,
* @param distance distance to the original sender of the message
*/
static void
-send_data_to_plugin (const struct GNUNET_MessageHeader *message,
+send_data_to_plugin (const struct GNUNET_MessageHeader *message,
const struct GNUNET_PeerIdentity *origin,
uint32_t distance)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Delivering message from peer `%s'\n",
GNUNET_i2s (origin));
- size = sizeof (struct GNUNET_DV_ReceivedMessage) +
+ size = sizeof (struct GNUNET_DV_ReceivedMessage) +
ntohs (message->size);
if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
- {
+ {
GNUNET_break (0); /* too big */
return;
}
received_msg->distance = htonl (distance);
received_msg->sender = *origin;
memcpy (&received_msg[1], message, ntohs (message->size));
- GNUNET_SERVER_notification_context_broadcast (nc,
+ GNUNET_SERVER_notification_context_broadcast (nc,
&received_msg->header,
GNUNET_YES);
GNUNET_free (received_msg);
static void
send_control_to_plugin (const struct GNUNET_MessageHeader *message)
{
- GNUNET_SERVER_notification_context_broadcast (nc,
+ GNUNET_SERVER_notification_context_broadcast (nc,
message,
GNUNET_NO);
}
* @param nack GNUNET_NO to send ACK, GNUNET_YES to send NACK
*/
static void
-send_ack_to_plugin (const struct GNUNET_PeerIdentity *target,
+send_ack_to_plugin (const struct GNUNET_PeerIdentity *target,
uint32_t uid,
int nack)
{
"Delivering ACK for message to peer `%s'\n",
GNUNET_i2s (target));
ack_msg.header.size = htons (sizeof (ack_msg));
- ack_msg.header.type = htons ((GNUNET_YES == nack)
+ ack_msg.header.type = htons ((GNUNET_YES == nack)
? GNUNET_MESSAGE_TYPE_DV_SEND_NACK
: GNUNET_MESSAGE_TYPE_DV_SEND_ACK);
ack_msg.uid = htonl (uid);
* @param distance new distance to the peer
*/
static void
-send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer,
+send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer,
uint32_t distance)
{
struct GNUNET_DV_DistanceUpdateMessage du_msg;
* @param distance distance to the target
*/
static void
-send_connect_to_plugin (const struct GNUNET_PeerIdentity *target,
+send_connect_to_plugin (const struct GNUNET_PeerIdentity *target,
uint32_t distance)
{
struct GNUNET_DV_ConnectMessage cm;
dn->pm_tail,
pending);
memcpy (&cbuf[off], pending->msg, msize);
- if (0 != pending->uid)
+ if (0 != pending->uid)
send_ack_to_plugin (&pending->ultimate_target,
pending->uid,
GNUNET_NO);
0 /* priority */,
GNUNET_TIME_UNIT_FOREVER_REL,
&dn->peer,
- msize,
+ msize,
&core_transmit_notify, dn);
return off;
}
0 /* priority */,
GNUNET_TIME_UNIT_FOREVER_REL,
&target->peer,
- msize,
+ msize,
&core_transmit_notify, target);
}
release_route (route);
i = get_consensus_slot (new_distance);
route->set_offset = i;
- consensi[new_distance].targets[i] = route;
+ consensi[new_distance].targets[i] = route;
route->target.distance = htonl (new_distance);
}
if (DEFAULT_FISHEYE_DEPTH - 1 == neighbor->consensus_insertion_distance)
{
/* we have added all elements to the set, run the operation */
- GNUNET_SET_conclude (neighbor->set_op,
- neighbor->my_set);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished building my SET, committing\n");
+ GNUNET_SET_commit (neighbor->set_op,
+ neighbor->my_set);
GNUNET_SET_destroy (neighbor->my_set);
neighbor->my_set = NULL;
return;
}
element.size = sizeof (struct Target);
+ element.type = htons (0); /* do we need this? */
element.data = &consensi[neighbor->consensus_insertion_distance].targets[neighbor->consensus_insertion_offset++]->target;
/* skip over NULL entries */
while ( (DEFAULT_FISHEYE_DEPTH - 1 > neighbor->consensus_insertion_distance) &&
(consensi[neighbor->consensus_insertion_distance].array_length < neighbor->consensus_insertion_offset) &&
(NULL == consensi[neighbor->consensus_insertion_distance].targets[neighbor->consensus_insertion_offset]) )
- neighbor->consensus_insertion_offset++;
+ neighbor->consensus_insertion_offset++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding element to SET\n");
GNUNET_SET_add_element (neighbor->my_set,
&element,
&build_set, neighbor);
-
+
}
handle_direct_connect (struct DirectNeighbor *neighbor)
{
struct Route *route;
+ struct GNUNET_HashCode h1;
+ struct GNUNET_HashCode h2;
struct GNUNET_HashCode session_id;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Direct connection to %s established, routing table exchange begins.\n",
+ GNUNET_i2s (&neighbor->peer));
GNUNET_STATISTICS_update (stats,
"# peers connected (1-hop)",
1, GNUNET_NO);
- route = GNUNET_CONTAINER_multihashmap_get (all_routes,
- &neighbor->peer.hashPubKey);
- if (NULL != route)
+ route = GNUNET_CONTAINER_multipeermap_get (all_routes,
+ &neighbor->peer);
+ if (NULL != route)
{
send_disconnect_to_plugin (&neighbor->peer);
release_route (route);
GNUNET_free (route);
}
/* construct session ID seed as XOR of both peer's identities */
- GNUNET_CRYPTO_hash_xor (&my_identity.hashPubKey,
- &neighbor->peer.hashPubKey,
+ GNUNET_CRYPTO_hash (&my_identity, sizeof (my_identity), &h1);
+ GNUNET_CRYPTO_hash (&neighbor->peer, sizeof (struct GNUNET_PeerIdentity), &h2);
+ GNUNET_CRYPTO_hash_xor (&h1,
+ &h2,
&session_id);
/* make sure session ID is unique across applications by salting it with 'DV' */
GNUNET_CRYPTO_hkdf (&neighbor->real_session_id, sizeof (struct GNUNET_HashCode),
"DV-SALT", 2,
&session_id, sizeof (session_id),
NULL, 0);
- if (1 == GNUNET_CRYPTO_hash_cmp (&neighbor->peer.hashPubKey,
- &my_identity.hashPubKey))
+ if (0 < memcmp (&neighbor->peer,
+ &my_identity,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
neighbor->initiate_task = GNUNET_SCHEDULER_add_now (&initiate_set_union,
neighbor);
+ }
else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting SET listen operation\n");
neighbor->listen_handle = GNUNET_SET_listen (cfg,
GNUNET_SET_OPERATION_UNION,
&neighbor->real_session_id,
&listen_set_union,
neighbor);
+ }
}
* @param peer peer identity this notification is about
*/
static void
-handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
+handle_core_connect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
struct DirectNeighbor *neighbor;
-
+
/* Check for connect to self message */
if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
/* check if entry exists */
- neighbor = GNUNET_CONTAINER_multihashmap_get (direct_neighbors,
- &peer->hashPubKey);
+ neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
+ peer);
if (NULL != neighbor)
{
GNUNET_break (GNUNET_YES != neighbor->connected);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core connected to %s (distance unknown)\n",
GNUNET_i2s (peer));
- neighbor = GNUNET_malloc (sizeof (struct DirectNeighbor));
+ neighbor = GNUNET_new (struct DirectNeighbor);
neighbor->peer = *peer;
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_put (direct_neighbors,
- &peer->hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (direct_neighbors,
+ peer,
neighbor,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
neighbor->connected = GNUNET_YES;
*/
static int
free_targets (void *cls,
- const struct GNUNET_HashCode *key,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
GNUNET_free (value);
/**
- * Multihashmap iterator for checking if a given route is
+ * Multipeerhmap iterator for checking if a given route is
* (now) useful to this peer.
*
* @param cls the direct neighbor for the given route
* @return GNUNET_YES to continue iteration, GNUNET_NO to stop
*/
static int
-check_possible_route (void *cls, const struct GNUNET_HashCode * key, void *value)
+check_possible_route (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct DirectNeighbor *neighbor = cls;
struct Target *target = value;
struct Route *route;
-
- route = GNUNET_CONTAINER_multihashmap_get (all_routes,
- key);
+
+ route = GNUNET_CONTAINER_multipeermap_get (all_routes,
+ key);
if (NULL != route)
{
if (ntohl (route->target.distance) > ntohl (target->distance) + 1)
}
return GNUNET_YES; /* got a route to this target already */
}
- route = GNUNET_malloc (sizeof (struct Route));
+ route = GNUNET_new (struct Route);
route->next_hop = neighbor;
route->target.distance = htonl (ntohl (target->distance) + 1);
route->target.peer = target->peer;
allocate_route (route, ntohl (route->target.distance));
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_put (all_routes,
- &route->target.peer.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (all_routes,
+ &route->target.peer,
route,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
send_connect_to_plugin (&route->target.peer, ntohl (target->distance));
/**
- * Multihashmap iterator for finding routes that were previously
+ * Multipeermap iterator for finding routes that were previously
* "hidden" due to a better route (called after a disconnect event).
*
* @param cls NULL
* @return GNUNET_YES to continue iteration
*/
static int
-refresh_routes (void *cls, const struct GNUNET_HashCode * key, void *value)
+refresh_routes (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct DirectNeighbor *neighbor = value;
if ( (GNUNET_YES != neighbor->connected) ||
(DIRECT_NEIGHBOR_COST != neighbor->distance) )
- return GNUNET_YES;
+ return GNUNET_YES;
if (NULL != neighbor->neighbor_table)
- GNUNET_CONTAINER_multihashmap_iterate (neighbor->neighbor_table,
+ GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table,
&check_possible_route,
neighbor);
return GNUNET_YES;
/**
- * Multihashmap iterator for freeing routes that go via a particular
+ * Multipeermap iterator for freeing routes that go via a particular
* neighbor that disconnected and is thus no longer available.
*
* @param cls the direct neighbor that is now unavailable
* @return GNUNET_YES to continue iteration, GNUNET_NO to stop
*/
static int
-cull_routes (void *cls, const struct GNUNET_HashCode * key, void *value)
+cull_routes (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct DirectNeighbor *neighbor = cls;
struct Route *route = value;
if (route->next_hop != neighbor)
return GNUNET_YES; /* not affected */
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (all_routes, key, value));
+ GNUNET_CONTAINER_multipeermap_remove (all_routes, key, value));
release_route (route);
send_disconnect_to_plugin (&route->target.peer);
GNUNET_free (route);
* disrupted. Remove all routes via that peer and
* stop the consensus with it.
*
- * @param neighbor peer that was disconnected (or at least is no
+ * @param neighbor peer that was disconnected (or at least is no
* longer at distance 1)
*/
static void
handle_direct_disconnect (struct DirectNeighbor *neighbor)
{
- GNUNET_CONTAINER_multihashmap_iterate (all_routes,
+ GNUNET_CONTAINER_multipeermap_iterate (all_routes,
&cull_routes,
neighbor);
if (NULL != neighbor->cth)
}
if (NULL != neighbor->neighbor_table_consensus)
{
- GNUNET_CONTAINER_multihashmap_iterate (neighbor->neighbor_table_consensus,
+ GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus,
&free_targets,
NULL);
- GNUNET_CONTAINER_multihashmap_destroy (neighbor->neighbor_table_consensus);
+ GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table_consensus);
neighbor->neighbor_table_consensus = NULL;
}
if (NULL != neighbor->neighbor_table)
{
- GNUNET_CONTAINER_multihashmap_iterate (neighbor->neighbor_table,
+ GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table,
&free_targets,
NULL);
- GNUNET_CONTAINER_multihashmap_destroy (neighbor->neighbor_table);
+ GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table);
neighbor->neighbor_table = NULL;
}
if (NULL != neighbor->set_op)
int active,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *ats,
+ const struct GNUNET_ATS_Information *ats,
uint32_t ats_count)
{
struct DirectNeighbor *neighbor;
if (GNUNET_NO == active)
return;
- distance = get_atsi_distance (ats, ats_count);
+ distance = get_atsi_distance (ats, ats_count);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"ATS says distance to %s is %u\n",
GNUNET_i2s (&address->peer),
(unsigned int) distance);
/* check if entry exists */
- neighbor = GNUNET_CONTAINER_multihashmap_get (direct_neighbors,
- &address->peer.hashPubKey);
+ neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
+ &address->peer);
if (NULL != neighbor)
- {
+ {
if ( (DIRECT_NEIGHBOR_COST == neighbor->distance) &&
(DIRECT_NEIGHBOR_COST == distance) )
return; /* no change */
- if (DIRECT_NEIGHBOR_COST == neighbor->distance)
+ if (DIRECT_NEIGHBOR_COST == neighbor->distance)
{
neighbor->distance = distance;
GNUNET_STATISTICS_update (stats,
"# peers connected (1-hop)",
- -1, GNUNET_NO);
+ -1, GNUNET_NO);
handle_direct_disconnect (neighbor);
- GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors,
+ GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
&refresh_routes,
NULL);
return;
}
neighbor->distance = distance;
if (DIRECT_NEIGHBOR_COST != neighbor->distance)
- return;
+ return;
if (GNUNET_YES != neighbor->connected)
return;
handle_direct_connect (neighbor);
return;
}
- neighbor = GNUNET_malloc (sizeof (struct DirectNeighbor));
+ neighbor = GNUNET_new (struct DirectNeighbor);
neighbor->peer = address->peer;
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_put (direct_neighbors,
- &address->peer.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (direct_neighbors,
+ &address->peer,
neighbor,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
neighbor->connected = GNUNET_NO; /* not yet */
- neighbor->distance = distance;
+ neighbor->distance = distance;
}
*/
static int
check_target_removed (void *cls,
- const struct GNUNET_HashCode *key,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
struct DirectNeighbor *neighbor = cls;
struct Target *new_target;
struct Route *current_route;
- new_target = GNUNET_CONTAINER_multihashmap_get (neighbor->neighbor_table_consensus,
+ new_target = GNUNET_CONTAINER_multipeermap_get (neighbor->neighbor_table_consensus,
key);
if (NULL == new_target)
{
/* target was revoked, check if it was used */
- current_route = GNUNET_CONTAINER_multihashmap_get (all_routes,
+ current_route = GNUNET_CONTAINER_multipeermap_get (all_routes,
key);
if ( (NULL == current_route) ||
(current_route->next_hop != neighbor) )
"Lost route to %s\n",
GNUNET_i2s (¤t_route->target.peer));
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (all_routes, key, current_route));
+ GNUNET_CONTAINER_multipeermap_remove (all_routes, key, current_route));
send_disconnect_to_plugin (¤t_route->target.peer);
GNUNET_free (current_route);
neighbor->target_removed = GNUNET_YES;
*/
static int
check_target_added (void *cls,
- const struct GNUNET_HashCode *key,
- void *value)
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct DirectNeighbor *neighbor = cls;
struct Target *target = value;
struct Route *current_route;
/* target was revoked, check if it was used */
- current_route = GNUNET_CONTAINER_multihashmap_get (all_routes,
+ current_route = GNUNET_CONTAINER_multipeermap_get (all_routes,
key);
if (NULL != current_route)
{
"Discovered new route to %s using %u hops\n",
GNUNET_i2s (&target->peer),
(unsigned int) (ntohl (target->distance) + 1));
- current_route = GNUNET_malloc (sizeof (struct Route));
+ current_route = GNUNET_new (struct Route);
current_route->next_hop = neighbor;
current_route->target.peer = target->peer;
current_route->target.distance = htonl (ntohl (target->distance) + 1);
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_put (all_routes,
- ¤t_route->target.peer.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (all_routes,
+ ¤t_route->target.peer,
current_route,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
send_connect_to_plugin (¤t_route->target.peer,
struct DirectNeighbor *neighbor = cls;
struct Target *target;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got SET union result: %d\n",
+ status);
switch (status)
{
case GNUNET_SET_STATUS_OK:
GNUNET_break_op (0);
return;
}
- target = GNUNET_malloc (sizeof (struct Target));
+ target = GNUNET_new (struct Target);
memcpy (target, element->data, sizeof (struct Target));
if (GNUNET_YES !=
- GNUNET_CONTAINER_multihashmap_put (neighbor->neighbor_table_consensus,
- &target->peer.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (neighbor->neighbor_table_consensus,
+ &target->peer,
target,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
{
case GNUNET_SET_STATUS_FAILURE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to establish DV union, will try again later\n");
- GNUNET_SET_operation_cancel (neighbor->set_op); /* FIXME: needed? */
neighbor->set_op = NULL;
if (NULL != neighbor->neighbor_table_consensus)
{
- GNUNET_CONTAINER_multihashmap_iterate (neighbor->neighbor_table_consensus,
+ GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus,
&free_targets,
NULL);
- GNUNET_CONTAINER_multihashmap_destroy (neighbor->neighbor_table_consensus);
+ GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table_consensus);
neighbor->neighbor_table_consensus = NULL;
}
- if (1 == GNUNET_CRYPTO_hash_cmp (&neighbor->peer.hashPubKey,
- &my_identity.hashPubKey))
+ if (0 < memcmp (&neighbor->peer,
+ &my_identity,
+ sizeof (struct GNUNET_PeerIdentity)))
neighbor->initiate_task = GNUNET_SCHEDULER_add_delayed (GNUNET_DV_CONSENSUS_FREQUENCY,
&initiate_set_union,
neighbor);
case GNUNET_SET_STATUS_HALF_DONE:
/* we got all of our updates; integrate routing table! */
neighbor->target_removed = GNUNET_NO;
- GNUNET_CONTAINER_multihashmap_iterate (neighbor->neighbor_table,
+ GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table,
&check_target_removed,
neighbor);
if (GNUNET_YES == neighbor->target_removed)
{
/* check if we got an alternative for the removed routes */
- GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors,
+ GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
&refresh_routes,
- NULL);
+ NULL);
}
/* add targets that appeared (and check for improved routes) */
- GNUNET_CONTAINER_multihashmap_iterate (neighbor->neighbor_table_consensus,
+ GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus,
&check_target_added,
neighbor);
if (NULL != neighbor->neighbor_table)
{
- GNUNET_CONTAINER_multihashmap_iterate (neighbor->neighbor_table,
+ GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table,
&free_targets,
NULL);
- GNUNET_CONTAINER_multihashmap_destroy (neighbor->neighbor_table);
+ GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table);
neighbor->neighbor_table = NULL;
}
neighbor->neighbor_table = neighbor->neighbor_table_consensus;
break;
case GNUNET_SET_STATUS_DONE:
/* operation done, schedule next run! */
- GNUNET_SET_operation_cancel (neighbor->set_op); /* FIXME: needed? */
neighbor->set_op = NULL;
- if (1 == GNUNET_CRYPTO_hash_cmp (&neighbor->peer.hashPubKey,
- &my_identity.hashPubKey))
+ if (0 < memcmp (&neighbor->peer,
+ &my_identity,
+ sizeof (struct GNUNET_PeerIdentity)))
neighbor->initiate_task = GNUNET_SCHEDULER_add_delayed (GNUNET_DV_CONSENSUS_FREQUENCY,
&initiate_set_union,
neighbor);
* necessary to specify the set we want to do the operation with,
* whith sometimes can be derived from the context message.
* Also necessary to specify the timeout.
- */
+ */
static void
listen_set_union (void *cls,
const struct GNUNET_PeerIdentity *other_peer,
{
struct DirectNeighbor *neighbor = cls;
+ if (NULL == request)
+ return; /* why??? */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting to create consensus with %s!\n",
GNUNET_i2s (&neighbor->peer));
* @param cls the 'struct DirectNeighbor' of the peer we're building
* a routing consensus with
* @param tc scheduler context
- */
+ */
static void
initiate_set_union (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct DirectNeighbor *neighbor = cls;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Initiating SET union\n");
neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK;
neighbor->my_set = GNUNET_SET_create (cfg,
GNUNET_SET_OPERATION_UNION);
- neighbor->set_op = GNUNET_SET_evaluate (&neighbor->peer,
- &neighbor->real_session_id,
- NULL,
- 0 /* FIXME: salt */,
- GNUNET_SET_RESULT_ADDED,
- &handle_set_union_result,
- neighbor);
+ neighbor->set_op = GNUNET_SET_prepare (&neighbor->peer,
+ &neighbor->real_session_id,
+ NULL,
+ 0 /* FIXME: salt */,
+ GNUNET_SET_RESULT_ADDED,
+ &handle_set_union_result,
+ neighbor);
build_set (neighbor);
}
const struct GNUNET_MessageHeader *payload;
struct Route *route;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Handling DV message\n");
if (ntohs (message->size) < sizeof (struct RouteMessage) + sizeof (struct GNUNET_MessageHeader))
{
GNUNET_break_op (0);
sizeof (struct GNUNET_PeerIdentity)))
{
/* message is for me, check reverse route! */
- route = GNUNET_CONTAINER_multihashmap_get (all_routes,
- &rm->sender.hashPubKey);
+ route = GNUNET_CONTAINER_multipeermap_get (all_routes,
+ &rm->sender);
if (NULL == route)
{
/* don't have reverse route, drop */
ntohl (route->target.distance));
return GNUNET_OK;
}
- route = GNUNET_CONTAINER_multihashmap_get (all_routes,
- &rm->target.hashPubKey);
+ route = GNUNET_CONTAINER_multipeermap_get (all_routes,
+ &rm->target);
if (NULL == route)
{
GNUNET_STATISTICS_update (stats,
1, GNUNET_NO);
return GNUNET_OK;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Forwarding message to %s\n",
+ GNUNET_i2s (&rm->target));
forward_payload (route->next_hop,
ntohl (route->target.distance),
0,
&rm->target,
&rm->sender,
payload);
- return GNUNET_OK;
+ return GNUNET_OK;
}
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- route = GNUNET_CONTAINER_multihashmap_get (all_routes,
- &msg->target.hashPubKey);
+ route = GNUNET_CONTAINER_multipeermap_get (all_routes,
+ &msg->target);
if (NULL == route)
{
/* got disconnected */
neighbor->pm_queue_size--;
GNUNET_CONTAINER_DLL_remove (neighbor->pm_head,
neighbor->pm_tail,
- pending);
+ pending);
GNUNET_free (pending);
}
handle_direct_disconnect (neighbor);
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (direct_neighbors,
- &neighbor->peer.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_remove (direct_neighbors,
+ &neighbor->peer,
neighbor));
GNUNET_free (neighbor);
}
if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
neighbor =
- GNUNET_CONTAINER_multihashmap_get (direct_neighbors, &peer->hashPubKey);
+ GNUNET_CONTAINER_multipeermap_get (direct_neighbors, peer);
if (NULL == neighbor)
{
GNUNET_break (0);
{
GNUNET_STATISTICS_update (stats,
"# peers connected (1-hop)",
- -1, GNUNET_NO);
+ -1, GNUNET_NO);
}
cleanup_neighbor (neighbor);
- GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors,
+ GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
&refresh_routes,
NULL);
}
/**
- * Multihashmap iterator for freeing routes. Should never be called.
+ * Multipeermap iterator for freeing routes. Should never be called.
*
* @param cls NULL
* @param key key value stored under
* @return GNUNET_YES to continue iteration, GNUNET_NO to stop
*/
static int
-free_route (void *cls, const struct GNUNET_HashCode * key, void *value)
+free_route (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
{
struct Route *route = value;
GNUNET_break (0);
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (all_routes, key, value));
+ GNUNET_CONTAINER_multipeermap_remove (all_routes, key, value));
release_route (route);
send_disconnect_to_plugin (&route->target.peer);
GNUNET_free (route);
/**
- * Multihashmap iterator for freeing direct neighbors. Should never be called.
+ * Multipeermap iterator for freeing direct neighbors. Should never be called.
*
* @param cls NULL
* @param key key value stored under
* @return GNUNET_YES to continue iteration, GNUNET_NO to stop
*/
static int
-free_direct_neighbors (void *cls, const struct GNUNET_HashCode * key, void *value)
+free_direct_neighbors (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
{
struct DirectNeighbor *neighbor = value;
core_api = NULL;
GNUNET_ATS_performance_done (ats);
ats = NULL;
- GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors,
+ GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
&free_direct_neighbors, NULL);
- GNUNET_CONTAINER_multihashmap_iterate (all_routes,
+ GNUNET_CONTAINER_multipeermap_iterate (all_routes,
&free_route, NULL);
- GNUNET_CONTAINER_multihashmap_destroy (direct_neighbors);
- GNUNET_CONTAINER_multihashmap_destroy (all_routes);
+ GNUNET_CONTAINER_multipeermap_destroy (direct_neighbors);
+ GNUNET_CONTAINER_multipeermap_destroy (all_routes);
GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
stats = NULL;
GNUNET_SERVER_notification_context_destroy (nc);
*/
static int
add_route (void *cls,
- const struct GNUNET_HashCode *key,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
struct GNUNET_SERVER_Client *client = cls;
struct Route *route = value;
struct GNUNET_DV_ConnectMessage cm;
-
+
cm.header.size = htons (sizeof (cm));
cm.header.type = htons (GNUNET_MESSAGE_TYPE_DV_CONNECT);
cm.distance = htonl (route->target.distance);
cm.peer = route->target.peer;
- GNUNET_SERVER_notification_context_unicast (nc,
+ GNUNET_SERVER_notification_context_unicast (nc,
client,
&cm.header,
GNUNET_NO);
handle_start (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- GNUNET_SERVER_notification_context_add (nc, client);
+ GNUNET_SERVER_notification_context_add (nc, client);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
- GNUNET_CONTAINER_multihashmap_iterate (all_routes,
+ GNUNET_CONTAINER_multipeermap_iterate (all_routes,
&add_route,
client);
}
* Called on core init.
*
* @param cls unused
- * @param server legacy
* @param identity this peer's identity
*/
static void
-core_init (void *cls, struct GNUNET_CORE_Handle *server,
+core_init (void *cls,
const struct GNUNET_PeerIdentity *identity)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
{NULL, 0, 0}
};
static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = {
- {&handle_start, NULL,
- GNUNET_MESSAGE_TYPE_DV_START,
+ {&handle_start, NULL,
+ GNUNET_MESSAGE_TYPE_DV_START,
sizeof (struct GNUNET_MessageHeader) },
- { &handle_dv_send_message, NULL,
- GNUNET_MESSAGE_TYPE_DV_SEND,
+ { &handle_dv_send_message, NULL,
+ GNUNET_MESSAGE_TYPE_DV_SEND,
0},
{NULL, NULL, 0, 0}
};
cfg = c;
- direct_neighbors = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
- all_routes = GNUNET_CONTAINER_multihashmap_create (65536, GNUNET_NO);
+ direct_neighbors = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
+ all_routes = GNUNET_CONTAINER_multipeermap_create (65536, GNUNET_NO);
core_api = GNUNET_CORE_connect (cfg, NULL,
- &core_init,
+ &core_init,
&handle_core_connect,
&handle_core_disconnect,
- NULL, GNUNET_NO,
- NULL, GNUNET_NO,
+ NULL, GNUNET_NO,
+ NULL, GNUNET_NO,
core_handlers);
if (NULL == core_api)
projects / oweals / gnunet.git / blobdiff