[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14563 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14563 - gnunet/src/testing |
Date: |
Wed, 2 Mar 2011 13:38:59 +0100 |
Author: nevans
Date: 2011-03-02 13:38:59 +0100 (Wed, 02 Mar 2011)
New Revision: 14563
Modified:
gnunet/src/testing/testing.c
Log:
My brain is melted.
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2011-03-02 12:21:43 UTC (rev 14562)
+++ gnunet/src/testing/testing.c 2011-03-02 12:38:59 UTC (rev 14563)
@@ -382,7 +382,15 @@
}
else /* Already have a hostkey! */
{
- d->phase = SP_HOSTKEY_CREATED;
+ if (d->hostkey_callback != NULL)
+ {
+ d->hostkey_callback (d->hostkey_cls, &d->id, d, NULL);
+ d->hostkey_callback = NULL;
+ d->phase = SP_HOSTKEY_CREATED;
+ }
+ else
+ d->phase = SP_TOPOLOGY_SETUP;
+
/* wait some more */
d->task
= GNUNET_SCHEDULER_add_now (&start_fsm, d);
@@ -443,12 +451,6 @@
GNUNET_OS_process_close (d->proc);
d->proc = NULL;
d->have_hostkey = GNUNET_YES;
-#if DEBUG_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully got hostkey!\n");
-#endif
- /* Fall through */
- case SP_HOSTKEY_CREATED:
- GNUNET_assert(d->have_hostkey == GNUNET_YES);
if (d->hostkey_callback != NULL)
{
d->hostkey_callback (d->hostkey_cls, &d->id, d, NULL);
@@ -459,6 +461,11 @@
{
d->phase = SP_TOPOLOGY_SETUP;
}
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully got hostkey!\n");
+#endif
+ /* Fall through */
+ case SP_HOSTKEY_CREATED:
/* wait for topology finished */
if ((GNUNET_YES == d->dead)
|| (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14563 - gnunet/src/testing,
gnunet <=