diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-02-04 15:54:07 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-02-04 15:54:07 +0000 |
commit | a16bb742d0655f2c1c9b6f91b4fbcb1509398f28 (patch) | |
tree | 2424703ca17b7f4dada308961bb7e488b7c47fa4 /src | |
parent | fdf2dcaeaff0cb9b043e1d0ec644e5b6719dce04 (diff) | |
download | gnunet-a16bb742d0655f2c1c9b6f91b4fbcb1509398f28.tar.gz gnunet-a16bb742d0655f2c1c9b6f91b4fbcb1509398f28.zip |
dying transport_api fix/hack
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/transport_api.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c index 8b4fe3ffd..0c75ce9f7 100644 --- a/src/transport/transport_api.c +++ b/src/transport/transport_api.c | |||
@@ -1555,9 +1555,22 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg) | |||
1555 | h->network_handle = NULL; | 1555 | h->network_handle = NULL; |
1556 | h->transmission_scheduled = GNUNET_NO; | 1556 | h->transmission_scheduled = GNUNET_NO; |
1557 | th = h->connect_ready_head; | 1557 | th = h->connect_ready_head; |
1558 | /* add timeout again, we cancelled the transmit_ready task! */ | 1558 | /* add timeout again, we canceled the transmit_ready task! */ |
1559 | |||
1560 | /*GNUNET_assert (th->notify_delay_task == | ||
1561 | GNUNET_SCHEDULER_NO_TASK);*/ | ||
1562 | |||
1563 | /* START - somehow we are getting here when th->notify_delay_task is already | ||
1564 | * set. Not sure why, so just checking and canceling instead of asserting and | ||
1565 | * dying. Probably not a *fix*. */ | ||
1566 | if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK) | ||
1567 | { | ||
1568 | GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task); | ||
1569 | th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK; | ||
1570 | } | ||
1571 | /* END */ | ||
1559 | GNUNET_assert (th->notify_delay_task == | 1572 | GNUNET_assert (th->notify_delay_task == |
1560 | GNUNET_SCHEDULER_NO_TASK); | 1573 | GNUNET_SCHEDULER_NO_TASK); |
1561 | th->notify_delay_task = | 1574 | th->notify_delay_task = |
1562 | GNUNET_SCHEDULER_add_delayed (h->sched, | 1575 | GNUNET_SCHEDULER_add_delayed (h->sched, |
1563 | GNUNET_TIME_absolute_get_remaining | 1576 | GNUNET_TIME_absolute_get_remaining |