*/
#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 die_task;
+static GNUNET_SCHEDULER_TaskIdentifier wait_task;
+
+#define SUGGESTION_WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
+
/**
* Scheduling handle
*/
static struct GNUNET_ATS_SchedulingHandle *sched_ats;
-/**
- * Performance handle
- */
-static struct GNUNET_ATS_PerformanceHandle *perf_ats;
-
/**
* Return value
*/
*/
static struct PeerContext p;
+/**
+ * HELLO address
+ */
+struct GNUNET_HELLO_Address test_hello_address;
-static void
-create_test_address (struct Test_Address *dest, char * plugin, void *session, void *addr, size_t addrlen)
-{
+/**
+ * Session
+ */
+static void *test_session;
- dest->plugin = GNUNET_strdup (plugin);
- dest->session = session;
- dest->addr = GNUNET_malloc (addrlen);
- memcpy (dest->addr, addr, addrlen);
- dest->addr_len = addrlen;
-}
+/**
+ * Test ats info
+ */
+struct GNUNET_ATS_Information test_ats_info[2];
-static void
-free_test_address (struct Test_Address *dest)
-{
- GNUNET_free (dest->plugin);
- GNUNET_free (dest->addr);
-}
+/**
+ * Test ats count
+ */
+uint32_t test_ats_count;
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
die_task = GNUNET_SCHEDULER_NO_TASK;
-
+ if (GNUNET_SCHEDULER_NO_TASK != wait_task)
+ {
+ GNUNET_SCHEDULER_cancel (wait_task);
+ wait_task = GNUNET_SCHEDULER_NO_TASK;
+ }
if (sched_ats != NULL)
GNUNET_ATS_scheduling_done (sched_ats);
- if (perf_ats != NULL)
- GNUNET_ATS_performance_done (perf_ats);
free_test_address (&test_addr);
ret = GNUNET_SYSERR;
}
end ()
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
+ wait_task = GNUNET_SCHEDULER_NO_TASK;
if (die_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (die_task);
free_test_address (&test_addr);
GNUNET_ATS_scheduling_done (sched_ats);
sched_ats = NULL;
- GNUNET_ATS_performance_done (perf_ats);
- perf_ats = NULL;
}
-void address_callback (void *cls,
- const struct
- GNUNET_HELLO_Address *
- address,
- struct
- GNUNET_BANDWIDTH_Value32NBO
- bandwidth_out,
- struct
- GNUNET_BANDWIDTH_Value32NBO
- bandwidth_in,
- const struct
- GNUNET_ATS_Information *
- ats, uint32_t ats_count)
+static void
+address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t ats_count)
{
- static int counter = 0;
- if (NULL != address)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received callback for peer `%s'\n",
- GNUNET_i2s (&address->peer));
- counter ++;
- return;
- }
- if (counter > 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received %u unexpected addresses callbacks\n", counter);
- ret = counter;
- }
- else
+ static int stage = 0;
+
+ if (0 ==stage)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received no unexpected addresses callbacks\n", counter);
- ret = 0;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Received suggestion for peer `%s'\n",
+ GNUNET_i2s(&address->peer));
+
+ 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_DEBUG, "Callback with correct address `%s'\n",
+ GNUNET_i2s (&address->peer));
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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, "Destroying address for `%s'\n",
+ GNUNET_i2s (&address->peer));
+ /* Destroying address */
+ GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, test_addr.session);
+ /* Request address */
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
+ /* Wait for timeout */
+ wait_task = GNUNET_SCHEDULER_add_delayed (SUGGESTION_WAIT_TIMEOUT, &end, NULL);
+ return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last callback, shutdown\n");
- GNUNET_SCHEDULER_add_now (&end, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address suggestion\n");
+ ret = 1;
+
}
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
- struct GNUNET_HELLO_Address hello_address;
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
/* Connect to ATS scheduling */
- sched_ats = GNUNET_ATS_scheduling_init (cfg, NULL, NULL);
+ sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
if (sched_ats == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
return;
}
- /* Connect to ATS performance */
- perf_ats = GNUNET_ATS_performance_init (cfg, NULL, NULL);
- if (perf_ats == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS performance!\n");
- ret = 1;
- end ();
- return;
- }
-
/* 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;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
GNUNET_i2s_full(&p.id));
- create_test_address (&test_addr, "test", NULL, "test", strlen ("test") + 1);
+ /* Prepare ATS Information */
+ test_ats_info[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ test_ats_info[0].value = htonl(GNUNET_ATS_NET_WAN);
+ test_ats_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+ test_ats_info[1].value = htonl(1);
+ test_ats_count = 2;
/* Adding address without session */
- hello_address.peer = p.id;
- hello_address.transport_name = test_addr.plugin;
- hello_address.address = test_addr.addr;
- hello_address.address_length = test_addr.addr_len;
- GNUNET_ATS_address_add (sched_ats, &hello_address, test_addr.session, NULL, 0);
-
- /* Destroying address */
- GNUNET_ATS_address_destroyed (sched_ats, &hello_address, test_addr.session);
-
- /* Get list of addresses, expect 0 addresses only NULL callback */
- GNUNET_ATS_performance_list_addresses (perf_ats, &p.id, GNUNET_YES, address_callback, NULL);
+ test_session = NULL;
+ create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1);
+ test_hello_address.peer = p.id;
+ test_hello_address.transport_name = test_addr.plugin;
+ test_hello_address.address = test_addr.addr;
+ test_hello_address.address_length = test_addr.addr_len;
+ GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, 2);
+
+ /* Request address */
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
}
projects / oweals / gnunet.git / blobdiff