* @author Bartlomiej Polot
*
* STRUCTURE:
- * - CONSTANTS
* - DATA STRUCTURES
* - DECLARATIONS
* - AUXILIARY FUNCTIONS
#define LOG(kind,...) GNUNET_log_from (kind, "mesh-api",__VA_ARGS__)
-/******************************************************************************/
-/************************ CONSTANTS ****************************/
-/******************************************************************************/
-
-#define HIGH_PID 0xFFFF0000
-#define LOW_PID 0x0000FFFF
-
-#define PID_OVERFLOW(pid, max) (pid > HIGH_PID && max < LOW_PID)
-
/******************************************************************************/
/************************ DATA STRUCTURES ****************************/
/******************************************************************************/
}
+/**
+ * Check whether there is any message ready in the queue and find the size.
+ *
+ * @param h Mesh handle.
+ *
+ * @return The size of the first ready message in the queue,
+ * 0 if there is none.
+ */
+static size_t
+message_ready_size (struct GNUNET_MESH_Handle *h)
+{
+ struct GNUNET_MESH_TransmitHandle *th;
+ struct GNUNET_MESH_Tunnel *t;
+
+ for (th = h->th_head; NULL != th; th = th->next)
+ {
+ t = th->tunnel;
+ if (GNUNET_NO == th_is_payload (th) ||
+ (t->max_pid > t->pid || PID_OVERFLOW (t->pid, t->max_pid)))
+ return th->size;
+ }
+ return 0;
+}
+
+
/**
* Get the tunnel handler for the tunnel specified by id from the given handle
* @param h Mesh handle
{
t->tid = tid;
}
+ t->max_pid = 1;
return t;
}
/* if there are no more pending requests with mesh service, cancel active request */
/* Note: this should be unnecessary... */
- if ( (NULL == h->th_head) && (NULL != h->th))
+ if ((0 == message_ready_size (h)) && (NULL != h->th))
{
GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
h->th = NULL;
/**
* Notify client that the transmission has timed out
+ *
* @param cls closure
* @param tc task context
*/
mesh = th->tunnel->mesh;
GNUNET_CONTAINER_DLL_remove (mesh->th_head, mesh->th_tail, th);
+ th->tunnel->packet_size = 0;
if (GNUNET_YES == th_is_payload (th))
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
- if ((NULL == mesh->th_head) && (NULL != mesh->th))
+ if ((0 == message_ready_size (mesh)) && (NULL != mesh->th))
{
- /* queue empty, no point in asking for transmission */
+ /* nothing ready to transmit, no point in asking for transmission */
GNUNET_CLIENT_notify_transmit_ready_cancel (mesh->th);
mesh->th = NULL;
}
struct GNUNET_MESH_Tunnel *tunnel);
+/**
+ * Send an ack on the tunnel to confirm the processing of a message.
+ *
+ * @param h Mesh handle.
+ * @param t Tunnel on which to send the ACK.
+ */
+static void
+send_ack (struct GNUNET_MESH_Handle *h, struct GNUNET_MESH_Tunnel *t)
+{
+ struct GNUNET_MESH_LocalAck msg;
+
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK);
+ msg.header.size = htons (sizeof (msg));
+ msg.tunnel_id = htonl (t->tid);
+ msg.max_pid = t->pid + 1;
+
+ send_packet (h, &msg.header, t);
+ return;
+}
+
+
+
/**
* Reconnect callback: tries to reconnect again after a failer previous
* reconnecttion
LOG (GNUNET_ERROR_TYPE_DEBUG, "*****************************\n");
LOG (GNUNET_ERROR_TYPE_DEBUG, "******* RECONNECT *******\n");
LOG (GNUNET_ERROR_TYPE_DEBUG, "*****************************\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "******** on %p *******\n", h);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "*****************************\n");
- h->in_receive = GNUNET_NO;
/* disconnect */
if (NULL != h->th)
{
reconnect (struct GNUNET_MESH_Handle *h)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Requested RECONNECT\n");
+ h->in_receive = GNUNET_NO;
if (GNUNET_SCHEDULER_NO_TASK == h->reconnect_task)
h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->reconnect_time,
&reconnect_cbk, h);
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"callback completed successfully\n");
+ send_ack (h, t);
}
}
}
return;
}
ack = ntohl (msg->max_pid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X, ack %u!\n", t->tid, ack);
if (ack > t->max_pid || PID_OVERFLOW (t->max_pid, ack))
t->max_pid = ack;
+ else
+ return;
if (NULL == h->th && 0 < t->packet_size)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " tmt rdy was NULL, requesting!\n", t->tid, ack);
h->th =
GNUNET_CLIENT_notify_transmit_ready (h->client, t->packet_size,
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_YES, &send_callback, h);
+ }
}
reconnect (h);
return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "received a message type %hu from MESH\n",
- ntohs (msg->type));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "received a message type %s from MESH\n",
+ GNUNET_MESH_DEBUG_M2S (ntohs (msg->type)));
switch (ntohs (msg->type))
{
/* Notify of a new incoming tunnel */
default:
/* We shouldn't get any other packages, log and ignore */
LOG (GNUNET_ERROR_TYPE_WARNING,
- "unsolicited message form service (type %d)\n",
+ "unsolicited message form service (type %hu)\n",
ntohs (msg->type));
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "message processed\n");
- GNUNET_CLIENT_receive (h->client, &msg_received, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
+ if (GNUNET_YES == h->in_receive)
+ {
+ GNUNET_CLIENT_receive (h->client, &msg_received, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "in receive off, not calling CLIENT_receive\n");
+ }
}
if (GNUNET_YES == th_is_payload (th))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " payload\n");
- if (t->max_pid < t->pid && ! PID_OVERFLOW (t->pid, t->max_pid)) {
+ if (t->max_pid < t->pid && GNUNET_NO == PID_OVERFLOW (t->pid, t->max_pid))
+ {
/* This tunnel is not ready to transmit yet, try next message */
next = th->next;
continue;
GNUNET_assert (size >= th->size);
mh = (struct GNUNET_MessageHeader *) &cbuf[sizeof (to)];
psize = th->notify (th->notify_cls, size - sizeof (to), mh);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " to origin, type %u\n",
- ntohs (mh->type));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " to origin, type %s\n",
+ GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
if (psize > 0)
{
psize += sizeof (to);
GNUNET_assert (size >= th->size);
mh = (struct GNUNET_MessageHeader *) &cbuf[sizeof (mc)];
psize = th->notify (th->notify_cls, size - sizeof (mc), mh);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " multicast, type %u\n",
- ntohs (mh->type));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " multicast, type %s\n",
+ GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
if (psize > 0)
{
psize += sizeof (mc);
GNUNET_assert (size >= th->size);
mh = (struct GNUNET_MessageHeader *) &cbuf[sizeof (uc)];
psize = th->notify (th->notify_cls, size - sizeof (uc), mh);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " unicast, type %u\n",
- ntohs (mh->type));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " unicast, type %s\n",
+ GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
if (psize > 0)
{
psize += sizeof (uc);
{
struct GNUNET_MessageHeader *mh = (struct GNUNET_MessageHeader *) &th[1];
- LOG (GNUNET_ERROR_TYPE_DEBUG, " mesh traffic, type %u\n",
- ntohs (mh->type));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " mesh traffic, type %s\n",
+ GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
memcpy (cbuf, &th[1], th->size);
psize = th->size;
}
}
LOG (GNUNET_ERROR_TYPE_DEBUG, " total size: %u\n", tsize);
h->th = NULL;
- if (NULL != h->th_head)
+ size = message_ready_size (h);
+ if (0 != size)
{
- int request = GNUNET_NO;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, " head not empty\n");
- for (th = h->th_head; NULL != th; th = th->next)
- {
- struct GNUNET_MESH_Tunnel *t = th->tunnel;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, " [%p] notify: %p, size %u\n",
- th, th->notify, th->size);
- GNUNET_assert (NULL != t);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " pid %u, max %u\n", t->pid, t->max_pid);
-
- if (GNUNET_NO == th_is_payload (th) ||
- (t->max_pid >= t->pid || PID_OVERFLOW (t->pid, t->max_pid)))
- {
- request = GNUNET_YES;
- break;
- }
- }
-
- if (GNUNET_YES == request)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " next size: %u\n", th->size);
- h->th =
- GNUNET_CLIENT_notify_transmit_ready (h->client, th->size,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_YES, &send_callback, h);
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " nothing left to transmit\n");
- }
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " next size: %u\n", size);
+ h->th =
+ GNUNET_CLIENT_notify_transmit_ready (h->client, size,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_YES, &send_callback, h);
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " nothing left to transmit\n");
}
if (GNUNET_NO == h->in_receive)
{
add_to_queue (tunnel->mesh, th);
if (NULL != tunnel->mesh->th)
return th;
+ if (GNUNET_NO == PID_OVERFLOW(tunnel->pid, tunnel->max_pid) &&
+ tunnel->max_pid <= tunnel->pid)
+ return th;
LOG (GNUNET_ERROR_TYPE_DEBUG, " call notify tmt rdy\n");
tunnel->mesh->th =
GNUNET_CLIENT_notify_transmit_ready (tunnel->mesh->client, th->size,
{
struct GNUNET_MESH_Handle *mesh;
+ th->tunnel->packet_size = 0;
mesh = th->tunnel->mesh;
if (th->timeout_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (th->timeout_task);
GNUNET_CONTAINER_DLL_remove (mesh->th_head, mesh->th_tail, th);
GNUNET_free (th);
- if ((NULL == mesh->th_head) && (NULL != mesh->th))
+ if ((0 == message_ready_size (mesh)) && (NULL != mesh->th))
{
/* queue empty, no point in asking for transmission */
GNUNET_CLIENT_notify_transmit_ready_cancel (mesh->th);