[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21767 - gnunet/src/mesh
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r21767 - gnunet/src/mesh |
|
Date: |
Tue, 5 Jun 2012 16:07:12 +0200 |
Author: bartpolot
Date: 2012-06-05 16:07:12 +0200 (Tue, 05 Jun 2012)
New Revision: 21767
Modified:
gnunet/src/mesh/gnunet-service-mesh_new.c
Log:
- WiP new mesh service
Modified: gnunet/src/mesh/gnunet-service-mesh_new.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_new.c 2012-06-05 13:43:30 UTC (rev
21766)
+++ gnunet/src/mesh/gnunet-service-mesh_new.c 2012-06-05 14:07:12 UTC (rev
21767)
@@ -137,11 +137,6 @@
struct MeshPeerInfo *peer;
/**
- * Handle to stop queued transmission
- */
- struct GNUNET_CORE_TransmitHandle *core_transmit;
-
- /**
* Pointer to info stucture used as cls.
*/
void *cls;
@@ -150,6 +145,11 @@
* Type of message
*/
uint16_t type;
+
+ /**
+ * Size of the message
+ */
+ size_t size;
};
@@ -168,9 +168,6 @@
/** Ultimate destination of the packet */
GNUNET_PEER_Id destination;
- /** Which handler was used to request the transmission */
- struct MeshPeerQueue *queue;
-
/** Data descriptor */
struct MeshData* mesh_data;
};
@@ -238,6 +235,11 @@
* Number of tunnels this peers participates in
*/
unsigned int ntunnels;
+
+ /**
+ * Handle to stop queued transmission
+ */
+ struct GNUNET_CORE_TransmitHandle *core_transmit;
};
@@ -431,11 +433,6 @@
* Path itself
*/
struct MeshPeerPath *path;
-
- /**
- * Position in peer's transmit queue
- */
- struct MeshPeerQueue *queue;
};
@@ -1161,37 +1158,6 @@
/**
- * Function called to notify a client about the socket
- * being ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure
- * @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
-send_core_create_path (void *cls, size_t size, void *buf);
-
-
-/**
- * Function called to notify a client about the socket
- * being ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure (data itself)
- * @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
-send_core_data_multicast (void *cls, size_t size, void *buf);
-
-
-/**
* Decrements the reference counter and frees all resources if needed
*
* @param mesh_data Data Descriptor used in a multicast message.
@@ -1224,61 +1190,6 @@
/**
- * Cancel a core transmission that was already queued, free all resources
- * associated to the request and cancel all external requests (core, ...).
- *
- * @param queue Queue handler to cancel.
- */
-static void
-peer_info_cancel_transmission (struct MeshPeerQueue *queue)
-{
- struct MeshTransmissionDescriptor *dd;
- struct MeshPathInfo *path_info;
- struct MeshPeerInfo *peer;
-
- peer = queue->peer;
- if (NULL != queue->core_transmit)
- {
-#if MESH_DEBUG
- {
- struct GNUNET_PeerIdentity id;
-
- GNUNET_PEER_resolve (peer->id, &id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " Cancelling data transmission at %s\n",
- GNUNET_i2s (&id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " message type %u\n",
- queue->type);
- }
-#endif
- GNUNET_CORE_notify_transmit_ready_cancel (queue->core_transmit);
- }
- /* TODO: notify that transmission has failed */
- switch (queue->type)
- {
- case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
- case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type payload\n");
- dd = queue->cls;
- data_descriptor_decrement_multicast (dd->mesh_data);
- break;
- case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type create path\n");
- path_info = queue->cls;
- path_destroy (path_info->path);
- break;
- default:
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type unknown!\n");
- }
- GNUNET_free_non_null (queue->cls);
- GNUNET_CONTAINER_DLL_remove (peer->queue_head, peer->queue_tail, queue);
- GNUNET_free(queue);
-}
-
-
-/**
* Retrieve the MeshPeerInfo stucture associated with the peer, create one
* and insert it in the appropiate structures if the peer is not known yet.
*
@@ -1356,6 +1267,17 @@
/**
+ * Queue and pass message to core when possible.
+ *
+ * @param cls Closure (type dependant).
+ * @param type Type of the message.
+ * @param size Size of the message.
+ * @param dst Neighbor to send message to.
+ */
+static void
+queue_add (void *cls, uint16_t type, size_t size, struct MeshPeerInfo *dst);
+
+/**
* Core callback to write a pre-constructed data packet to core buffer
*
* @param cls Closure (MeshTransmissionDescriptor with data in "data" member).
@@ -1369,33 +1291,21 @@
{
struct MeshTransmissionDescriptor *info = cls;
struct GNUNET_MessageHeader *msg;
- struct MeshPeerQueue *queue;
size_t total_size;
GNUNET_assert (NULL != info);
GNUNET_assert (NULL != info->mesh_data);
msg = (struct GNUNET_MessageHeader *) info->mesh_data->data;
total_size = ntohs (msg->size);
- queue = info->queue;
if (total_size > size)
{
- struct GNUNET_PeerIdentity id;
-
- GNUNET_PEER_resolve (info->peer->id, &id);
- queue->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 100,
- GNUNET_TIME_UNIT_FOREVER_REL, &id,
- size, &send_core_data_raw, info);
+ GNUNET_break (0);
return 0;
}
memcpy (buf, msg, total_size);
GNUNET_free (info->mesh_data);
GNUNET_free (info);
- GNUNET_CONTAINER_DLL_remove (queue->peer->queue_head,
- queue->peer->queue_tail,
- queue);
- GNUNET_free (queue);
return total_size;
}
@@ -1414,7 +1324,6 @@
const struct GNUNET_PeerIdentity *peer)
{
struct MeshTransmissionDescriptor *info;
- struct MeshPeerQueue *queue;
struct MeshPeerInfo *neighbor;
struct MeshPeerPath *p;
size_t size;
@@ -1443,19 +1352,11 @@
GNUNET_free (info);
return;
}
- queue = GNUNET_malloc (sizeof(struct MeshPeerQueue));
- queue->peer = neighbor;
- info->queue = queue;
info->peer = neighbor;
- queue->type = GNUNET_MESSAGE_TYPE_MESH_UNICAST;
- queue->cls = info;
- queue->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 100,
- GNUNET_TIME_UNIT_FOREVER_REL, peer,
- size, &send_core_data_raw, info);
- GNUNET_CONTAINER_DLL_insert (neighbor->queue_head,
- neighbor->queue_tail,
- queue);
+ queue_add (info,
+ GNUNET_MESSAGE_TYPE_MESH_UNICAST,
+ size,
+ neighbor);
}
@@ -1474,7 +1375,6 @@
struct GNUNET_PeerIdentity id;
struct MeshPathInfo *path_info;
struct MeshPeerInfo *neighbor;
- struct MeshPeerQueue *queue;
unsigned int i;
@@ -1500,28 +1400,16 @@
}
GNUNET_PEER_resolve (p->peers[i + 1], &id);
- queue = GNUNET_malloc (sizeof(struct MeshPeerQueue));
path_info = GNUNET_malloc (sizeof (struct MeshPathInfo));
path_info->path = p;
path_info->t = t;
neighbor = peer_info_get (&id);
path_info->peer = neighbor;
- path_info->queue = queue;
- queue->type = GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE;
- queue->cls = path_info;
- queue->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle, /* handle */
- 0, /* cork */
- 0, /* priority */
- GNUNET_TIME_UNIT_FOREVER_REL, /*
timeout */
- &id, /* target */
- sizeof (struct
GNUNET_MESH_ManipulatePath) +
- (p->length * sizeof (struct
GNUNET_PeerIdentity)), /*size */
- &send_core_create_path, /* callback */
- path_info); /* cls */
- GNUNET_CONTAINER_DLL_insert (neighbor->queue_head,
- neighbor->queue_tail,
- queue);
+ queue_add (path_info,
+ GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE,
+ sizeof (struct GNUNET_MESH_ManipulatePath) +
+ (p->length * sizeof (struct GNUNET_PeerIdentity)),
+ neighbor);
}
@@ -2344,7 +2232,6 @@
struct MeshData *mdata = cls;
struct MeshTransmissionDescriptor *info;
struct GNUNET_PeerIdentity neighbor;
- struct MeshPeerQueue *queue;
info = GNUNET_malloc (sizeof (struct MeshTransmissionDescriptor));
@@ -2356,19 +2243,11 @@
GNUNET_i2s (&neighbor));
info->peer = peer_info_get (&neighbor);
GNUNET_assert (NULL != info->peer);
- queue = GNUNET_malloc (sizeof(struct MeshPeerQueue));
- info->queue = queue;
- queue->cls = info;
- queue->type = GNUNET_MESSAGE_TYPE_MESH_MULTICAST;
- queue->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &neighbor, info->mesh_data->data_len,
- &send_core_data_multicast, info);
- queue->peer = info->peer;
- GNUNET_CONTAINER_DLL_insert (queue->peer->queue_head,
- queue->peer->queue_tail,
- queue);
+ queue_add(info,
+ GNUNET_MESSAGE_TYPE_MESH_MULTICAST,
+ info->mesh_data->data_len,
+ info->peer
+ );
}
/**
@@ -2649,10 +2528,7 @@
/******************************************************************************/
/**
- * Function called to notify a client about the socket
- * being ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
+ * Function to send a create path packet to a peer.
*
* @param cls closure
* @param size number of bytes available in buf
@@ -2660,12 +2536,11 @@
* @return number of bytes written to buf
*/
static size_t
-send_core_create_path (void *cls, size_t size, void *buf)
+send_core_path_create (void *cls, size_t size, void *buf)
{
struct MeshPathInfo *info = cls;
struct GNUNET_MESH_ManipulatePath *msg;
struct GNUNET_PeerIdentity *peer_ptr;
- struct MeshPeerInfo *peer = info->peer;
struct MeshTunnel *t = info->t;
struct MeshPeerPath *p = info->path;
size_t size_needed;
@@ -2678,17 +2553,7 @@
if (size < size_needed || NULL == buf)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "create path retransmit!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " buf: %p\n", buf);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " size: (%u/%u)\n", size,
- size_needed);
- info->queue->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- tree_get_first_hop (t->tree,
- peer->id),
- size_needed, &send_core_create_path,
- info);
+ GNUNET_break (0);
return 0;
}
msg = (struct GNUNET_MESH_ManipulatePath *) buf;
@@ -2703,10 +2568,6 @@
}
path_destroy (p);
- GNUNET_CONTAINER_DLL_remove(info->queue->peer->queue_head,
- info->queue->peer->queue_tail,
- info->queue);
- GNUNET_free (info->queue);
GNUNET_free (info);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2716,10 +2577,7 @@
/**
- * Function called to notify a client about the socket
- * being ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
+ * Fill the core buffer
*
* @param cls closure (data itself)
* @param size number of bytes available in buf
@@ -2741,18 +2599,7 @@
if (total_size > size)
{
- /* Retry */
- struct GNUNET_PeerIdentity id;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Multicast: retransmitting... (%u/%u)\n", size,
- total_size);
- GNUNET_PEER_resolve (info->peer->id, &id);
- info->queue->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL, &id,
- total_size,
- &send_core_data_multicast, info);
+ GNUNET_break (0);
return 0;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " copying data...\n");
@@ -2781,10 +2628,6 @@
#endif
data_descriptor_decrement_multicast (info->mesh_data);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "freeing info...\n");
- GNUNET_CONTAINER_DLL_remove(info->queue->peer->queue_head,
- info->queue->peer->queue_tail,
- info->queue);
- GNUNET_free (info->queue);
GNUNET_free (info);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "return %u\n", total_size);
return total_size;
@@ -2792,10 +2635,7 @@
/**
- * Function called to notify a client about the socket
- * being ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
+ * Creates a path ack message in buf and frees all unused resources.
*
* @param cls closure (MeshTransmissionDescriptor)
* @param size number of bytes available in buf
@@ -2820,13 +2660,6 @@
msg->tid = htonl (info->origin->tid);
msg->peer_id = my_full_id;
- if (info->queue)
- {
- GNUNET_CONTAINER_DLL_remove(info->queue->peer->queue_head,
- info->queue->peer->queue_tail,
- info->queue);
- GNUNET_free (info->queue);
- }
GNUNET_free (info);
/* TODO add signature */
@@ -2835,6 +2668,170 @@
}
+/**
+ * Free a transmission that was already queued with all resources
+ * associated to the request.
+ *
+ * @param queue Queue handler to cancel.
+ */
+static void
+queue_destroy (struct MeshPeerQueue *queue)
+{
+ struct MeshTransmissionDescriptor *dd;
+ struct MeshPathInfo *path_info;
+ struct MeshPeerInfo *peer;
+
+ peer = queue->peer;
+ switch (queue->type)
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type payload\n");
+ dd = queue->cls;
+ data_descriptor_decrement_multicast (dd->mesh_data);
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type create path\n");
+ path_info = queue->cls;
+ path_destroy (path_info->path);
+ break;
+ default:
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type unknown!\n");
+ }
+ GNUNET_free_non_null (queue->cls);
+ GNUNET_CONTAINER_DLL_remove (peer->queue_head, peer->queue_tail, queue);
+ GNUNET_free(queue);
+}
+
+
+/**
+ * Core callback to write a queued packet to core buffer
+ *
+ * @param cls Closure (peer info).
+ * @param size Number of bytes available in buf.
+ * @param buf Where the to write the message.
+ *
+ * @return number of bytes written to buf
+ */
+static size_t
+queue_send (void *cls, size_t size, void *buf)
+{
+ struct MeshPeerInfo *peer = cls;
+ struct MeshPeerQueue *queue;
+ size_t data_size;
+
+ peer->core_transmit = NULL;
+ queue = peer->queue_head;
+
+ /* If queue is empty, send should have been cancelled */
+ if (NULL == queue)
+ {
+ GNUNET_break(0);
+ return 0;
+ }
+
+ /* Check if buffer size is enough for the message */
+ if (queue->size < size)
+ {
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve (peer->id, &id);
+ peer->core_transmit =
+ GNUNET_CORE_notify_transmit_ready(core_handle,
+ 0,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &id,
+ queue->size,
+ &queue_send,
+ peer);
+ return 0;
+ }
+
+ /* Fill buf */
+ switch (queue->type)
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
+ data_size = send_core_data_raw (queue->cls, size, buf);
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
+ data_size = send_core_data_multicast(queue->cls, size, buf);
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
+ data_size = 0;
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE:
+ data_size = send_core_path_create(queue->cls, size, buf);
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_ACK:
+ data_size = send_core_path_ack(queue->cls, size, buf);
+ break;
+ default:
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type unknown!\n");
+ data_size = 0;
+ }
+
+ /* Free resources */
+ queue_destroy(queue);
+
+ /* If more data in queue, send next */
+ if (NULL != peer->queue_head)
+ {
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve (peer->id, &id);
+ peer->core_transmit =
+ GNUNET_CORE_notify_transmit_ready(core_handle,
+ 0,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &id,
+ peer->queue_head->size,
+ &queue_send,
+ peer);
+ }
+ return data_size;
+}
+
+
+/**
+ * Queue and pass message to core when possible.
+ *
+ * @param cls Closure (type dependant).
+ * @param type Type of the message.
+ * @param size Size of the message.
+ * @param dst Neighbor to send message to.
+ */
+static void
+queue_add (void *cls, uint16_t type, size_t size, struct MeshPeerInfo *dst)
+{
+ struct MeshPeerQueue *queue;
+
+ queue = GNUNET_malloc (sizeof (struct MeshPeerQueue));
+ queue->cls = cls;
+ queue->type = type;
+ queue->size = size;
+ queue->peer = dst;
+ GNUNET_CONTAINER_DLL_insert_tail (dst->queue_head, dst->queue_tail, queue);
+ if (NULL == dst->core_transmit)
+ {
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve (dst->id, &id);
+ dst->core_transmit =
+ GNUNET_CORE_notify_transmit_ready(core_handle,
+ 0,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &id,
+ size,
+ &queue_send,
+ dst);
+ }
+}
+
+
/******************************************************************************/
/******************** MESH NETWORK HANDLERS
**************************/
/******************************************************************************/
@@ -2981,7 +2978,6 @@
{
/* It is for us! Send ack. */
struct MeshTransmissionDescriptor *info;
- struct MeshPeerQueue *queue;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " It's for us!\n");
peer_info_add_path_to_origin (orig_peer_info, path, GNUNET_NO);
@@ -2996,24 +2992,14 @@
peer_info_get
(&my_full_id),
GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE));
- /* FIXME use send_message */
info = GNUNET_malloc (sizeof (struct MeshTransmissionDescriptor));
info->origin = &t->id;
info->peer = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
GNUNET_assert (NULL != info->peer);
- queue = GNUNET_malloc (sizeof (struct MeshPeerQueue));
- info->queue = queue;
- queue->peer = info->peer;
- queue->type = GNUNET_MESSAGE_TYPE_MESH_PATH_ACK;
- queue->cls = info;
- queue->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 10,
- GNUNET_TIME_UNIT_FOREVER_REL, peer,
- sizeof (struct GNUNET_MESH_PathACK),
- &send_core_path_ack, info);
- GNUNET_CONTAINER_DLL_insert (queue->peer->queue_head,
- queue->peer->queue_tail,
- queue);
+ queue_add(info,
+ GNUNET_MESSAGE_TYPE_MESH_PATH_ACK,
+ sizeof (struct GNUNET_MESH_PathACK),
+ info->peer);
}
else
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21767 - gnunet/src/mesh,
gnunet <=