[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23294 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23294 - gnunet/src/mesh |
Date: |
Sat, 18 Aug 2012 04:04:55 +0200 |
Author: bartpolot
Date: 2012-08-18 04:04:55 +0200 (Sat, 18 Aug 2012)
New Revision: 23294
Modified:
gnunet/src/mesh/mesh_api.c
Log:
- refactoring, more debug
Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c 2012-08-18 01:05:24 UTC (rev 23293)
+++ gnunet/src/mesh/mesh_api.c 2012-08-18 02:04:55 UTC (rev 23294)
@@ -388,9 +388,17 @@
for (th = h->th_head; NULL != th; th = th->next)
{
t = th->tunnel;
- if (GNUNET_NO == th_is_payload (th) ||
- GNUNET_NO == GMC_is_pid_bigger(t->next_send_pid, t->max_send_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;
}
@@ -1307,7 +1315,7 @@
if (GNUNET_YES == th_is_payload (th))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " payload\n");
- if (t->max_send_pid < t->next_send_pid && GNUNET_NO == PID_OVERFLOW
(t->next_send_pid, t->max_send_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;
@@ -1454,6 +1462,8 @@
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;
@@ -1461,9 +1471,10 @@
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);
+ 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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23294 - gnunet/src/mesh,
gnunet <=