static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+
die_task = GNUNET_SCHEDULER_NO_TASK;
end ( NULL, NULL);
ret = GNUNET_SYSERR;
}
static void
-address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+end_badly_now ()
+{
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ {
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+}
+
+static void
+address_suggest_cb (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
struct Session *session,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
if ((NULL == address) || (NULL != session))
{
GNUNET_break (0);
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ end_badly_now ();
return;
}
if ((ntohl(bandwidth_in.value__) == 0) ||
(ntohl(bandwidth_out.value__) == 0))
{
GNUNET_break (0);
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ end_badly_now ();
return;
}
{
if (NULL == second_suggestion)
{
- GNUNET_assert (NULL != address);
- GNUNET_assert (NULL == session);
- GNUNET_assert (ntohl(bandwidth_in.value__) > 0);
- GNUNET_assert (ntohl(bandwidth_out.value__) > 0);
-
if ((NULL == address) || (NULL != session))
{
GNUNET_break (0);
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
- if ((ntohl(bandwidth_in.value__) == 0) ||
- (ntohl(bandwidth_out.value__) == 0))
- {
- GNUNET_break (0);
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ end_badly_now ();
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Deleted 1st address for peer `%s' was suggested after deletion: `%s' `%s'\n",
GNUNET_i2s (&address->peer), (char *) address->address, first_suggestion->address);
GNUNET_break (0);
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ end_badly_now ();
return;
}
if ((ntohl(bandwidth_in.value__) == 0) &&
(ntohl(bandwidth_out.value__) == 0))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Done!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS tells me to disconnect\n");
GNUNET_SCHEDULER_add_now (&end, NULL);
return;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Expected disconnect received address `%s' with bandwidth \n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Expected disconnect but received address `%s' with bandwidth \n",
(char *) address->address);
}
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All addresses added, requesting....\n");
/* We have 2 addresses, so we can request */
addresses_added = GNUNET_YES;
- GNUNET_ATS_suggest_address (sched_ats, &p.id);
+ GNUNET_ATS_suggest_address (sched_ats, &p.id, NULL, NULL);
}
return GNUNET_OK;
}
if (sched_ats == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ end_badly_now ();
return;
}
/* Set up peer */
- if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, &p.id.hashPubKey))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
- GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));
-
+ memset (&p.id, '1', sizeof (p.id));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
GNUNET_i2s_full(&p.id));