/**
* @file core/test_core_quota_compliance.c
* @brief testcase for core_api.c focusing quota compliance on core level
- *
- * FIXME:
- * - make sure connect callback is invoked properly as well!
*/
#include "platform.h"
#include "gnunet_common.h"
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180)
/**
* What delay do we request from the core service for transmission?
static void
terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_CORE_disconnect (p1.ch);
+ struct GNUNET_CORE_Handle *ch;
+
+ ch = p1.ch;
p1.ch = NULL;
- GNUNET_CORE_disconnect (p2.ch);
+ GNUNET_CORE_disconnect (ch);
+ ch = p2.ch;
p2.ch = NULL;
+ GNUNET_CORE_disconnect (ch);
GNUNET_TRANSPORT_disconnect (p1.th);
p1.th = NULL;
GNUNET_TRANSPORT_disconnect (p2.th);
static void
terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timout, exit!\n");
- GNUNET_break (0);
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase failed!\n");
+ //GNUNET_break (0);
if (measure_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel(measure_task);
else
quota_delta = max_quota_out / 10;
- if ((throughput_out < (max_quota_out/1024)) && (throughput_out < (max_quota_in/1024)))
- ok = 0;
- else
+ if ((throughput_out > (max_quota_out+quota_delta)/1024) || (throughput_in > (max_quota_in+quota_delta)/1024))
ok = 1;
+ else
+ ok = 0;
GNUNET_STATISTICS_get (p1.stats,
"core",
GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
if (buf == NULL)
{
- if (p1.ch != NULL)
+ if ( (p1.ch != NULL) &&
+ (p1.connect_status == 1) )
GNUNET_break (NULL !=
GNUNET_CORE_notify_transmit_ready (p1.ch,
+ GNUNET_NO,
0,
FAST_TIMEOUT,
&p2.id,
{
struct PeerContext *pc = cls;
+ if (0 == memcmp (&pc->id,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ return;
GNUNET_assert (pc->connect_status == 0);
pc->connect_status = 1;
if (pc == &p1)
measure_task = GNUNET_SCHEDULER_add_delayed(MEASUREMENT_LENGTH, &measurement_stop, NULL);
GNUNET_break (NULL != GNUNET_CORE_notify_transmit_ready (p1.ch,
- 0,
- TIMEOUT,
- &p2.id,
- MESSAGESIZE,
- &transmit_ready, &p1));
+ GNUNET_NO,
+ 0,
+ TIMEOUT,
+ &p2.id,
+ MESSAGESIZE,
+ &transmit_ready, &p1));
}
}
const struct GNUNET_PeerIdentity *peer)
{
struct PeerContext *pc = cls;
+
+ if (0 == memcmp (&pc->id,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ return;
pc->connect_status = 0;
#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
if (running == GNUNET_YES)
GNUNET_break (NULL !=
GNUNET_CORE_notify_transmit_ready (p1.ch,
+ GNUNET_NO,
0,
FAST_TIMEOUT,
&p2.id,
p->hello = GNUNET_malloc (ntohs (message->size));
memcpy (p->hello, message, ntohs (message->size));
if ((p == &p1) && (p2.th != NULL))
- GNUNET_TRANSPORT_offer_hello (p2.th, message);
+ GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
if ((p == &p2) && (p1.th != NULL))
- GNUNET_TRANSPORT_offer_hello (p1.th, message);
+ GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL);
if ((p == &p1) && (p2.hello != NULL))
- GNUNET_TRANSPORT_offer_hello (p1.th, p2.hello);
+ GNUNET_TRANSPORT_offer_hello (p1.th, p2.hello, NULL, NULL);
if ((p == &p2) && (p1.hello != NULL))
- GNUNET_TRANSPORT_offer_hello (p2.th, p1.hello);
+ GNUNET_TRANSPORT_offer_hello (p2.th, p1.hello, NULL, NULL);
}
}
else if (test == ASYMMETRIC_SEND_LIMITED)
{
- setup_peer (&p1, "test_core_quota_asymmetric_send_limited_peer1.conf");
- setup_peer (&p2, "test_core_quota_asymmetric_send_limited_peer2.conf");
+ setup_peer (&p1, "test_core_quota_asymmetric_send_limit_peer1.conf");
+ setup_peer (&p2, "test_core_quota_asymmetric_send_limit_peer2.conf");
}
else if (test == ASYMMETRIC_RECV_LIMITED)
{
test = ASYMMETRIC_RECV_LIMITED;
}
GNUNET_assert (test != -1);
+ if (test == SYMMETRIC)
+ {
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/");
+ }
+ else if (test == ASYMMETRIC_SEND_LIMITED)
+ {
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/");
+ }
+ else if (test == ASYMMETRIC_RECV_LIMITED)
+ {
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/");
+ }
+
GNUNET_log_setup ("test-core-quota-compliance",
#if VERBOSE
"DEBUG",
}
else if (test == ASYMMETRIC_SEND_LIMITED)
{
- GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/");
- GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/");
}
else if (test == ASYMMETRIC_RECV_LIMITED)
{