/*
- if (NULL == (perf_ats = GNUNET_ATS_performance_init (cfg, &ats_perf_cb, NULL)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to performance API\n");
- GNUNET_SCHEDULER_add_now (end_badly, NULL);
- }
This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
Boston, MA 02111-1307, USA.
*/
/**
- * @file ats/test_ats_solver_add_address.c
- * @brief solver test: add address, request address and wait for suggest
+ * @file ats/test_ats_solver_alternative_after_delete_address.c
+ * @brief solver test: add 2 addresses, request address, delete, expect alternative
* @author Christian Grothoff
* @author Matthias Wachs
*/
/**
* Timeout task
*/
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
*/
static struct GNUNET_ATS_SchedulingHandle *sched_ats;
+/**
+ * Connectivity handle
+ */
+static struct GNUNET_ATS_ConnectivityHandle *connect_ats;
+
/**
* Return value
*/
/**
* Test state
*/
-int addresses_added = GNUNET_NO;
+static int addresses_added;
-int first_address_suggested = GNUNET_NO;
+static int first_address_suggested;
-int first_address_deleted = GNUNET_NO;
+static int first_address_deleted;
-int second_address_deleted = GNUNET_NO;
+static int second_address_deleted;
-int second_address_suggested = GNUNET_YES;
+static int second_address_suggested = GNUNET_YES;
-static const struct GNUNET_HELLO_Address *first_suggestion = NULL;
+static struct GNUNET_HELLO_Address *first_suggestion;
-static const struct GNUNET_HELLO_Address *second_suggestion = NULL;
+static struct GNUNET_HELLO_Address *second_suggestion;
+
+/**
+ * 1st Address we will destroy.
+ */
+static struct GNUNET_ATS_AddressRecord *ar;
+
+/**
+ * 2nd Address we will destroy.
+ */
+static struct GNUNET_ATS_AddressRecord *ar2;
static int
-stat_cb(void *cls, const char *subsystem, const char *name, uint64_t value,
- int is_persistent);
+stat_cb (void *cls, const char *subsystem, const char *name, uint64_t value,
+ int is_persistent);
+
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (NULL != die_task)
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
+ }
+ if (NULL != connect_ats)
+ {
+ GNUNET_ATS_connectivity_done (connect_ats);
+ connect_ats = NULL;
}
-
if (NULL != sched_ats)
{
GNUNET_ATS_scheduling_done (sched_ats);
}
free_test_address (&test_addr);
-
+ GNUNET_free_non_null (first_suggestion);
+ GNUNET_free_non_null (second_suggestion);
ret = 0;
}
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
+
+ die_task = NULL;
end ( NULL, NULL);
ret = GNUNET_SYSERR;
}
+
static void
-address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+end_badly_now ()
+{
+ if (NULL != die_task)
+ {
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = NULL;
+ }
+ 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,
- const struct GNUNET_ATS_Information *atsi,
- uint32_t ats_count)
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received a sugggestion for peer `%s' : `%s'\n",
- GNUNET_i2s (&address->peer), (char *) address->address);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Received a sugggestion for peer `%s'\n",
+ GNUNET_i2s (peer));
if (GNUNET_NO == first_address_suggested)
{
if (NULL == first_suggestion)
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;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received 1st sugggestion for peer `%s' : `%s'\n",
- GNUNET_i2s (&address->peer), (char *) address->address);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Received 1st sugggestion for peer `%s' : `%s'\n",
+ GNUNET_i2s (&address->peer), (char *) address->address);
- first_suggestion = address;
+ first_suggestion = GNUNET_HELLO_address_copy (address);
first_address_suggested = GNUNET_YES;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Deleting 1st address for peer `%s' : `%s'\n",
- GNUNET_i2s (&address->peer), (char *) address->address);
- GNUNET_ATS_address_destroyed (sched_ats, address, session);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Deleting 1st address for peer `%s' : `%s'\n",
+ GNUNET_i2s (&address->peer),
+ (char *) address->address);
+ if (0 == (strcmp ((char *) address->address,
+ "test")))
+ {
+ GNUNET_assert (NULL != ar);
+ GNUNET_ATS_address_destroy (ar);
+ ar = NULL;
+ }
+ else
+ {
+ GNUNET_assert (NULL != ar2);
+ GNUNET_ATS_address_destroy (ar2);
+ ar2 = NULL;
+ }
+
first_address_deleted = GNUNET_YES;
+
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;
}
- if (first_suggestion->address_length == address->address_length)
+ if (0 != memcmp (address->address, first_suggestion->address,
+ (first_suggestion->address_length < address->address_length) ? first_suggestion->address_length : address->address_length))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Deleted address for peer `%s' was suggested after deletion: `%s'\n",
- GNUNET_i2s (&address->peer), (char *) address->address);
- GNUNET_break (0);
- //GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Received 2nd sugggestion for peer `%s' : `%s'\n",
+ GNUNET_i2s (&address->peer),
+ (char *) address->address);
+ second_suggestion = GNUNET_HELLO_address_copy (address);
+ second_address_suggested = GNUNET_YES;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Deleting 2nd address for peer `%s' : `%s'\n",
+ GNUNET_i2s (&address->peer),
+ (char *) address->address);
+ if (NULL != ar)
+ {
+ GNUNET_assert (NULL == ar2);
+ GNUNET_ATS_address_destroy (ar);
+ ar = NULL;
+ }
+ else
+ {
+ GNUNET_assert (NULL != ar2);
+ GNUNET_ATS_address_destroy (ar2);
+ ar2 = NULL;
+ }
+ second_address_deleted = GNUNET_YES;
return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received 2nd sugggestion for peer `%s' : `%s'\n",
- GNUNET_i2s (&address->peer), (char *) address->address);
- second_suggestion = address;
- second_address_suggested = GNUNET_YES;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Deleting 2nd address for peer `%s' : `%s'\n",
- GNUNET_i2s (&address->peer), (char *) address->address);
- GNUNET_ATS_address_destroyed (sched_ats, address, session);
- second_address_deleted = GNUNET_YES;
- return;
}
}
- if (GNUNET_YES ==second_address_deleted)
+ if (GNUNET_YES == second_address_deleted)
{
/* Expecting disconnect */
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",
- (char *) address->address);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Expected disconnect but received address `%s' with bandwidth \n",
+ (char *) address->address);
}
}
- return;
}
const char *name, uint64_t value,
int is_persistent)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
- subsystem,name, value);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "ATS statistics: `%s' `%s' %llu\n",
+ subsystem,
+ name,
+ value);
if ((GNUNET_NO == addresses_added) && (value == 2))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All addresses added, requesting....\n");
+ 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_connectivity_suggest (connect_ats, &p.id);
}
return GNUNET_OK;
}
+
static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
- struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *mycfg,
+ struct GNUNET_TESTING_Peer *peer)
{
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
stats = GNUNET_STATISTICS_create ("ats", mycfg);
GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
+ connect_ats = GNUNET_ATS_connectivity_init (mycfg);
/* Connect to ATS scheduling */
sched_ats = GNUNET_ATS_scheduling_init (mycfg, &address_suggest_cb, NULL);
if (sched_ats == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
- GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not connect to ATS scheduling!\n");
+ 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));
/* Adding address without session */
test_session = NULL;
- create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1);
+ 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;
/* Adding alternative address without session */
test_session = NULL;
- create_test_address (&alt_test_addr, "test", test_session, "alt_test", strlen ("alt_test") + 1);
+ create_test_address (&alt_test_addr, "test", test_session,
+ "alt_test", strlen ("alt_test") + 1);
alt_test_hello_address.peer = p.id;
alt_test_hello_address.transport_name = alt_test_addr.plugin;
alt_test_hello_address.address = alt_test_addr.addr;
/* Adding address */
- GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info, test_ats_count);
+ ar = GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL,
+ test_ats_info, test_ats_count);
/* Adding alternative address */
- GNUNET_ATS_address_add (sched_ats, &alt_test_hello_address, NULL, test_ats_info, test_ats_count);
+ ar2 = GNUNET_ATS_address_add (sched_ats, &alt_test_hello_address, NULL,
+ test_ats_info, test_ats_count);
}
char *sep;
char *src_filename = GNUNET_strdup (__FILE__);
char *test_filename = GNUNET_strdup (argv[0]);
- char *config_file;
+ const char *config_file;
char *solver;
ret = 0;
- if (NULL == (sep = (strstr (src_filename,".c"))))
+ if (NULL == (sep = (strstr (src_filename, ".c"))))
{
GNUNET_break (0);
return -1;
return ret;
}
-/* end of file test_ats_solver_add_address.c */
+/* end of file test_ats_solver_alternative_after_delete_address.c */
projects / oweals / gnunet.git / blobdiff