/**
* Expected (remaining) distance. Must be always smaller than
- * DEFAULT_FISHEYE_DEPTH, should be zero at the target. Must
+ * #DEFAULT_FISHEYE_DEPTH, should be zero at the target. Must
* be decremented by one at each hop. Peers must not forward
* these messages further once the counter has reached zero.
*/
* NULL if we are not currently building it.
* 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!
+ * of the other peer, not from us!
*/
struct GNUNET_CONTAINER_MultiPeerMap *neighbor_table_consensus;
*/
uint32_t distance;
+ /**
+ * The network this peer is in
+ */
+ uint32_t network;
+
/**
* Is this neighbor connected at the core level?
*/
struct Route **targets;
/**
- * Size of the 'targets' array.
+ * Size of the @e targets array.
*/
unsigned int array_length;
* Array of consensus sets we expose to the outside world. Sets
* are structured by the distance to the target.
*/
-static struct ConsensusSet consensi[DEFAULT_FISHEYE_DEPTH - 1];
+static struct ConsensusSet consensi[DEFAULT_FISHEYE_DEPTH];
/**
* Handle to the core service api.
*/
static struct GNUNET_ATS_PerformanceHandle *ats;
+/**
+ * Task scheduled to refresh routes based on direct neighbours.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier rr_task;
+
+/**
+ * #GNUNET_YES if we are shutting down.
+ */
+static int in_shutdown;
/**
* Start creating a new DV set union by initiating the connection.
*
* @param target peer that received the message
* @param uid plugin-chosen UID for the message
- * @param nack GNUNET_NO to send ACK, GNUNET_YES to send NACK
+ * @param nack #GNUNET_NO to send ACK, #GNUNET_YES to send NACK
*/
static void
send_ack_to_plugin (const struct GNUNET_PeerIdentity *target,
*
* @param target peer that connected
* @param distance distance to the target
+ * @param network the network the next hop is located in
*/
static void
send_connect_to_plugin (const struct GNUNET_PeerIdentity *target,
- uint32_t distance)
+ uint32_t distance, uint32_t network)
{
struct GNUNET_DV_ConnectMessage cm;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Delivering CONNECT about peer `%s'\n",
- GNUNET_i2s (target));
+ "Delivering CONNECT about peer %s with distance %u\n",
+ GNUNET_i2s (target), distance);
cm.header.size = htons (sizeof (cm));
cm.header.type = htons (GNUNET_MESSAGE_TYPE_DV_CONNECT);
cm.distance = htonl (distance);
+ cm.network = htonl (network);
cm.peer = *target;
send_control_to_plugin (&cm.header);
}
dn->cth = NULL;
if (NULL == buf)
{
- /* peer disconnected */
+ /* client disconnected */
return 0;
}
off = 0;
- pending = dn->pm_head;
- off = 0;
while ( (NULL != (pending = dn->pm_head)) &&
(size >= off + (msize = ntohs (pending->msg->size))))
{
GNUNET_free (pending);
off += msize;
}
+ GNUNET_assert (NULL != core_api);
if (NULL != dn->pm_head)
dn->cth =
GNUNET_CORE_notify_transmit_ready (core_api,
0 /* priority */,
GNUNET_TIME_UNIT_FOREVER_REL,
&dn->peer,
- msize,
+ msize,
&core_transmit_notify, dn);
return off;
}
* Forward the given payload to the given target.
*
* @param target where to send the message
+ * @param distance expected (remaining) distance to the target
* @param uid unique ID for the message
* @param ultimate_target ultimate recipient for the message
- * @param distance expected (remaining) distance to the target
* @param sender original sender of the message
* @param payload payload of the message
*/
size_t msize;
if ( (target->pm_queue_size >= MAX_QUEUE_SIZE) &&
+ (0 == uid) &&
(0 != memcmp (sender,
&my_identity,
sizeof (struct GNUNET_PeerIdentity))) )
{
- GNUNET_break (0 == uid);
+ /* not _our_ client and queue is full, drop */
+ GNUNET_STATISTICS_update (stats,
+ "# messages dropped",
+ 1, GNUNET_NO);
return;
}
msize = sizeof (struct RouteMessage) + ntohs (payload->size);
target->pm_tail,
pm);
target->pm_queue_size++;
+ GNUNET_assert (NULL != core_api);
if (NULL == target->cth)
target->cth = GNUNET_CORE_notify_transmit_ready (core_api,
GNUNET_YES /* cork */,
0 /* priority */,
GNUNET_TIME_UNIT_FOREVER_REL,
&target->peer,
- msize,
+ msize,
&core_transmit_notify, target);
}
struct ConsensusSet *cs;
unsigned int i;
+ GNUNET_assert (distance < DEFAULT_FISHEYE_DEPTH);
cs = &consensi[distance];
i = 0;
while ( (i < cs->array_length) &&
{
unsigned int i;
+ if (distance >= DEFAULT_FISHEYE_DEPTH)
+ {
+ route->target.distance = htonl (distance);
+ route->set_offset = UINT_MAX; /* invalid slot */
+ return;
+ }
i = get_consensus_slot (distance);
route->set_offset = i;
consensi[distance].targets[i] = route;
static void
release_route (struct Route *route)
{
+ if (UINT_MAX == route->set_offset)
+ return;
+ GNUNET_assert (ntohl (route->target.distance) < DEFAULT_FISHEYE_DEPTH);
consensi[ntohl (route->target.distance)].targets[route->set_offset] = NULL;
route->set_offset = UINT_MAX; /* indicate invalid slot */
}
move_route (struct Route *route,
uint32_t new_distance)
{
- unsigned int i;
-
release_route (route);
- i = get_consensus_slot (new_distance);
- route->set_offset = i;
- consensi[new_distance].targets[i] = route;
- route->target.distance = htonl (new_distance);
+ allocate_route (route, new_distance);
}
struct DirectNeighbor *neighbor = cls;
struct GNUNET_SET_Element element;
struct Target *target;
+ struct Route *route;
target = NULL;
- while ( (DEFAULT_FISHEYE_DEPTH - 1 > neighbor->consensus_insertion_distance) &&
+ /* skip over NULL entries */
+ while ( (DEFAULT_FISHEYE_DEPTH > 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++;
+ while ( (DEFAULT_FISHEYE_DEPTH > neighbor->consensus_insertion_distance) &&
(consensi[neighbor->consensus_insertion_distance].array_length == neighbor->consensus_insertion_offset) )
{
/* If we reached the last element of a consensus array element: increase distance and start with next array */
neighbor->consensus_insertion_offset = 0;
neighbor->consensus_insertion_distance++;
-
/* skip over NULL entries */
- while ( (DEFAULT_FISHEYE_DEPTH - 1 > neighbor->consensus_insertion_distance) &&
+ while ( (DEFAULT_FISHEYE_DEPTH > 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++;
}
- if (DEFAULT_FISHEYE_DEPTH - 1 == neighbor->consensus_insertion_distance)
+ if (DEFAULT_FISHEYE_DEPTH == neighbor->consensus_insertion_distance)
{
/* we have added all elements to the set, run the operation */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Finished building my SET for peer `%s' with %u elements, committing\n",
- GNUNET_i2s(&neighbor->peer),
+ GNUNET_i2s (&neighbor->peer),
neighbor->consensus_elements);
GNUNET_SET_commit (neighbor->set_op,
neighbor->my_set);
return;
}
- target = &consensi[neighbor->consensus_insertion_distance].targets[neighbor->consensus_insertion_offset]->target;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding peer `%s' with distance %u to SET\n",
- GNUNET_i2s (&target->peer),
- ntohl (target->distance));
+ route = consensi[neighbor->consensus_insertion_distance].targets[neighbor->consensus_insertion_offset];
+ GNUNET_assert (NULL != route);
+ target = &route->target;
+ GNUNET_assert (ntohl (target->distance) < DEFAULT_FISHEYE_DEPTH);
element.size = sizeof (struct Target);
element.type = htons (0); /* do we need this? */
element.data = target;
- neighbor->consensus_elements++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding element to SET\n");
- GNUNET_SET_add_element (neighbor->my_set,
- &element,
- &build_set, neighbor);
/* Find next non-NULL entry */
neighbor->consensus_insertion_offset++;
- /* 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++;
+ if ( (0 != memcmp (&target->peer, &my_identity, sizeof (my_identity))) &&
+ (0 != memcmp (&target->peer, &neighbor->peer, sizeof (neighbor->peer))) )
+ {
+ /* Add target if it is not the neighbor or this peer */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding peer `%s' with distance %u to SET\n",
+ GNUNET_i2s (&target->peer),
+ ntohl (target->distance));
+ GNUNET_SET_add_element (neighbor->my_set,
+ &element,
+ &build_set, neighbor);
+ neighbor->consensus_elements++;
+ }
+ else
+ build_set (neighbor);
}
&neighbor->peer);
if (NULL != route)
{
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (all_routes,
+ &neighbor->peer,
+ route));
send_disconnect_to_plugin (&neighbor->peer);
release_route (route);
GNUNET_free (route);
neighbor->direct_route = GNUNET_new (struct Route);
neighbor->direct_route->next_hop = neighbor;
- neighbor->direct_route->target.peer= neighbor->peer;
- neighbor->direct_route->target.distance = DIRECT_NEIGHBOR_COST;
+ neighbor->direct_route->target.peer = neighbor->peer;
allocate_route (neighbor->direct_route, DIRECT_NEIGHBOR_COST);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
&my_identity,
sizeof (struct GNUNET_PeerIdentity)))
{
- neighbor->initiate_task = GNUNET_SCHEDULER_add_now (&initiate_set_union,
+ if (NULL != neighbor->listen_handle)
+ {
+ GNUNET_break (0);
+ }
+ else
+ 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);
+ if (NULL != neighbor->listen_handle)
+ {
+ GNUNET_break (0);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting SET listen operation with peer `%s'\n",
+ GNUNET_i2s(&neighbor->peer));
+ neighbor->listen_handle = GNUNET_SET_listen (cfg,
+ GNUNET_SET_OPERATION_UNION,
+ &neighbor->real_session_id,
+ &listen_set_union,
+ neighbor);
+ }
}
}
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
neighbor->connected = GNUNET_YES;
neighbor->distance = 0; /* unknown */
+ neighbor->network = GNUNET_ATS_NET_UNSPECIFIED;
}
* @param cls NULL
* @param key key of the value
* @param value value to free
- * @return GNUNET_OK to continue to iterate
+ * @return #GNUNET_OK to continue to iterate
*/
static int
free_targets (void *cls,
* @param key key value stored under
* @param value a 'struct Target' that may or may not be useful; not that
* the distance in 'target' does not include the first hop yet
- * @return GNUNET_YES to continue iteration, GNUNET_NO to stop
+ * @return #GNUNET_YES to continue iteration, #GNUNET_NO to stop
*/
static int
check_possible_route (void *cls,
struct Target *target = value;
struct Route *route;
+ if (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_contains (direct_neighbors,
+ key))
+ return GNUNET_YES; /* direct route, do not care about alternatives */
route = GNUNET_CONTAINER_multipeermap_get (all_routes,
key);
if (NULL != route)
{
+ /* we have an existing route, check how it compares with going via 'target' */
if (ntohl (route->target.distance) > ntohl (target->distance) + 1)
{
- /* this 'target' is cheaper than the existing route; switch to alternative route! */
+ /* via 'target' is cheaper than the existing route; switch to alternative route! */
move_route (route, ntohl (target->distance) + 1);
route->next_hop = neighbor;
- send_distance_change_to_plugin (&target->peer, ntohl (target->distance) + 1);
+ send_distance_change_to_plugin (&target->peer,
+ ntohl (target->distance) + 1);
}
return GNUNET_YES; /* got a route to this target already */
}
+ if (ntohl (target->distance) >= DEFAULT_FISHEYE_DEPTH)
+ return GNUNET_YES; /* distance is too large to be interesting */
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));
+ allocate_route (route, ntohl (target->distance) + 1);
GNUNET_assert (GNUNET_YES ==
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));
+ send_connect_to_plugin (&route->target.peer,
+ ntohl (route->target.distance),
+ neighbor->network);
return GNUNET_YES;
}
*
* @param cls NULL
* @param key peer identity of the given direct neighbor
- * @param value a 'struct DirectNeighbor' to check for additional routes
- * @return GNUNET_YES to continue iteration
+ * @param value a `struct DirectNeighbor` to check for additional routes
+ * @return #GNUNET_YES to continue iteration
*/
static int
refresh_routes (void *cls,
}
+/**
+ * Task to run #refresh_routes() on all direct neighbours.
+ *
+ * @param cls NULL
+ * @param tc unused
+ */
+static void
+refresh_routes_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ rr_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
+ &refresh_routes,
+ NULL);
+}
+
+
+/**
+ * Asynchronously run #refresh_routes() at the next opportunity
+ * on all direct neighbours.
+ */
+static void
+schedule_refresh_routes ()
+{
+ if (GNUNET_SCHEDULER_NO_TASK == rr_task)
+ rr_task = GNUNET_SCHEDULER_add_now (&refresh_routes_task,
+ NULL);
+}
+
+
/**
* Get distance information from 'atsi'.
*
for (i = 0; i < atsi_count; i++)
if (ntohl (atsi[i].type) == GNUNET_ATS_QUALITY_NET_DISTANCE)
- return (0 == ntohl (atsi->value)) ? DIRECT_NEIGHBOR_COST : ntohl (atsi->value); // FIXME: 0 check should not be required once ATS is fixed!
+ return (0 == ntohl (atsi[i].value)) ? DIRECT_NEIGHBOR_COST : ntohl (atsi[i].value); // FIXME: 0 check should not be required once ATS is fixed!
/* If we do not have explicit distance data, assume direct neighbor. */
return DIRECT_NEIGHBOR_COST;
}
+/**
+ * Get network information from 'atsi'.
+ *
+ * @param atsi performance data
+ * @param atsi_count number of entries in atsi
+ * @return connected transport network
+ */
+static uint32_t
+get_atsi_network (const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count)
+{
+ uint32_t i;
+
+ for (i = 0; i < atsi_count; i++)
+ if (ntohl (atsi[i].type) == GNUNET_ATS_NETWORK_TYPE)
+ return ntohl (atsi[i].value);
+ return GNUNET_ATS_NET_UNSPECIFIED;
+}
+
/**
* 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
* @param key key value stored under
- * @param value a 'struct Route' that may or may not go via neighbor
+ * @param value a `struct Route` that may or may not go via neighbor
*
- * @return GNUNET_YES to continue iteration, GNUNET_NO to stop
+ * @return #GNUNET_YES to continue iteration, #GNUNET_NO to stop
*/
static int
cull_routes (void *cls,
static void
handle_direct_disconnect (struct DirectNeighbor *neighbor)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Culling routes via %s due to direct disconnect\n",
+ GNUNET_i2s (&neighbor->peer));
GNUNET_CONTAINER_multipeermap_iterate (all_routes,
&cull_routes,
neighbor);
* @param bandwidth_out assigned outbound bandwidth for the connection
* @param bandwidth_in assigned inbound bandwidth for the connection
* @param ats performance data for the address (as far as known)
- * @param ats_count number of performance records in 'ats'
+ * @param ats_count number of performance records in @a ats
*/
static void
handle_ats_update (void *cls,
{
struct DirectNeighbor *neighbor;
uint32_t distance;
+ uint32_t network = GNUNET_ATS_NET_UNSPECIFIED;
if (GNUNET_NO == active)
- return;
+ return;
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);*/
+ network = get_atsi_network (ats, ats_count);
+
/* check if entry exists */
neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
&address->peer);
if (NULL != neighbor)
{
+ if (GNUNET_ATS_NET_UNSPECIFIED != network)
+ neighbor->network = network;
+ if (neighbor->distance == distance)
+ return; /* nothing new to see here, move along */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ATS says distance to %s is now %u\n",
+ GNUNET_i2s (&address->peer),
+ (unsigned int) distance);
if ( (DIRECT_NEIGHBOR_COST == neighbor->distance) &&
(DIRECT_NEIGHBOR_COST == distance) )
return; /* no change */
"# peers connected (1-hop)",
-1, GNUNET_NO);
handle_direct_disconnect (neighbor);
- GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
- &refresh_routes,
- NULL);
+ schedule_refresh_routes ();
return;
}
neighbor->distance = distance;
handle_direct_connect (neighbor);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ATS says distance to %s is now %u\n",
+ GNUNET_i2s (&address->peer),
+ (unsigned int) distance);
neighbor = GNUNET_new (struct DirectNeighbor);
neighbor->peer = address->peer;
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
neighbor->connected = GNUNET_NO; /* not yet */
neighbor->distance = distance;
+ neighbor->network = network;
}
* if we also used it for our route, we need to remove it from our
* 'all_routes' set (and later check if an alternative path now exists).
*
- * @param cls the 'struct DirectNeighbor'
+ * @param cls the `struct DirectNeighbor`
* @param key peer identity for the target
- * @param value a 'struct Target' previously reachable via the given neighbor
+ * @param value a `struct Target` previously reachable via the given neighbor
*/
static int
check_target_removed (void *cls,
new_target = GNUNET_CONTAINER_multipeermap_get (neighbor->neighbor_table_consensus,
key);
- if (NULL == new_target)
+ current_route = GNUNET_CONTAINER_multipeermap_get (all_routes,
+ key);
+ if (NULL != new_target)
{
- /* target was revoked, check if it was used */
- current_route = GNUNET_CONTAINER_multipeermap_get (all_routes,
- key);
- if ( (NULL == current_route) ||
- (current_route->next_hop != neighbor) )
+ /* target was in old set, is in new set */
+ if ( (NULL != current_route) &&
+ (current_route->next_hop == neighbor) &&
+ (current_route->target.distance != new_target->distance) )
{
- /* didn't matter, wasn't used */
- return GNUNET_OK;
+ /* need to recalculate routes due to distance change */
+ neighbor->target_removed = GNUNET_YES;
}
- /* remove existing route */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Lost route to %s\n",
- GNUNET_i2s (¤t_route->target.peer));
- GNUNET_assert (GNUNET_YES ==
- 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;
return GNUNET_OK;
}
+ /* target was revoked, check if it was used */
+ if ( (NULL == current_route) ||
+ (current_route->next_hop != neighbor) )
+ {
+ /* didn't matter, wasn't used */
+ return GNUNET_OK;
+ }
+ /* remove existing route */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Lost route to %s\n",
+ GNUNET_i2s (¤t_route->target.peer));
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (all_routes, key, current_route));
+ send_disconnect_to_plugin (¤t_route->target.peer);
+ release_route (current_route);
+ GNUNET_free (current_route);
+ neighbor->target_removed = GNUNET_YES;
return GNUNET_OK;
}
* Check if a target was added to the set of the other peer; if it
* was added or impoves the existing route, do the needed updates.
*
- * @param cls the 'struct DirectNeighbor'
+ * @param cls the `struct DirectNeighbor`
* @param key peer identity for the target
- * @param value a 'struct Target' now reachable via the given neighbor
+ * @param value a `struct Target` now reachable via the given neighbor
*/
static int
check_target_added (void *cls,
/* route exists */
if (current_route->next_hop == neighbor)
{
- /* we had the same route before, no change */
+ /* we had the same route before, no change in target */
if (ntohl (target->distance) + 1 != ntohl (current_route->target.distance))
{
- current_route->target.distance = htonl (ntohl (target->distance) + 1);
- send_distance_change_to_plugin (&target->peer, ntohl (target->distance) + 1);
+ /* but distance changed! */
+ if (ntohl (target->distance) + 1 > DEFAULT_FISHEYE_DEPTH)
+ {
+ /* distance increased beyond what is allowed, kill route */
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (all_routes,
+ key,
+ current_route));
+ send_disconnect_to_plugin (key);
+ release_route (current_route);
+ GNUNET_free (current_route);
+ }
+ else
+ {
+ /* distance decreased, update route */
+ move_route (current_route,
+ ntohl (target->distance) + 1);
+ send_distance_change_to_plugin (&target->peer, ntohl (target->distance) + 1);
+ }
}
return GNUNET_OK;
}
- if (ntohl (current_route->target.distance) >= ntohl (target->distance) + 1)
+ if (ntohl (current_route->target.distance) <= ntohl (target->distance) + 1)
{
/* alternative, shorter route exists, ignore */
return GNUNET_OK;
very short routes to take over longer paths; as we don't
check that the shorter routes actually work, a malicious
direct neighbor can use this to DoS our long routes */
+
+ move_route (current_route, ntohl (target->distance) + 1);
current_route->next_hop = neighbor;
- current_route->target.distance = htonl (ntohl (target->distance) + 1);
send_distance_change_to_plugin (&target->peer, ntohl (target->distance) + 1);
return GNUNET_OK;
}
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);
+ allocate_route (current_route, ntohl (target->distance) + 1);
GNUNET_assert (GNUNET_YES ==
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,
- ntohl (current_route->target.distance));
+ ntohl (current_route->target.distance),
+ neighbor->network);
return GNUNET_OK;
}
* We have learned a new route from the other peer. Add it to the
* route set we're building.
*
- * @param cls the 'struct DirectNeighbor' we're building the consensus with
- * @param element a result element, only valid if status is GNUNET_SET_STATUS_OK
- * @param status see enum GNUNET_SET_Status
+ * @param cls the `struct DirectNeighbor` we're building the consensus with
+ * @param element a result element, only valid if status is #GNUNET_SET_STATUS_OK
+ * @param status see `enum GNUNET_SET_Status`
*/
static void
handle_set_union_result (void *cls,
{
struct DirectNeighbor *neighbor = cls;
struct Target *target;
+ char *status_str;
+
+ switch (status) {
+ case GNUNET_SET_STATUS_OK:
+ status_str = "GNUNET_SET_STATUS_OK";
+ break;
+ case GNUNET_SET_STATUS_TIMEOUT:
+ status_str = "GNUNET_SET_STATUS_TIMEOUT";
+ break;
+ case GNUNET_SET_STATUS_FAILURE:
+ status_str = "GNUNET_SET_STATUS_FAILURE";
+ break;
+ case GNUNET_SET_STATUS_HALF_DONE:
+ status_str = "GNUNET_SET_STATUS_HALF_DONE";
+ break;
+ case GNUNET_SET_STATUS_DONE:
+ status_str = "GNUNET_SET_STATUS_DONE";
+ break;
+ default:
+ status_str = "UNDEFINED";
+ break;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Got SET union result: %d\n",
- status);
+ "Got SET union result: %s\n",
+ status_str);
switch (status)
{
case GNUNET_SET_STATUS_OK:
GNUNET_break_op (0);
return;
}
+ if (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_contains (direct_neighbors,
+ &((struct Target *) element->data)->peer))
+ {
+ /* this is a direct neighbor of ours, we do not care about routes
+ to this peer */
+ return;
+ }
target = GNUNET_new (struct Target);
memcpy (target, element->data, sizeof (struct Target));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received information about peer `%s' with distance %u from SET\n",
+ GNUNET_i2s (&target->peer),
+ ntohl (target->distance) + 1);
+
+ if (NULL == neighbor->neighbor_table_consensus)
+ neighbor->neighbor_table_consensus
+ = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
if (GNUNET_YES !=
GNUNET_CONTAINER_multipeermap_put (neighbor->neighbor_table_consensus,
&target->peer,
neighbor);
break;
case GNUNET_SET_STATUS_HALF_DONE:
+ break;
+ case GNUNET_SET_STATUS_DONE:
/* we got all of our updates; integrate routing table! */
neighbor->target_removed = GNUNET_NO;
- GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table,
- &check_target_removed,
- neighbor);
+ if (NULL == neighbor->neighbor_table_consensus)
+ neighbor->neighbor_table_consensus = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
+ if (NULL != 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_multipeermap_iterate (direct_neighbors,
- &refresh_routes,
- NULL);
+ schedule_refresh_routes ();
}
/* add targets that appeared (and check for improved routes) */
GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus,
- &check_target_added,
- neighbor);
+ &check_target_added,
+ neighbor);
if (NULL != neighbor->neighbor_table)
{
GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table,
- &free_targets,
- NULL);
+ &free_targets,
+ NULL);
GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table);
neighbor->neighbor_table = NULL;
}
neighbor->neighbor_table = neighbor->neighbor_table_consensus;
neighbor->neighbor_table_consensus = NULL;
- break;
- case GNUNET_SET_STATUS_DONE:
+
/* operation done, schedule next run! */
neighbor->set_op = NULL;
if (0 < memcmp (&neighbor->peer,
if (NULL == request)
return; /* why??? */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting to create consensus with %s!\n",
+ "Starting to create consensus with %s\n",
GNUNET_i2s (&neighbor->peer));
if (NULL != neighbor->set_op)
{
/**
* Start creating a new DV set union by initiating the connection.
*
- * @param cls the 'struct DirectNeighbor' of the peer we're building
+ * @param cls the `struct DirectNeighbor *` of the peer we're building
* a routing consensus with
* @param tc scheduler context
*/
initiate_set_union (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ static uint16_t salt;
struct DirectNeighbor *neighbor = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Initiating SET union\n");
+ "Initiating SET union with peer `%s'\n",
+ GNUNET_i2s (&neighbor->peer));
neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK;
neighbor->my_set = GNUNET_SET_create (cfg,
GNUNET_SET_OPERATION_UNION);
neighbor->set_op = GNUNET_SET_prepare (&neighbor->peer,
&neighbor->real_session_id,
NULL,
- 0 /* FIXME: salt */,
+ salt++,
GNUNET_SET_RESULT_ADDED,
&handle_set_union_result,
neighbor);
* @param cls closure
* @param peer peer which sent the message (immediate sender)
* @param message the message
- * @return GNUNET_OK on success, GNUNET_SYSERR if the other peer violated the protocol
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if the other peer violated the protocol
*/
static int
handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer,
-1, GNUNET_NO);
}
cleanup_neighbor (neighbor);
- GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
- &refresh_routes,
- NULL);
+
+ if (GNUNET_YES == in_shutdown)
+ return;
+ schedule_refresh_routes ();
}
* @param cls NULL
* @param key key value stored under
* @param value the route to be freed
- *
- * @return GNUNET_YES to continue iteration, GNUNET_NO to stop
+ * @return #GNUNET_YES to continue iteration, #GNUNET_NO to stop
*/
static int
-free_route (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
+free_route (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct Route *route = value;
* @param cls NULL
* @param key key value stored under
* @param value the direct neighbor to be freed
- *
- * @return GNUNET_YES to continue iteration, GNUNET_NO to stop
+ * @return #GNUNET_YES to continue iteration, #GNUNET_NO to stop
*/
static int
-free_direct_neighbors (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
+free_direct_neighbors (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct DirectNeighbor *neighbor = value;
- GNUNET_break (0);
cleanup_neighbor (neighbor);
return GNUNET_YES;
}
* @param tc unused
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
unsigned int i;
+ in_shutdown = GNUNET_YES;
+ GNUNET_assert (NULL != core_api);
GNUNET_CORE_disconnect (core_api);
core_api = NULL;
GNUNET_ATS_performance_done (ats);
stats = NULL;
GNUNET_SERVER_notification_context_destroy (nc);
nc = NULL;
- for (i=0;i<DEFAULT_FISHEYE_DEPTH - 1;i++)
+ for (i=0;i<DEFAULT_FISHEYE_DEPTH;i++)
+ {
GNUNET_array_grow (consensi[i].targets,
consensi[i].array_length,
0);
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != rr_task)
+ {
+ GNUNET_SCHEDULER_cancel (rr_task);
+ rr_task = GNUNET_SCHEDULER_NO_TASK;
+ }
}
/**
* Notify newly connected client about an existing route.
*
- * @param cls the 'struct GNUNET_SERVER_Client'
+ * @param cls the `struct GNUNET_SERVER_Client *`
* @param key peer identity
- * @param value the XXX.
- * @return GNUNET_OK (continue to iterate)
+ * @param value the `struct Route *`
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
add_route (void *cls,
struct Route *route = value;
struct GNUNET_DV_ConnectMessage cm;
+ memset (&cm, 0, sizeof (cm));
cm.header.size = htons (sizeof (cm));
cm.header.type = htons (GNUNET_MESSAGE_TYPE_DV_CONNECT);
cm.distance = htonl (route->target.distance);
0},
{NULL, NULL, 0, 0}
};
-
+ in_shutdown = GNUNET_NO;
cfg = c;
direct_neighbors = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
all_routes = GNUNET_CONTAINER_multipeermap_create (65536, GNUNET_NO);
if (NULL == ats)
{
GNUNET_CORE_disconnect (core_api);
+ core_api = NULL;
return;
}
nc = GNUNET_SERVER_notification_context_create (server,
projects / oweals / gnunet.git / blobdiff