*/
/**
* @file ats/test_ats_api_scheduling_add_address.c
- * @brief test adding addresses in automatic transport selection scheduling API
+ * @brief adding addresses with scheduling API
* @author Christian Grothoff
* @author Matthias Wachs
*/
#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"
+/**
+ * Timeout task
+ */
static GNUNET_SCHEDULER_TaskIdentifier die_task;
/**
- * Scheduling handle
+ * Statistics handle
*/
-static struct GNUNET_ATS_SchedulingHandle *sched_ats;
+struct GNUNET_STATISTICS_Handle *stats;
/**
- * Performance handle
+ * Scheduling handle
*/
-static struct GNUNET_ATS_PerformanceHandle *perf_ats;
+static struct GNUNET_ATS_SchedulingHandle *sched_ats;
/**
* Return value
*/
static struct PeerContext p;
+/**
+ * HELLO address
+ */
+struct GNUNET_HELLO_Address test_hello_address;
+
+/**
+ * Session
+ */
+static void *test_session;
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+/**
+ * Test ats info
+ */
+struct GNUNET_ATS_Information test_ats_info[2];
+
+/**
+ * Test ats count
+ */
+uint32_t test_ats_count;
+
+
+static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+static int
+stat_cb(void *cls, const char *subsystem,
+ const char *name, uint64_t value,
+ int is_persistent)
{
- die_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);
- ret = GNUNET_SYSERR;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
+ subsystem,name, value);
+ if (1 == value)
+ {
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ }
+ return GNUNET_OK;
}
static void
-end ()
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
+
if (die_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_ATS_scheduling_done (sched_ats);
- sched_ats = NULL;
- GNUNET_ATS_performance_done (perf_ats);
- perf_ats = NULL;
+ if (NULL != sched_ats)
+ {
+ GNUNET_ATS_scheduling_done (sched_ats);
+ sched_ats = NULL;
+ }
+
+ GNUNET_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
+ if (NULL != stats)
+ {
+ GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+ stats = NULL;
+ }
+
+ free_test_address (&test_addr);
+
ret = 0;
}
-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
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- static int counter = 0;
- if (NULL != address)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received callback for peer `%s'\n",
- GNUNET_i2s (&address->peer));
- if (0 < counter)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Too many callbacks!\n");
- ret = 1;
- }
- else if ((0 == memcmp (&address->peer, &p.id, sizeof (struct GNUNET_PeerIdentity))) &&
- (0 == strcmp (address->transport_name, test_addr.plugin)) &&
- (address->address_length == test_addr.addr_len) &&
- (0 == memcmp (address->address, test_addr.plugin, address->address_length)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for correct address `%s'\n",
- GNUNET_i2s (&address->peer));
- ret = 0;
- }
- counter ++;
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last callback, shutdown\n");
- GNUNET_SCHEDULER_add_now (&end, NULL);
+ 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,
+ 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)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ return;
}
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);
+ stats = GNUNET_STATISTICS_create ("ats", cfg);
+ GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, 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");
- ret = 1;
- end ();
- 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 ();
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
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;
- end ();
+ GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
}
+ GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
GNUNET_i2s_full(&p.id));
- test_addr.plugin = "test";
- test_addr.session = NULL;
- test_addr.addr = GNUNET_strdup ("test");
- test_addr.addr_len = 4;
+ /* 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);
-
- 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;
+
+ /* Adding address */
+ GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, test_ats_info, test_ats_count);
}
int
main (int argc, char *argv[])
{
- if (0 != GNUNET_TESTING_peer_run ("test_ats_api_scheduling_add_address",
+ ret = 0;
+ if (0 != GNUNET_TESTING_peer_run ("test-ats-api",
"test_ats_api.conf",
&run, NULL))
return 1;