*/
#include "platform.h"
#include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include "ats.h"
#include "test_ats_api_common.h"
static GNUNET_SCHEDULER_TaskIdentifier wait_task;
-#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
/**
*/
static void *test_session;
-static void
-create_test_address (struct Test_Address *dest, char * plugin, void *session, void *addr, size_t addrlen)
-{
-
- dest->plugin = GNUNET_strdup (plugin);
- dest->session = session;
- dest->addr = GNUNET_malloc (addrlen);
- memcpy (dest->addr, addr, addrlen);
- dest->addr_len = addrlen;
-}
-
-static void
-free_test_address (struct Test_Address *dest)
-{
- GNUNET_free (dest->plugin);
- GNUNET_free (dest->addr);
-}
-
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
die_task = GNUNET_SCHEDULER_NO_TASK;
-
+ if (wait_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (wait_task);
+ wait_task = GNUNET_SCHEDULER_NO_TASK;
+ }
if (sched_ats != NULL)
GNUNET_ATS_scheduling_done (sched_ats);
free_test_address (&test_addr);
sched_ats = NULL;
}
+
static void
address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
struct Session *session,
uint32_t ats_count)
{
static int stage = 0;
- int res = 0;
if (0 == stage)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Received suggestion for peer `%s'\n",
GNUNET_i2s(&address->peer));
- if (0 != memcmp (&address->peer, &p.id, sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid peer id'\n");
- res = 1;
- }
- else if (0 != strcmp (address->transport_name, test_addr.plugin))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid plugin'\n");
- res = 1;
- }
- else if (address->address_length != test_addr.addr_len)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address length'\n");
- res = 1;
- }
- else if (0 != memcmp (address->address, test_addr.plugin, address->address_length))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address'\n");
- res = 1;
- }
- else if (test_session != &test_addr)
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid session'\n");
- res = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with correct address `%s'\n",
+ GNUNET_i2s (&address->peer));
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for correct address `%s'\n",
- GNUNET_i2s (&address->peer));
- res = 0;
- }
- GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
- if (1 == res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for invalid address `%s'\n",
- GNUNET_i2s (&address->peer));
- GNUNET_SCHEDULER_add_now (&end, NULL);
- ret = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with invalid address `%s'\n",
+ GNUNET_i2s (&address->peer));
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ ret = 1;
+ return;
}
stage ++;
ret = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: Received suggestion for peer `%s'\n",
GNUNET_i2s(&address->peer));
- if (0 != memcmp (&address->peer, &p.id, sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid peer id'\n");
- res = 1;
- }
- else if (0 != strcmp (address->transport_name, test_addr.plugin))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid plugin'\n");
- res = 1;
- }
- else if (address->address_length != test_addr.addr_len)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address length'\n");
- res = 1;
- }
- else if (0 != memcmp (address->address, test_addr.plugin, address->address_length))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address'\n");
- res = 1;
- }
- else if (session != test_session)
+
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid session %p != %p'\n", test_session, session);
- res = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: Callback with correct address `%s'\n",
+ GNUNET_i2s (&address->peer));
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for correct address `%s'\n",
- GNUNET_i2s (&address->peer));
- res = 0;
- }
- GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
- if (1 == res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for invalid address `%s'\n",
- GNUNET_i2s (&address->peer));
- GNUNET_SCHEDULER_add_now (&end, NULL);
- ret = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: Callback with invalid address `%s'\n",
+ GNUNET_i2s (&address->peer));
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ ret = 1;
+ return;
}
stage ++;
ret = 0;
GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, session);
/* Request address */
GNUNET_ATS_suggest_address (sched_ats, &p.id);
- wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);
+ wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end, NULL);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address suggestion\n");
}
/* Set up peer */
- if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID, &p.id.hashPubKey))
+ if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, &p.id.hashPubKey))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
ret = GNUNET_SYSERR;