[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13688 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13688 - gnunet/src/testing |
Date: |
Mon, 15 Nov 2010 20:05:44 +0100 |
Author: nevans
Date: 2010-11-15 20:05:44 +0100 (Mon, 15 Nov 2010)
New Revision: 13688
Modified:
gnunet/src/testing/testing.c
Log:
not sure how this has been working, unless something got out of sync in svn...
also not sure it is fixed
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2010-11-15 14:47:26 UTC (rev 13687)
+++ gnunet/src/testing/testing.c 2010-11-15 19:05:44 UTC (rev 13688)
@@ -1479,13 +1479,14 @@
ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK;
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
- if ((ctx->d1->hello != NULL) && (NULL !=
GNUNET_HELLO_get_header(ctx->d1->hello)))
+ if ((ctx->d2->hello != NULL) && (NULL !=
GNUNET_HELLO_get_header(ctx->d2->hello)))
{
- hello = GNUNET_HELLO_get_header(ctx->d1->hello);
+ hello = GNUNET_HELLO_get_header(ctx->d2->hello);
GNUNET_assert(hello != NULL);
+ /* FIXME: if this works, change d2th to d1th */
GNUNET_TRANSPORT_offer_hello (ctx->d2th, hello);
-
- ctx->connect_request_handle = GNUNET_CORE_peer_request_connect
(ctx->d2->server,
+ GNUNET_assert(ctx->d1core != NULL);
+ ctx->connect_request_handle = GNUNET_CORE_peer_request_connect
(ctx->d1core,
GNUNET_TIME_relative_divide(ctx->relative_timeout,
ctx->max_connect_attempts + 1),
&ctx->d1->id,
@@ -1594,9 +1595,9 @@
#endif
- ctx->d2th = GNUNET_TRANSPORT_connect (d2->cfg,
- &d2->id,
- d2, NULL, NULL, NULL);
+ ctx->d2th = GNUNET_TRANSPORT_connect (d1->cfg,
+ &d1->id,
+ d1, NULL, NULL, NULL);
if (ctx->d2th == NULL)
{
GNUNET_CORE_disconnect(ctx->d1core);
@@ -1649,9 +1650,9 @@
return;
}
- ctx->d2th = GNUNET_TRANSPORT_connect (ctx->d2->cfg,
- &ctx->d2->id,
- ctx->d2, NULL, NULL, NULL);
+ ctx->d2th = GNUNET_TRANSPORT_connect (ctx->d1->cfg,
+ &ctx->d1->id,
+ ctx->d1, NULL, NULL, NULL);
if (ctx->d2th == NULL)
{
GNUNET_CORE_disconnect(ctx->d1core);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13688 - gnunet/src/testing,
gnunet <=