/*
This file is part of GNUnet.
- (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
struct RouteMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DV_ROUTE
+ * Type: #GNUNET_MESSAGE_TYPE_DV_ROUTE
*/
struct GNUNET_MessageHeader header;
/**
* 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.
*/
GNUNET_NETWORK_STRUCT_END
-/**
- * Linked list of messages to send to clients.
- */
-struct PendingMessage
-{
- /**
- * Pointer to next item in the list
- */
- struct PendingMessage *next;
-
- /**
- * Pointer to previous item in the list
- */
- struct PendingMessage *prev;
-
- /**
- * Actual message to be sent, allocated after this struct.
- */
- const struct GNUNET_MessageHeader *msg;
-
- /**
- * Ultimate target for the message.
- */
- struct GNUNET_PeerIdentity ultimate_target;
-
- /**
- * Unique ID of the message.
- */
- uint32_t uid;
-
-};
-
-
/**
* Information about a direct neighbor (core-level, excluding
* DV-links, only DV-enabled peers).
*/
struct GNUNET_HashCode real_session_id;
- /**
- * Head of linked list of messages to send to this peer.
- */
- struct PendingMessage *pm_head;
-
- /**
- * Tail of linked list of messages to send to this peer.
- */
- struct PendingMessage *pm_tail;
-
/**
* Transmit handle to core service.
*/
- struct GNUNET_CORE_TransmitHandle *cth;
+ struct GNUNET_MQ_Handle *mq;
/**
* Routing table of the neighbor, NULL if not yet established.
* 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;
* ID of the task we use to (periodically) update our consensus
* with this peer. Used if we are the initiating peer.
*/
- GNUNET_SCHEDULER_TaskIdentifier initiate_task;
+ struct GNUNET_SCHEDULER_Task *initiate_task;
/**
* At what offset are we, with respect to inserting our own routes
*/
unsigned int consensus_insertion_distance;
- /**
- * Number of messages currently in the 'pm_XXXX'-DLL.
- */
- unsigned int pm_queue_size;
-
/**
* Elements in consensus
*/
/**
* The network this peer is in
*/
- uint32_t network;
+ enum GNUNET_ATS_Network_Type network;
/**
* Is this neighbor connected at the core level?
/**
* Hashmap with all routes that we currently support; contains
* routing information for all peers from distance 2
- * up to distance DEFAULT_FISHEYE_DEPTH.
+ * up to distance #DEFAULT_FISHEYE_DEPTH.
*/
static struct GNUNET_CONTAINER_MultiPeerMap *all_routes;
* 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.
* Hopefully this client will never change, although if the plugin
* dies and returns for some reason it may happen.
*/
-static struct GNUNET_SERVER_NotificationContext *nc;
+static struct GNUNET_NotificationContext *nc;
/**
* Handle for the statistics service.
/**
* Task scheduled to refresh routes based on direct neighbours.
*/
-static GNUNET_SCHEDULER_TaskIdentifier rr_task;
+static struct GNUNET_SCHEDULER_Task *rr_task;
/**
* #GNUNET_YES if we are shutting down.
*
* @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);
+initiate_set_union (void *cls);
/**
size_t size;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Delivering message from peer `%s'\n",
- GNUNET_i2s (origin));
+ "Delivering message from peer `%s' at distance %u\n",
+ GNUNET_i2s (origin),
+ (unsigned int) distance);
size = sizeof (struct GNUNET_DV_ReceivedMessage) +
ntohs (message->size);
if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
received_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DV_RECV);
received_msg->distance = htonl (distance);
received_msg->sender = *origin;
- memcpy (&received_msg[1], message, ntohs (message->size));
- GNUNET_SERVER_notification_context_broadcast (nc,
- &received_msg->header,
- GNUNET_YES);
+ GNUNET_memcpy (&received_msg[1], message, ntohs (message->size));
+ GNUNET_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,
- message,
- GNUNET_NO);
-}
-
-
-/**
- * Give an (N)ACK message to the plugin, we transmitted a message for it.
- *
- * @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
- */
-static void
-send_ack_to_plugin (const struct GNUNET_PeerIdentity *target,
- uint32_t uid,
- int nack)
-{
- struct GNUNET_DV_AckMessage ack_msg;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "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)
- ? GNUNET_MESSAGE_TYPE_DV_SEND_NACK
- : GNUNET_MESSAGE_TYPE_DV_SEND_ACK);
- ack_msg.uid = htonl (uid);
- ack_msg.target = *target;
- send_control_to_plugin (&ack_msg.header);
+ GNUNET_notification_context_broadcast (nc,
+ message,
+ GNUNET_NO);
}
*
* @param peer peer with a changed distance
* @param distance new distance to the peer
+ * @param network network used by the neighbor
*/
static void
send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer,
- uint32_t distance)
+ uint32_t distance,
+ enum GNUNET_ATS_Network_Type network)
{
struct GNUNET_DV_DistanceUpdateMessage du_msg;
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Delivering DISTANCE_CHANGED for message about peer `%s'\n",
GNUNET_i2s (peer));
du_msg.header.type = htons (GNUNET_MESSAGE_TYPE_DV_DISTANCE_CHANGED);
du_msg.distance = htonl (distance);
du_msg.peer = *peer;
+ du_msg.network = htonl ((uint32_t) network);
send_control_to_plugin (&du_msg.header);
}
*/
static void
send_connect_to_plugin (const struct GNUNET_PeerIdentity *target,
- uint32_t distance, uint32_t network)
+ uint32_t distance,
+ enum GNUNET_ATS_Network_Type network)
{
struct GNUNET_DV_ConnectMessage cm;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Delivering CONNECT about peer `%s' with distance %u\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "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.network = htonl ((uint32_t) network);
cm.peer = *target;
send_control_to_plugin (&cm.header);
}
}
-/**
- * Function called to transfer a message to another peer
- * via core.
- *
- * @param cls closure with the direct neighbor
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-core_transmit_notify (void *cls, size_t size, void *buf)
-{
- struct DirectNeighbor *dn = cls;
- char *cbuf = buf;
- struct PendingMessage *pending;
- size_t off;
- size_t msize;
-
- dn->cth = NULL;
- if (NULL == buf)
- {
- /* peer disconnected */
- return 0;
- }
- pending = dn->pm_head;
- off = 0;
- while ( (NULL != (pending = dn->pm_head)) &&
- (size >= off + (msize = ntohs (pending->msg->size))))
- {
- dn->pm_queue_size--;
- GNUNET_CONTAINER_DLL_remove (dn->pm_head,
- dn->pm_tail,
- pending);
- memcpy (&cbuf[off], pending->msg, msize);
- if (0 != pending->uid)
- send_ack_to_plugin (&pending->ultimate_target,
- pending->uid,
- GNUNET_NO);
- GNUNET_free (pending);
- off += msize;
- }
- GNUNET_assert (NULL != core_api);
- if (NULL != dn->pm_head)
- dn->cth =
- GNUNET_CORE_notify_transmit_ready (core_api,
- GNUNET_YES /* cork */,
- 0 /* priority */,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &dn->peer,
- msize,
- &core_transmit_notify, dn);
- return off;
-}
-
-
/**
* Forward the given payload to the given target.
*
* @param target where to send the message
- * @param uid unique ID for the message
- * @param ultimate_target ultimate recipient for the message
- * @param distance expected (remaining) distance to the target
+ * @param distance distance to the @a sender
* @param sender original sender of the message
+ * @param actual_target ultimate recipient for the message
* @param payload payload of the message
*/
static void
forward_payload (struct DirectNeighbor *target,
uint32_t distance,
- uint32_t uid,
const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_PeerIdentity *ultimate_target,
+ const struct GNUNET_PeerIdentity *actual_target,
const struct GNUNET_MessageHeader *payload)
{
- struct PendingMessage *pm;
+ struct GNUNET_MQ_Envelope *env;
struct RouteMessage *rm;
- size_t msize;
- if ( (target->pm_queue_size >= MAX_QUEUE_SIZE) &&
+ if ( (GNUNET_MQ_get_length (target->mq) >= MAX_QUEUE_SIZE) &&
(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);
- if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ if (sizeof (struct RouteMessage) + ntohs (payload->size)
+ >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
- pm = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
- pm->ultimate_target = *ultimate_target;
- pm->uid = uid;
- pm->msg = (const struct GNUNET_MessageHeader *) &pm[1];
- rm = (struct RouteMessage *) &pm[1];
- rm->header.size = htons ((uint16_t) msize);
- rm->header.type = htons (GNUNET_MESSAGE_TYPE_DV_ROUTE);
+ env = GNUNET_MQ_msg_nested_mh (rm,
+ GNUNET_MESSAGE_TYPE_DV_ROUTE,
+ payload);
rm->distance = htonl (distance);
- rm->target = target->peer;
+ rm->target = *actual_target;
rm->sender = *sender;
- memcpy (&rm[1], payload, ntohs (payload->size));
- GNUNET_CONTAINER_DLL_insert_tail (target->pm_head,
- 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,
- &core_transmit_notify, target);
+ GNUNET_MQ_send (target->mq,
+ env);
}
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;
+ 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.element_type = htons (0);
element.data = target;
/* 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))) )
+ if ( (0 != memcmp (&target->peer,
+ &my_identity,
+ sizeof (my_identity))) &&
+ (0 != memcmp (&target->peer,
+ &neighbor->peer,
+ sizeof (struct GNUNET_PeerIdentity))) )
{
/* 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));
+ ntohl (target->distance) + 1);
GNUNET_SET_add_element (neighbor->my_set,
&element,
&build_set, neighbor);
neighbor->consensus_elements++;
}
else
- build_set(neighbor);
+ 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,
/* construct session ID seed as XOR of both peer's identities */
- GNUNET_CRYPTO_hash (&my_identity, sizeof (my_identity), &h1);
- GNUNET_CRYPTO_hash (&neighbor->peer, sizeof (struct GNUNET_PeerIdentity), &h2);
+ 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);
}
else
neighbor->initiate_task = GNUNET_SCHEDULER_add_now (&initiate_set_union,
- neighbor);
+ neighbor);
}
else
{
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting SET listen operation with peer `%s'\n",
- GNUNET_i2s(&neighbor->peer));
+ GNUNET_i2s (&neighbor->peer));
neighbor->listen_handle = GNUNET_SET_listen (cfg,
GNUNET_SET_OPERATION_UNION,
&neighbor->real_session_id,
*
* @param cls closure
* @param peer peer identity this notification is about
+ * @param mq message queue for sending data to @a peer
+ * @return our `struct DirectNeighbour` for this peer
*/
-static void
+static void *
handle_core_connect (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *mq)
{
struct DirectNeighbor *neighbor;
/* Check for connect to self message */
- if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
- return;
+ if (0 == memcmp (&my_identity,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ return NULL;
/* check if entry exists */
neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
peer);
if (NULL != neighbor)
{
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != neighbor->network);
GNUNET_break (GNUNET_YES != neighbor->connected);
neighbor->connected = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_i2s (peer),
(unsigned int) neighbor->distance);
if (DIRECT_NEIGHBOR_COST != neighbor->distance)
- return;
+ return NULL;
handle_direct_connect (neighbor);
- return;
+ return NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core connected to %s (distance unknown)\n",
neighbor->peer = *peer;
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_put (direct_neighbors,
- peer,
+ &neighbor->peer,
neighbor,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
neighbor->connected = GNUNET_YES;
neighbor->distance = 0; /* unknown */
neighbor->network = GNUNET_ATS_NET_UNSPECIFIED;
+ return neighbor;
}
}
+/**
+ * Add a new route to the given @a target via the given @a neighbor.
+ *
+ * @param target the target of the route
+ * @param neighbor the next hop for communicating with the @a target
+ */
+static void
+add_new_route (struct Target *target,
+ struct DirectNeighbor *neighbor)
+{
+ struct Route *route;
+
+ route = GNUNET_new (struct Route);
+ route->next_hop = neighbor;
+ route->target.peer = target->peer;
+ 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 (route->target.distance),
+ neighbor->network);
+}
+
+
/**
* Multipeerhmap iterator for checking if a given route is
* (now) useful to this peer.
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,
+ neighbor->network);
}
return GNUNET_YES; /* got a route to this target already */
}
- 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_multipeermap_put (all_routes,
- &route->target.peer,
- route,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- send_connect_to_plugin (&route->target.peer, ntohl (target->distance),
- neighbor->network);
+ if (ntohl (target->distance) >= DEFAULT_FISHEYE_DEPTH)
+ return GNUNET_YES; /* distance is too large to be interesting */
+ add_new_route (target, neighbor);
return GNUNET_YES;
}
* 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)
+refresh_routes_task (void *cls)
{
- rr_task = GNUNET_SCHEDULER_NO_TASK;
+ rr_task = NULL;
GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
&refresh_routes,
NULL);
static void
schedule_refresh_routes ()
{
- if (GNUNET_SCHEDULER_NO_TASK == rr_task)
+ if (NULL == rr_task)
rr_task = GNUNET_SCHEDULER_add_now (&refresh_routes_task,
NULL);
}
-/**
- * Get distance information from 'atsi'.
- *
- * @param atsi performance data
- * @param atsi_count number of entries in atsi
- * @return connected transport distance
- */
-static uint32_t
-get_atsi_distance (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_QUALITY_NET_DISTANCE)
- 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);
- if (NULL != neighbor->cth)
- {
- GNUNET_CORE_notify_transmit_ready_cancel (neighbor->cth);
- neighbor->cth = NULL;
- }
-
if (NULL != neighbor->direct_route)
{
release_route (neighbor->direct_route);
GNUNET_free (neighbor->direct_route);
neighbor->direct_route = NULL;
}
-
if (NULL != neighbor->neighbor_table_consensus)
{
GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus,
GNUNET_SET_listen_cancel (neighbor->listen_handle);
neighbor->listen_handle = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != neighbor->initiate_task)
+ if (NULL != neighbor->initiate_task)
{
GNUNET_SCHEDULER_cancel (neighbor->initiate_task);
- neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK;
+ neighbor->initiate_task = NULL;
}
}
*
* @param cls closure
* @param address the address
- * @param active is this address in active use
+ * @param active #GNUNET_YES if this address is actively used
+ * to maintain a connection to a peer;
+ * #GNUNET_NO if the address is not actively used;
+ * #GNUNET_SYSERR if this address is no longer available for ATS
* @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 prop performance data for the address (as far as known)
*/
static void
handle_ats_update (void *cls,
int active,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ const struct GNUNET_ATS_Properties *prop)
{
struct DirectNeighbor *neighbor;
uint32_t distance;
- uint32_t network = GNUNET_ATS_NET_UNSPECIFIED;
+ enum GNUNET_ATS_Network_Type network;
- if (GNUNET_NO == active)
- return;
- distance = get_atsi_distance (ats, ats_count);
- network = get_atsi_network (ats, ats_count);
+ if (NULL == address)
+ {
+ /* ATS service temporarily disconnected */
+ return;
+ }
- /*
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ATS says distance to %s is %u\n",
- GNUNET_i2s (&address->peer),
- (unsigned int) distance);*/
+ if (GNUNET_YES != active)
+ {
+ // FIXME: handle disconnect/inactive case too!
+ return;
+ }
+ distance = prop->distance;
+ network = prop->scope;
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network);
/* 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;
-
+ 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 */
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_multipeermap_put (direct_neighbors,
- &address->peer,
+ &neighbor->peer,
neighbor,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
neighbor->connected = GNUNET_NO; /* not yet */
* 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,
+ neighbor->network);
+ }
}
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);
+ send_distance_change_to_plugin (&target->peer,
+ ntohl (target->distance) + 1,
+ neighbor->network);
return GNUNET_OK;
}
/* new 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);
+ allocate_route (current_route, ntohl (target->distance) + 1);
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_put (all_routes,
¤t_route->target.peer,
* 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 current_size current set size
+ * @param status see `enum GNUNET_SET_Status`
*/
static void
handle_set_union_result (void *cls,
const struct GNUNET_SET_Element *element,
+ uint64_t current_size,
enum GNUNET_SET_Status status)
{
struct DirectNeighbor *neighbor = cls;
+ struct DirectNeighbor *dn;
struct Target *target;
+ const struct Target *ctarget;
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;
+ switch (status)
+ {
+ case GNUNET_SET_STATUS_OK:
+ status_str = "GNUNET_SET_STATUS_OK";
+ 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,
GNUNET_break_op (0);
return;
}
+ ctarget = element->data;
+ if ( (NULL !=
+ (dn = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
+ &ctarget->peer))) &&
+ (DIRECT_NEIGHBOR_COST == dn->distance) )
+ {
+ /* 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_memcpy (target, element->data, sizeof (struct Target));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received information about peer `%s' with distance %u\n",
- GNUNET_i2s (&target->peer), ntohl(target->distance) + 1);
+ "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);
+ neighbor->neighbor_table_consensus
+ = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
if (GNUNET_YES !=
GNUNET_CONTAINER_multipeermap_put (neighbor->neighbor_table_consensus,
&target->peer,
GNUNET_free (target);
}
break;
- case GNUNET_SET_STATUS_TIMEOUT:
case GNUNET_SET_STATUS_FAILURE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to establish DV union, will try again later\n");
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);
+ &check_target_removed,
+ neighbor);
if (GNUNET_YES == neighbor->target_removed)
{
/* check if we got an alternative for the removed routes */
GNUNET_SET_OPERATION_UNION);
neighbor->set_op = GNUNET_SET_accept (request,
GNUNET_SET_RESULT_ADDED,
+ (struct GNUNET_SET_Option[]) {{ 0 }},
&handle_set_union_result,
neighbor);
neighbor->consensus_insertion_offset = 0;
/**
* 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
*/
static void
-initiate_set_union (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+initiate_set_union (void *cls)
{
struct DirectNeighbor *neighbor = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Initiating SET union with peer `%s'\n",
GNUNET_i2s (&neighbor->peer));
- neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK;
+ neighbor->initiate_task = NULL;
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 */,
GNUNET_SET_RESULT_ADDED,
+ (struct GNUNET_SET_Option[]) {{ 0 }},
&handle_set_union_result,
neighbor);
neighbor->consensus_insertion_offset = 0;
/**
- * Core handler for DV data messages. Whatever this message
- * contains all we really have to do is rip it out of its
- * DV layering and give it to our pal the DV plugin to report
- * in with.
+ * Check that @a rm is well-formed.
*
* @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
+ * @param rm the message
+ * @return #GNUNET_OK if @a rm is well-formed.
*/
static int
-handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+check_dv_route_message (void *cls,
+ const struct RouteMessage *rm)
{
- const struct RouteMessage *rm;
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))
+ if (ntohs (rm->header.size) < sizeof (struct RouteMessage) + sizeof (struct GNUNET_MessageHeader))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
- rm = (const struct RouteMessage *) message;
payload = (const struct GNUNET_MessageHeader *) &rm[1];
- if (ntohs (message->size) != sizeof (struct RouteMessage) + ntohs (payload->size))
+ if (ntohs (rm->header.size) != sizeof (struct RouteMessage) + ntohs (payload->size))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
+ return GNUNET_OK;
+}
+
+
+/**
+ * Core handler for DV data messages. Whatever this message
+ * contains all we really have to do is rip it out of its
+ * DV layering and give it to our pal the DV plugin to report
+ * in with.
+ *
+ * @param cls closure
+ * @param rm the message
+ */
+static void
+handle_dv_route_message (void *cls,
+ const struct RouteMessage *rm)
+{
+ struct DirectNeighbor *neighbor = cls;
+ const struct GNUNET_MessageHeader *payload;
+ struct Route *route;
+ struct DirectNeighbor *nneighbor;
+ struct DirectNeighbor *dn;
+ struct Target *target;
+ uint32_t distance;
+ char me[5];
+ char src[5];
+ char prev[5];
+ char dst[5];
+
+ distance = ntohl (rm->distance);
+ payload = (const struct GNUNET_MessageHeader *) &rm[1];
+ strncpy (prev, GNUNET_i2s (&neighbor->peer), 4);
+ strncpy (me, GNUNET_i2s (&my_identity), 4);
+ strncpy (src, GNUNET_i2s (&rm->sender), 4);
+ strncpy (dst, GNUNET_i2s (&rm->target), 4);
+ prev[4] = me[4] = src[4] = dst[4] = '\0';
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Handling DV message with %u bytes payload of type %u from %s to %s routed by %s to me (%s @ hop %u)\n",
+ (unsigned int) (ntohs (rm->header.size) - sizeof (struct RouteMessage)),
+ ntohs (payload->type),
+ src,
+ dst,
+ prev,
+ me,
+ (unsigned int) distance + 1);
+
if (0 == memcmp (&rm->target,
&my_identity,
sizeof (struct GNUNET_PeerIdentity)))
{
+ if ((NULL !=
+ (dn = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
+ &rm->sender))) &&
+ (DIRECT_NEIGHBOR_COST == dn->distance))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Discarding DV message, as %s is a direct neighbor\n",
+ GNUNET_i2s (&rm->sender));
+ GNUNET_STATISTICS_update (stats,
+ "# messages discarded (direct neighbor)",
+ 1, GNUNET_NO);
+ return;
+ }
/* message is for me, check reverse route! */
route = GNUNET_CONTAINER_multipeermap_get (all_routes,
&rm->sender);
- if (NULL == route)
+ if ( (NULL == route) &&
+ (distance < DEFAULT_FISHEYE_DEPTH) )
{
- /* don't have reverse route, drop */
- GNUNET_STATISTICS_update (stats,
- "# message discarded (no reverse route)",
- 1, GNUNET_NO);
- return GNUNET_OK;
+ /* don't have reverse route yet, learn it! */
+ target = GNUNET_new (struct Target);
+ target->peer = rm->sender;
+ target->distance = htonl (distance);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Learning sender %s at distance %u from delivery!\n",
+ GNUNET_i2s (&rm->sender),
+ (unsigned int) distance + 1);
+ if (NULL == neighbor->neighbor_table)
+ neighbor->neighbor_table = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
+ if (GNUNET_YES !=
+ GNUNET_CONTAINER_multipeermap_put (neighbor->neighbor_table,
+ &target->peer,
+ target,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+ {
+ GNUNET_break_op (0);
+ GNUNET_free (target);
+ return;
+ }
+ add_new_route (target, neighbor);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Delivering %u bytes to myself!\n",
- ntohs (payload->size));
+ "Delivering %u bytes from %s to myself!\n",
+ ntohs (payload->size),
+ GNUNET_i2s (&rm->sender));
send_data_to_plugin (payload,
&rm->sender,
- ntohl (route->target.distance));
- return GNUNET_OK;
+ 1 + distance);
+ return;
}
+ if ( (NULL == GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
+ &rm->sender)) &&
+ (NULL == GNUNET_CONTAINER_multipeermap_get (all_routes,
+ &rm->sender)) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Learning sender %s at distance %u from forwarding!\n",
+ GNUNET_i2s (&rm->sender),
+ 1 + distance);
+ target = GNUNET_new (struct Target);
+ target->peer = rm->sender;
+ target->distance = htonl (distance);
+ if (NULL == neighbor->neighbor_table)
+ neighbor->neighbor_table = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
+ if (GNUNET_YES !=
+ GNUNET_CONTAINER_multipeermap_put (neighbor->neighbor_table,
+ &target->peer,
+ target,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+ {
+ GNUNET_break_op (0);
+ GNUNET_free (target);
+ return;
+ }
+ add_new_route (target, neighbor);
+ }
+
route = GNUNET_CONTAINER_multipeermap_get (all_routes,
&rm->target);
if (NULL == route)
{
- GNUNET_STATISTICS_update (stats,
- "# messages discarded (no route)",
- 1, GNUNET_NO);
- return GNUNET_OK;
+ nneighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
+ &rm->target);
+ if (NULL == nneighbor)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No route to %s, not routing %u bytes!\n",
+ GNUNET_i2s (&rm->target),
+ ntohs (payload->size));
+ GNUNET_STATISTICS_update (stats,
+ "# messages discarded (no route)",
+ 1, GNUNET_NO);
+ return;
+ }
}
- if (ntohl (route->target.distance) > ntohl (rm->distance) + 1)
+ else
{
- GNUNET_STATISTICS_update (stats,
- "# messages discarded (target too far)",
- 1, GNUNET_NO);
- return GNUNET_OK;
+ nneighbor = route->next_hop;
}
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,
+ GNUNET_i2s (&nneighbor->peer));
+ forward_payload (nneighbor,
+ distance + 1,
&rm->sender,
+ &rm->target,
payload);
- return GNUNET_OK;
}
/**
- * Service server's handler for message send requests (which come
- * bubbling up to us through the DV plugin).
+ * Check that @a msg is well-formed
*
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
* @param message the actual message
+ * @return #GNUNET_OK if @a msg is well-formed
*/
-static void
-handle_dv_send_message (void *cls, struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+static int
+check_dv_send_message (void *cls,
+ const struct GNUNET_DV_SendMessage *msg)
{
- struct Route *route;
- const struct GNUNET_DV_SendMessage *msg;
const struct GNUNET_MessageHeader *payload;
- if (ntohs (message->size) < sizeof (struct GNUNET_DV_SendMessage) + sizeof (struct GNUNET_MessageHeader))
+ if (ntohs (msg->header.size) < sizeof (struct GNUNET_DV_SendMessage) +
+ sizeof (struct GNUNET_MessageHeader))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return GNUNET_SYSERR;
}
- msg = (const struct GNUNET_DV_SendMessage *) message;
- GNUNET_break (0 != ntohl (msg->uid));
payload = (const struct GNUNET_MessageHeader *) &msg[1];
- if (ntohs (message->size) != sizeof (struct GNUNET_DV_SendMessage) + ntohs (payload->size))
+ if (ntohs (msg->header.size) != sizeof (struct GNUNET_DV_SendMessage) + ntohs (payload->size))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
+ return GNUNET_SYSERR;
}
+ return GNUNET_OK;
+}
+
+
+/**
+ * Service server's handler for message send requests (which come
+ * bubbling up to us through the DV plugin).
+ *
+ * @param cls identification of the client
+ * @param message the actual message
+ */
+static void
+handle_dv_send_message (void *cls,
+ const struct GNUNET_DV_SendMessage *msg)
+{
+ struct GNUNET_SERVICE_Client *client = cls;
+ struct Route *route;
+ const struct GNUNET_MessageHeader *payload;
+
+ payload = (const struct GNUNET_MessageHeader *) &msg[1];
route = GNUNET_CONTAINER_multipeermap_get (all_routes,
&msg->target);
if (NULL == route)
{
/* got disconnected */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No route to %s, dropping local message of type %u\n",
+ GNUNET_i2s (&msg->target),
+ ntohs (payload->type));
GNUNET_STATISTICS_update (stats,
"# local messages discarded (no route)",
1, GNUNET_NO);
- send_ack_to_plugin (&msg->target, ntohl (msg->uid), GNUNET_YES);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (client);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Forwarding %u bytes to %s\n",
+ "Forwarding %u bytes of type %u to %s\n",
ntohs (payload->size),
+ ntohs (payload->type),
GNUNET_i2s (&msg->target));
forward_payload (route->next_hop,
- ntohl (route->target.distance),
- htonl (msg->uid),
- &msg->target,
+ 0 /* first hop, distance is zero */,
&my_identity,
+ &msg->target,
payload);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (client);
}
static void
cleanup_neighbor (struct DirectNeighbor *neighbor)
{
- struct PendingMessage *pending;
-
- while (NULL != (pending = neighbor->pm_head))
- {
- neighbor->pm_queue_size--;
- GNUNET_CONTAINER_DLL_remove (neighbor->pm_head,
- neighbor->pm_tail,
- pending);
- GNUNET_free (pending);
- }
handle_direct_disconnect (neighbor);
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_remove (direct_neighbors,
*
* @param cls closure
* @param peer peer identity this notification is about
+ * @param internal_cls the corresponding `struct DirectNeighbor`
*/
static void
-handle_core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+handle_core_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ void *internal_cls)
{
- struct DirectNeighbor *neighbor;
+ struct DirectNeighbor *neighbor = internal_cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received core peer disconnect message for peer `%s'!\n",
GNUNET_i2s (peer));
/* Check for disconnect from self message */
- if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
- return;
- neighbor =
- GNUNET_CONTAINER_multipeermap_get (direct_neighbors, peer);
if (NULL == neighbor)
- {
- GNUNET_break (0);
return;
- }
GNUNET_break (GNUNET_YES == neighbor->connected);
neighbor->connected = GNUNET_NO;
if (DIRECT_NEIGHBOR_COST == neighbor->distance)
{
-
GNUNET_STATISTICS_update (stats,
"# peers connected (1-hop)",
- -1, GNUNET_NO);
+ -1,
+ GNUNET_NO);
}
cleanup_neighbor (neighbor);
-
if (GNUNET_YES == in_shutdown)
return;
schedule_refresh_routes ();
void *value)
{
struct DirectNeighbor *neighbor = value;
+
cleanup_neighbor (neighbor);
return GNUNET_YES;
}
* Task run during shutdown.
*
* @param cls unused
- * @param tc unused
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
unsigned int i;
GNUNET_ATS_performance_done (ats);
ats = NULL;
GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors,
- &free_direct_neighbors, NULL);
+ &free_direct_neighbors,
+ NULL);
GNUNET_CONTAINER_multipeermap_iterate (all_routes,
- &free_route, NULL);
+ &free_route,
+ NULL);
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);
+ GNUNET_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)
+ if (NULL != rr_task)
{
GNUNET_SCHEDULER_cancel (rr_task);
- rr_task = GNUNET_SCHEDULER_NO_TASK;
+ rr_task = NULL;
}
}
/**
* Notify newly connected client about an existing route.
*
- * @param cls the `struct GNUNET_SERVER_Client *`
+ * @param cls the `struct GNUNET_SERVICE_Client *`
* @param key peer identity
* @param value the `struct Route *`
* @return #GNUNET_OK (continue to iterate)
*/
static int
-add_route (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
+notify_client_about_route (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
- struct GNUNET_SERVER_Client *client = cls;
+ struct GNUNET_SERVICE_Client *client = 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);
- cm.peer = route->target.peer;
-
- GNUNET_SERVER_notification_context_unicast (nc,
- client,
- &cm.header,
- GNUNET_NO);
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_DV_ConnectMessage *cm;
+
+ env = GNUNET_MQ_msg (cm,
+ GNUNET_MESSAGE_TYPE_DV_CONNECT);
+ cm->distance = htonl (route->target.distance);
+ cm->peer = route->target.peer;
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
return GNUNET_OK;
}
* @param message the actual message
*/
static void
-handle_start (void *cls, struct GNUNET_SERVER_Client *client,
+handle_start (void *cls,
const struct GNUNET_MessageHeader *message)
{
- GNUNET_SERVER_notification_context_add (nc, client);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ struct GNUNET_SERVICE_Client *client = cls;
+
+ GNUNET_notification_context_add (nc,
+ GNUNET_SERVICE_client_get_mq (client));
+ GNUNET_SERVICE_client_continue (client);
GNUNET_CONTAINER_multipeermap_iterate (all_routes,
- &add_route,
+ ¬ify_client_about_route,
client);
}
* Process dv requests.
*
* @param cls closure
- * @param server the initialized server
* @param c configuration to use
+ * @param service the initialized service
*/
static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ struct GNUNET_SERVICE_Handle *service)
{
- static struct GNUNET_CORE_MessageHandler core_handlers[] = {
- {&handle_dv_route_message, GNUNET_MESSAGE_TYPE_DV_ROUTE, 0},
- {NULL, 0, 0}
- };
- static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = {
- {&handle_start, NULL,
- GNUNET_MESSAGE_TYPE_DV_START,
- sizeof (struct GNUNET_MessageHeader) },
- { &handle_dv_send_message, NULL,
- GNUNET_MESSAGE_TYPE_DV_SEND,
- 0},
- {NULL, NULL, 0, 0}
+ struct GNUNET_MQ_MessageHandler core_handlers[] = {
+ GNUNET_MQ_hd_var_size (dv_route_message,
+ GNUNET_MESSAGE_TYPE_DV_ROUTE,
+ struct RouteMessage,
+ NULL),
+ GNUNET_MQ_handler_end ()
};
in_shutdown = GNUNET_NO;
cfg = c;
- 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,
+ 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,
&handle_core_connect,
&handle_core_disconnect,
- NULL, GNUNET_NO,
- NULL, GNUNET_NO,
core_handlers);
if (NULL == core_api)
return;
- ats = GNUNET_ATS_performance_init (cfg, &handle_ats_update, NULL);
+ ats = GNUNET_ATS_performance_init (cfg,
+ &handle_ats_update,
+ NULL);
if (NULL == ats)
{
GNUNET_CORE_disconnect (core_api);
core_api = NULL;
return;
}
- nc = GNUNET_SERVER_notification_context_create (server,
- MAX_QUEUE_SIZE_PLUGIN);
- stats = GNUNET_STATISTICS_create ("dv", cfg);
- GNUNET_SERVER_add_handlers (server, plugin_handlers);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task, NULL);
+ nc = GNUNET_notification_context_create (MAX_QUEUE_SIZE_PLUGIN);
+ stats = GNUNET_STATISTICS_create ("dv",
+ cfg);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
}
/**
- * The main function for the dv service.
+ * Callback called when a client connects to the service.
*
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * @param cls closure for the service
+ * @param c the new client that connected to the service
+ * @param mq the message queue used to send messages to the client
+ * @return @a c
+ */
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ struct GNUNET_MQ_Handle *mq)
+{
+ return c;
+}
+
+
+/**
+ * Callback called when a client disconnected from the service
+ *
+ * @param cls closure for the service
+ * @param c the client that disconnected
+ * @param internal_cls should be equal to @a c
*/
-int
-main (int argc, char *const *argv)
+static void
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ void *internal_cls)
{
- return (GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "dv", GNUNET_SERVICE_OPTION_NONE,
- &run, NULL)) ? 0 : 1;
+ GNUNET_assert (c == internal_cls);
}
+
+/**
+ * Define "main" method using service macro.
+ */
+GNUNET_SERVICE_MAIN
+("dv",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_fixed_size (start,
+ GNUNET_MESSAGE_TYPE_DV_START,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_hd_var_size (dv_send_message,
+ GNUNET_MESSAGE_TYPE_DV_SEND,
+ struct GNUNET_DV_SendMessage,
+ NULL),
+ GNUNET_MQ_handler_end ());
+
+
/* end of gnunet-service-dv.c */
projects / oweals / gnunet.git / blobdiff