#define LOG(kind,...) GNUNET_log_from (kind, "mesh-api",__VA_ARGS__)
+#define DEBUG_ACK GNUNET_YES
/******************************************************************************/
/************************ DATA STRUCTURES ****************************/
* Task for trying to reconnect.
*/
GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+
+#if DEBUG_ACK
+ unsigned int acks_sent;
+ unsigned int acks_recv;
+#endif
};
int buffering;
/**
- * Next packet PID.
+ * Next packet ID to send.
*/
- uint32_t pid;
+ uint32_t next_send_pid;
/**
- * Maximum allowed PID.
+ * Maximum allowed PID to send (ACK recevied).
*/
- uint32_t max_pid;
+ uint32_t max_send_pid;
+ /**
+ * Last pid received from the service.
+ */
+ uint32_t last_recv_pid;
+ /**
+ * Which ACK value have we last sent to the service?
+ */
+ uint32_t max_recv_pid;
};
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)))
+ if (GNUNET_NO == th_is_payload (th))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " message internal\n");
return th->size;
+ }
+ if (GNUNET_NO == GMC_is_pid_bigger(t->next_send_pid, t->max_send_pid))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " message payload ok (%u <= %u)\n",
+ t->next_send_pid, t->max_send_pid);
+ return th->size;
+ }
}
return 0;
}
{
t->tid = tid;
}
- t->max_pid = 1;
+ t->max_send_pid = INITIAL_WINDOW_SIZE - 1;
+ t->last_recv_pid = (uint32_t) -1;
return t;
}
/**
- * Add a transmit handle to the transmission queue by priority and set the
+ * Add a transmit handle to the transmission queue and set the
* timeout if needed.
*
* @param h mesh handle with the queue head and tail
add_to_queue (struct GNUNET_MESH_Handle *h,
struct GNUNET_MESH_TransmitHandle *th)
{
- struct GNUNET_MESH_TransmitHandle *p;
-
- p = h->th_head;
- while ((NULL != p))
- p = p->next;
- if (NULL == p)
- p = h->th_tail;
- else
- p = p->prev;
- GNUNET_CONTAINER_DLL_insert_after (h->th_head, h->th_tail, p, th);
+ GNUNET_CONTAINER_DLL_insert_tail (h->th_head, h->th_tail, th);
if (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value == th->timeout.abs_value)
return;
th->timeout_task =
send_ack (struct GNUNET_MESH_Handle *h, struct GNUNET_MESH_Tunnel *t)
{
struct GNUNET_MESH_LocalAck msg;
+ uint32_t delta;
+ delta = t->max_recv_pid - t->last_recv_pid;
+ if (delta > ACK_THRESHOLD)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Not sending ACK on tunnel %X: ACK: %u, PID: %u, buffer %u\n",
+ t->tid, t->max_recv_pid, t->last_recv_pid, delta);
+ return;
+ }
+ t->max_recv_pid = t->last_recv_pid + INITIAL_WINDOW_SIZE;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Sending ACK on tunnel %X: %u\n",
- t->tid, t->pid + 1);
+ t->tid, t->max_recv_pid);
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;
+ msg.max_pid = htonl (t->max_recv_pid);
+
+#if DEBUG_ACK
+ t->mesh->acks_sent++;
+#endif
send_packet (h, &msg.header, t);
return;
for (napps = 0; napps < h->n_applications; napps++)
{
apps[napps] = htonl (h->applications[napps]);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " app %u\n", h->applications[napps]);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " app %u\n",
+ h->applications[napps]);
}
types = (uint16_t *) & apps[napps];
for (ntypes = 0; ntypes < h->n_handlers; ntypes++)
+ {
types[ntypes] = htons (h->message_handlers[ntypes].type);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " type %u\n",
+ h->message_handlers[ntypes].type);
+ }
msg->applications = htons (napps);
msg->types = htons (ntypes);
LOG (GNUNET_ERROR_TYPE_DEBUG,
*/
continue;
}
+ t->next_send_pid = 0;
+ t->max_send_pid = INITIAL_WINDOW_SIZE - 1;
+ t->last_recv_pid = (uint32_t) -1;
tmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
tmsg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));
tmsg.tunnel_id = htonl (t->tid);
struct GNUNET_MESH_ToOrigin *to_orig;
struct GNUNET_MESH_Tunnel *t;
unsigned int i;
+ uint32_t pid;
uint16_t type;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Got a data message!\n");
t = retrieve_tunnel (h, ntohl (ucast->tid));
payload = (struct GNUNET_MessageHeader *) &ucast[1];
peer = &ucast->oid;
+ pid = ntohl (ucast->pid);
LOG (GNUNET_ERROR_TYPE_DEBUG, " ucast on tunnel %s [%X]\n",
GNUNET_i2s (peer), ntohl (ucast->tid));
break;
t = retrieve_tunnel (h, ntohl (mcast->tid));
payload = (struct GNUNET_MessageHeader *) &mcast[1];
peer = &mcast->oid;
+ pid = ntohl (mcast->pid);
LOG (GNUNET_ERROR_TYPE_DEBUG, " mcast on tunnel %s [%X]\n",
GNUNET_i2s (peer), ntohl (mcast->tid));
break;
t = retrieve_tunnel (h, ntohl (to_orig->tid));
payload = (struct GNUNET_MessageHeader *) &to_orig[1];
peer = &to_orig->sender;
+ pid = ntohl (to_orig->pid);
LOG (GNUNET_ERROR_TYPE_DEBUG, " torig on tunnel %s [%X]\n",
GNUNET_i2s (peer), ntohl (to_orig->tid));
break;
GNUNET_break (0);
return GNUNET_YES;
}
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " pid %u\n", pid);
if (NULL == t)
{
/* Tunnel was ignored, probably service didn't get it yet */
LOG (GNUNET_ERROR_TYPE_DEBUG, " ignored!\n");
return GNUNET_YES;
}
+ if (GNUNET_YES ==
+ GMC_is_pid_bigger(pid, t->max_recv_pid))
+ {
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING, " unauthorized message!\n");
+ // FIXME fc what now? accept? reject?
+ return GNUNET_YES;
+ }
+ t->last_recv_pid = pid;
type = ntohs (payload->type);
+ send_ack (h, t);
for (i = 0; i < h->n_handlers; i++)
{
handler = &h->message_handlers[i];
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"callback completed successfully\n");
- send_ack (h, t);
}
}
}
uint32_t ack;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Got an ACK!\n");
+ h->acks_recv++;
msg = (struct GNUNET_MESH_LocalAck *) message;
t = retrieve_tunnel (h, ntohl (msg->tunnel_id));
}
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;
+ if (GNUNET_YES == GMC_is_pid_bigger(ack, t->max_send_pid))
+ t->max_send_pid = ack;
else
return;
if (NULL == h->th && 0 < t->packet_size)
char *cbuf = buf;
size_t tsize;
size_t psize;
+ size_t nsize;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "\n");
LOG (GNUNET_ERROR_TYPE_DEBUG, "Send packet() Buffer %u\n", size);
if ((0 == size) || (NULL == buf))
{
}
tsize = 0;
next = h->th_head;
- while ((NULL != (th = next)) && (size >= th->size))
+ nsize = message_ready_size (h);
+ while ((NULL != (th = next)) && (0 < nsize) && (size >= nsize))
{
t = th->tunnel;
if (GNUNET_YES == th_is_payload (th))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " payload\n");
- if (t->max_pid < t->pid && GNUNET_NO == PID_OVERFLOW (t->pid, t->max_pid))
+ if (GNUNET_YES == GMC_is_pid_bigger(t->next_send_pid, t->max_send_pid))
{
/* This tunnel is not ready to transmit yet, try next message */
next = th->next;
to.header.size = htons (psize);
to.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
to.tid = htonl (t->tid);
- to.pid = htonl (t->pid);
+ to.pid = htonl (t->next_send_pid);
+ to.ttl = 0;
memset (&to.oid, 0, sizeof (struct GNUNET_PeerIdentity));
memset (&to.sender, 0, sizeof (struct GNUNET_PeerIdentity));
memcpy (cbuf, &to, sizeof (to));
mc.header.size = htons (psize);
mc.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_MULTICAST);
mc.tid = htonl (t->tid);
- mc.pid = htonl (t->pid);
+ mc.pid = htonl (t->next_send_pid);
mc.ttl = 0;
memset (&mc.oid, 0, sizeof (struct GNUNET_PeerIdentity));
memcpy (cbuf, &mc, sizeof (mc));
uc.header.size = htons (psize);
uc.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_UNICAST);
uc.tid = htonl (t->tid);
- uc.pid = htonl (t->pid);
+ uc.pid = htonl (t->next_send_pid);
memset (&uc.oid, 0, sizeof (struct GNUNET_PeerIdentity));
GNUNET_PEER_resolve (th->target, &uc.destination);
memcpy (cbuf, &uc, sizeof (uc));
}
}
- t->pid++;
+ t->next_send_pid++;
}
else
{
struct GNUNET_MessageHeader *mh = (struct GNUNET_MessageHeader *) &th[1];
LOG (GNUNET_ERROR_TYPE_DEBUG, " mesh traffic, type %s\n",
- GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
+ GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
memcpy (cbuf, &th[1], th->size);
psize = th->size;
}
GNUNET_CONTAINER_DLL_remove (h->th_head, h->th_tail, th);
GNUNET_free (th);
next = h->th_head;
+ nsize = message_ready_size (h);
cbuf += psize;
size -= psize;
tsize += psize;
}
else
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " nothing left to transmit\n");
+ if (NULL != h->th_head)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " can't transmit any more\n");
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " nothing left to transmit\n");
}
if (GNUNET_NO == h->in_receive)
{
struct GNUNET_MESH_TransmitHandle *th;
size_t msize;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " Sending message to service: %s\n",
+ GNUNET_MESH_DEBUG_M2S(ntohs(msg->type)));
msize = ntohs (msg->size);
th = GNUNET_malloc (sizeof (struct GNUNET_MESH_TransmitHandle) + msize);
th->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
th->tunnel = tunnel;
memcpy (&th[1], msg, msize);
add_to_queue (h, th);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " queued\n");
if (NULL != h->th)
return;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " calling ntfy tmt rdy for %u bytes\n", msize);
h->th =
GNUNET_CLIENT_notify_transmit_ready (h->client, msize,
GNUNET_TIME_UNIT_FOREVER_REL,
LOG (GNUNET_ERROR_TYPE_DEBUG, "MESH DISCONNECT\n");
+#if DEBUG_ACK
+ LOG (GNUNET_ERROR_TYPE_INFO, "Sent %d ACKs\n", handle->acks_sent);
+ LOG (GNUNET_ERROR_TYPE_INFO, "Recv %d ACKs\n\n", handle->acks_recv);
+#endif
+
t = handle->tunnels_head;
while (NULL != t)
{
size_t overhead;
GNUNET_assert (NULL != tunnel);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "mesh notify transmit ready called\n");
- if (NULL != target)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "MESH NOTIFY TRANSMIT READY\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X\n", tunnel->tid);
+ if (tunnel->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " to origin\n");
+ else if (NULL != target)
LOG (GNUNET_ERROR_TYPE_DEBUG, " target %s\n", GNUNET_i2s (target));
else
LOG (GNUNET_ERROR_TYPE_DEBUG, " target multicast\n");
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)
+ if (GMC_is_pid_bigger(tunnel->next_send_pid, tunnel->max_send_pid))
return th;
LOG (GNUNET_ERROR_TYPE_DEBUG, " call notify tmt rdy\n");
tunnel->mesh->th =
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_YES, &send_callback,
tunnel->mesh);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "MESH NOTIFY TRANSMIT READY END\n");
return th;
}
projects / oweals / gnunet.git / blobdiff