[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9077 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9077 - gnunet/src/transport |
Date: |
Fri, 2 Oct 2009 07:57:36 -0600 |
Author: grothoff
Date: 2009-10-02 07:57:34 -0600 (Fri, 02 Oct 2009)
New Revision: 9077
Modified:
gnunet/src/transport/transport_api.c
Log:
more assertions, etc.
Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c 2009-10-02 13:40:59 UTC (rev
9076)
+++ gnunet/src/transport/transport_api.c 2009-10-02 13:57:34 UTC (rev
9077)
@@ -381,7 +381,6 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Could not transmit to transport service, cancelling pending
requests\n");
#endif
- th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
th = h->connect_ready_head;
if (th->next != NULL)
th->next->prev = NULL;
@@ -391,9 +390,12 @@
GNUNET_assert (n->transmit_handle == th);
n->transmit_handle = NULL;
}
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != th->notify_delay_task);
- GNUNET_SCHEDULER_cancel (h->sched,
- th->notify_delay_task);
+ if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (h->sched,
+ th->notify_delay_task);
+ th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ }
GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
GNUNET_free (th);
if (h->connect_ready_head != NULL) schedule_transmission (h); /* FIXME:
is this ok? */
@@ -412,8 +414,6 @@
th = h->connect_ready_head;
if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
- /* remove existing time out task (only applies if
- this is not the first iteration of the loop) */
GNUNET_SCHEDULER_cancel (h->sched,
th->notify_delay_task);
th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
@@ -994,12 +994,12 @@
"TRY_CONNECT",
GNUNET_i2s(&th->target));
#endif
- th->notify (th->notify_cls, 0, NULL);
if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
+ th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
return 0;
}
@@ -1498,11 +1498,13 @@
struct GNUNET_CLIENT_Connection *client;
#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transport disconnect called!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Transport disconnect called!\n");
#endif
while (NULL != (th = handle->connect_ready_head))
{
handle->connect_ready_head = th->next;
+ GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_TASK);
th->notify (th->notify_cls, 0, NULL);
GNUNET_free (th);
}
@@ -1957,8 +1959,7 @@
/**
- * Cancel the specified transmission-ready
- * notification.
+ * Cancel the specified transmission-ready notification.
*/
void
GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct
@@ -1983,6 +1984,7 @@
h->transmission_scheduled = GNUNET_NO;
}
GNUNET_free (th->notify_cls);
+ GNUNET_assert (th->notify_delay_task == GNUNET_SCHEDULER_NO_TASK);
GNUNET_free (th);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9077 - gnunet/src/transport,
gnunet <=