*/
#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"
struct GNUNET_TIME_Relative reset_block_duration;
-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)
{
free_test_address (&test_addr);
}
-static int
-compare_addresses (const struct GNUNET_HELLO_Address *address1, void *session1,
- const struct GNUNET_HELLO_Address *address2, void *session2)
-{
- if (0 != memcmp (&address1->peer, &address2->peer, sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid peer id'\n");
- return GNUNET_SYSERR;
- }
- if (0 != strcmp (address1->transport_name, address2->transport_name))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid plugin'\n");
- return GNUNET_SYSERR;
- }
- if (address1->address_length != address2->address_length)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address length'\n");
- return GNUNET_SYSERR;
-
- }
- else if (0 != memcmp (address1->address, address2->address, address2->address_length))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address'\n");
- return GNUNET_SYSERR;
- }
- if (session1 != session2)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid session1 %p vs session2 %p'\n",
- session1, session2);
- return GNUNET_SYSERR;
-
- }
- return GNUNET_OK;
-}
-
-
-static int
-compare_ats (const struct GNUNET_ATS_Information *ats_is, uint32_t ats_count_is,
- const struct GNUNET_ATS_Information *ats_should, uint32_t ats_count_should)
-{
- unsigned int c_o;
- unsigned int c_i;
- char *prop[] = GNUNET_ATS_PropertyStrings;
- uint32_t type1;
- uint32_t type2;
- uint32_t val1;
- uint32_t val2;
- int res = GNUNET_OK;
-
- for (c_o = 0; c_o < ats_count_is; c_o++)
- {
- for (c_i = 0; c_i < ats_count_should; c_i++)
- {
- type1 = ntohl(ats_is[c_o].type);
- type2 = ntohl(ats_should[c_i].type);
- if (type1 == type2)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS type `%s'\n",
- prop[type1]);
- val1 = ntohl(ats_is[c_o].value);
- val2 = ntohl(ats_should[c_i].value);
- if (val1 != val2)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS value `%s' not equal: %u != %u\n",
- prop[type1],
- val1, val2);
- res = GNUNET_SYSERR;
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS value `%s' equal: %u == %u\n",
- prop[type1],
- val1, val2);
- }
- }
- }
- }
- return res;
-}
-
static void
request_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static int stage = 0;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u\n", stage);
- if (2 == stage)
+ if (3 == stage)
{
/* Suggestion after resetting block interval */
- reset_block_duration = GNUNET_TIME_absolute_get_difference(reset_block_start, GNUNET_TIME_absolute_get());
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion after resetting blocking took about %llu ms!\n",
- (long long unsigned int) reset_block_duration.rel_value);
- if ((block_duration.rel_value <= (initial_duration.rel_value * 3)) ||
- (initial_duration.rel_value <= (block_duration.rel_value * 3)))
+ reset_block_duration = GNUNET_TIME_absolute_get_difference (reset_block_start,
+ GNUNET_TIME_absolute_get());
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Address suggestion after resetting blocking took about %s!\n",
+ GNUNET_STRINGS_relative_time_to_string (reset_block_duration,
+ GNUNET_YES));
+ if ((block_duration.rel_value_us <= (initial_duration.rel_value_us * 3)) ||
+ (initial_duration.rel_value_us <= (block_duration.rel_value_us * 3)))
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Address suggestion after resetting blocking (%llu ms) took about the same as initial suggestion (%llu ms)\n",
- (long long unsigned int) reset_block_duration.rel_value,
- (long long unsigned int) initial_duration.rel_value);
+ "Address suggestion after resetting blocking took about the same as initial suggestion (%s)\n",
+ GNUNET_STRINGS_relative_time_to_string (initial_duration,
+ GNUNET_YES));
ret = 0;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address suggestion after resetting blocking (%llu ms) has too big difference to initial suggestion (%llu ms)\n",
- (long long unsigned int) reset_block_duration.rel_value,
- (long long unsigned int) initial_duration.rel_value);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Address suggestion after resetting blocking has too big difference to initial suggestion (%s)\n",
+ GNUNET_STRINGS_relative_time_to_string (initial_duration,
+ GNUNET_YES));
ret = 1;
GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
GNUNET_SCHEDULER_add_now (&end, NULL);
return;
}
- if (((initial_duration.rel_value * 3) <= block_duration.rel_value ) &&
- ((reset_block_duration.rel_value * 3) <= block_duration.rel_value))
+ if (((initial_duration.rel_value_us * 3) <= block_duration.rel_value_us) &&
+ ((reset_block_duration.rel_value_us * 3) <= block_duration.rel_value_us))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion after resetting blocking (%llu ms) and initial suggestion (%llu ms) much faster than with blocking (%llu ms)\n",
- (long long unsigned int) reset_block_duration.rel_value,
- (long long unsigned int) initial_duration.rel_value,
- (long long unsigned int) block_duration.rel_value);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Address suggestion after resetting blocking and initial suggestion (%llu us) much faster than with blocking (%llu us)\n",
+ (unsigned long long) initial_duration.rel_value_us,
+ (unsigned long long) block_duration.rel_value_us);
ret = 0;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address suggestion after resetting blocking (%llu ms) and initial suggestion (%llu ms) not faster than with blocking (%llu ms)\n",
- (long long unsigned int) reset_block_duration.rel_value,
- (long long unsigned int) initial_duration.rel_value,
- (long long unsigned int) block_duration.rel_value);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Address suggestion after resetting blocking and initial suggestion (%llu us) not faster than with blocking (%llu us)\n",
+ (unsigned long long) initial_duration.rel_value_us,
+ (unsigned long long) block_duration.rel_value_us);
ret = 1;
}
GNUNET_SCHEDULER_add_now (&end, NULL);
}
- if (1 == stage)
+ if (2 == stage)
{
/* Suggestion after block*/
block_duration = GNUNET_TIME_absolute_get_difference(block_start, GNUNET_TIME_absolute_get());
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address suggestion was blocked for about %llu ms!\n",
- (long long unsigned int) block_duration.rel_value);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Address suggestion was blocked for about %s!\n",
+ GNUNET_STRINGS_relative_time_to_string (block_duration,
+ GNUNET_YES));
if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with correct address `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stage %u: Callback with correct address `%s'\n", stage,
GNUNET_i2s (&address->peer));
ret = 0;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with invalid address `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stage %u: Callback with invalid address `%s'\n", stage,
GNUNET_i2s (&address->peer));
GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
GNUNET_SCHEDULER_add_now (&end, NULL);
if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 0: Callback with incorrect ats info \n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Stage %u: Callback with incorrect ats info \n");
GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
GNUNET_SCHEDULER_add_now (&end, NULL);
ret = 1;
reset_block_start = GNUNET_TIME_absolute_get();
GNUNET_ATS_suggest_address (sched_ats, &p.id);
}
- if (0 == stage)
+ if (1 == stage)
{
/* Initial suggestion */
if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with correct address `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stage %u: Callback with correct address `%s'\n",
+ stage,
GNUNET_i2s (&address->peer));
ret = 0;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with invalid address `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stage %u: Callback with invalid address `%s'\n",
+ stage,
GNUNET_i2s (&address->peer));
GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
GNUNET_SCHEDULER_add_now (&end, NULL);
if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 0: Callback with incorrect ats info \n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Stage %u: Callback with incorrect ats info\n",
+ stage);
GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
GNUNET_SCHEDULER_add_now (&end, NULL);
ret = 1;
}
- stage ++;
+ stage++;
initial_duration = GNUNET_TIME_absolute_get_difference(initial_start, GNUNET_TIME_absolute_get());
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Initial suggestion took about %llu ms\n",
- (long long unsigned int) block_duration.rel_value);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stage %u: Initial suggestion took about %s\n",
+ stage,
+ GNUNET_STRINGS_relative_time_to_string (block_duration,
+ GNUNET_YES));
block_start = GNUNET_TIME_absolute_get();
wait_task = GNUNET_SCHEDULER_add_delayed (WAIT, &request_task, NULL);
}
+ if (0 == stage)
+ {
+ /* Startup suggestion */
+ if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stage %u: Callback with correct address `%s'\n",
+ stage,
+ GNUNET_i2s (&address->peer));
+ ret = 0;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stage %u: Callback with invalid address `%s'\n",
+ stage,
+ GNUNET_i2s (&address->peer));
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ ret = 1;
+ }
+
+ if (GNUNET_OK != compare_ats (atsi, ats_count, test_ats_info, test_ats_count))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Stage %u: Callback with incorrect ats info\n",
+ stage);
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ ret = 1;
+ }
+ stage ++;
+
+ GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+
+ initial_start = GNUNET_TIME_absolute_get();
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
+ }
}
static void
-run (void *cls,
+run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
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");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not connect to ATS scheduling!\n");
ret = 1;
end ();
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_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not setup peer!\n");
ret = GNUNET_SYSERR;
end ();
return;
}
GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created peer `%s'\n",
GNUNET_i2s_full(&p.id));
/* Prepare ATS Information */
projects / oweals / gnunet.git / blobdiff