[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25291 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25291 - gnunet/src/ats |
Date: |
Thu, 6 Dec 2012 13:32:28 +0100 |
Author: wachs
Date: 2012-12-06 13:32:28 +0100 (Thu, 06 Dec 2012)
New Revision: 25291
Modified:
gnunet/src/ats/test_ats_api_scheduling_add_address.c
gnunet/src/ats/test_ats_api_scheduling_destroy_address.c
gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
gnunet/src/ats/test_ats_api_scheduling_update_address.c
Log:
improvements
Modified: gnunet/src/ats/test_ats_api_scheduling_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_address.c 2012-12-06
12:20:58 UTC (rev 25290)
+++ gnunet/src/ats/test_ats_api_scheduling_add_address.c 2012-12-06
12:32:28 UTC (rev 25291)
@@ -149,31 +149,6 @@
const struct GNUNET_ATS_Information *atsi,
uint32_t ats_count)
{
- if (0 != memcmp (&address->peer, &p.id, sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid peer
id'\n");
- ret = 1;
- }
- else if (0 != strcmp (address->transport_name, test_addr.plugin))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid
plugin'\n");
- ret = 1;
- }
- else if (address->address_length != test_addr.addr_len)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address
length'\n");
- ret = 1;
- }
- else if (0 != memcmp (address->address, test_addr.plugin,
address->address_length))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid
address'\n");
- ret = 1;
- }
- else
- {
-
- }
-
if (GNUNET_OK == compare_addresses (address, session, &test_hello_address,
test_session))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback with correct address
`%s'\n",
@@ -184,7 +159,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback with invalid address
`%s'\n",
GNUNET_i2s (&address->peer));
- ret = 0;
+ ret = 1;
}
GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
GNUNET_SCHEDULER_add_now (&end, NULL);
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_address.c 2012-12-06
12:20:58 UTC (rev 25290)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_address.c 2012-12-06
12:32:28 UTC (rev 25291)
@@ -62,6 +62,10 @@
*/
struct GNUNET_HELLO_Address test_hello_address;
+/**
+ * Session
+ */
+static void *test_session;
static void
create_test_address (struct Test_Address *dest, char * plugin, void *session,
void *addr, size_t addrlen)
@@ -86,7 +90,11 @@
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);
free_test_address (&test_addr);
@@ -109,6 +117,41 @@
sched_ats = NULL;
}
+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 void
address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
struct Session *session,
@@ -118,47 +161,26 @@
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_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 peer
id'\n");
- res = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback with correct address
`%s'\n",
+ GNUNET_i2s (&address->peer));
}
- 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
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for correct address
`%s'\n",
- GNUNET_i2s (&address->peer));
- res = 0;
+ 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;
}
- 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;
- }
stage ++;
ret = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying address for `%s'\n",
@@ -167,6 +189,7 @@
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 (WAIT_TIMEOUT, &end, NULL);
return;
}
@@ -204,14 +227,14 @@
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);
-
/* Adding address without session */
+ 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_addr.session,
NULL, 0);
+ GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session, NULL,
0);
/* Request address */
GNUNET_ATS_suggest_address (sched_ats, &p.id);
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_session.c 2012-12-06
12:20:58 UTC (rev 25290)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_session.c 2012-12-06
12:32:28 UTC (rev 25291)
@@ -93,7 +93,11 @@
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);
@@ -116,6 +120,42 @@
sched_ats = NULL;
}
+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 void
address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
struct Session *session,
@@ -125,52 +165,26 @@
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_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 peer
id'\n");
- res = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with correct
address `%s'\n",
+ GNUNET_i2s (&address->peer));
}
- 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_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid
session'\n");
- res = 1;
- }
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for correct address
`%s'\n",
- GNUNET_i2s (&address->peer));
- res = 0;
+ 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;
}
- 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;
- }
stage ++;
ret = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying address for `%s'\n",
@@ -187,45 +201,21 @@
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_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 peer
id'\n");
- res = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: Callback with correct
address `%s'\n",
+ GNUNET_i2s (&address->peer));
}
- 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_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid session
%p != %p'\n", test_session, session);
- res = 1;
- }
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for correct address
`%s'\n",
- GNUNET_i2s (&address->peer));
- res = 0;
+ 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;
}
- 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;
- }
stage ++;
ret = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying address for `%s'\n",
Modified: gnunet/src/ats/test_ats_api_scheduling_update_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_update_address.c 2012-12-06
12:20:58 UTC (rev 25290)
+++ gnunet/src/ats/test_ats_api_scheduling_update_address.c 2012-12-06
12:32:28 UTC (rev 25291)
@@ -163,13 +163,13 @@
}
else
{
- ret = 1;
- GNUNET_SCHEDULER_add_now (&end, NULL);
+ ret = 1;
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ return;
}
/* Update address */
-
/* Request address */
GNUNET_ATS_suggest_address (sched_ats, &p.id);
stage ++;
@@ -192,7 +192,6 @@
GNUNET_SCHEDULER_add_now (&end, NULL);
}
-
}
static void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25291 - gnunet/src/ats,
gnunet <=