static int is_http;
static int is_https;
static int is_udp;
+static int is_unix;
static int is_asymmetric_send_constant;
static int is_asymmetric_recv_constant;
static GNUNET_SCHEDULER_TaskIdentifier measurement_task;
static GNUNET_SCHEDULER_TaskIdentifier measurement_counter_task;
-struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
+static struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
#define OKPP do { ok++; } while (0)
GNUNET_SCHEDULER_cancel (measurement_counter_task);
measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
}
+ fprintf(stderr,"\n");
GNUNET_SCHEDULER_shutdown ();
#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
notify_receive_new (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+ const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t ats_count)
{
unsigned int s;
const struct TestMessage *hdr;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
-#if VERBOSE
fprintf(stderr,".");
-#endif
measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
&measurement_counter,
NULL);
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static int strike_counter;
+ static int failed_measurement_counter = 1;
unsigned long long quota_allowed = 0;
int delta = 0;
GNUNET_SCHEDULER_cancel (measurement_counter_task);
measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
}
-#if VERBOSE
- fprintf(stderr,"\n");
-#endif
if (transmit_handle != NULL)
{
quota_allowed = current_quota_p2;
- if (MEASUREMENT_SOFT_LIMIT > (quota_allowed/10))
+ if (MEASUREMENT_SOFT_LIMIT > (quota_allowed/3))
delta = MEASUREMENT_SOFT_LIMIT;
else
- delta = (quota_allowed/10);
+ delta = (quota_allowed/3);
/* Throughput is far too slow. This is to prevent the test to exit with success when throughput is 0 */
if ((total_bytes_sent/(duration.rel_value / 1000)) < 100)
(total_bytes_sent/(duration.rel_value / 1000)/1024),
total_bytes_sent/(duration.rel_value / 1000));
ok = 1;
- end();
+ failed_measurement_counter--;
+ if (failed_measurement_counter < 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "\nQuota measurement failed and no free strike: %i\n",failed_measurement_counter);
+ end();
+ return;
+ }
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "\nQuota measurement failed and %i free strikes\n",failed_measurement_counter);
}
/* Throughput is bigger than allowed quota + some extra*/
(total_bytes_sent/(duration.rel_value / 1000)/1024),
total_bytes_sent/(duration.rel_value / 1000));
ok = 1;
- end();
- return;
+ failed_measurement_counter--;
+ if (failed_measurement_counter < 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "\nQuota measurement failed and no free strike: %i\n",failed_measurement_counter);
+ end();
+ return;
+ }
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "\nQuota measurement failed and %i free strikes\n",failed_measurement_counter);
}
else
{
"\nQuota compliance ok: \n"\
"Quota allowed: %10llu kB/s\n"\
"Throughput : %10llu kB/s\n", (quota_allowed / (1024)) , (total_bytes_sent/(duration.rel_value / 1000)/1024));
+ if (failed_measurement_counter < 2)
+ failed_measurement_counter++;
ok = 0;
}
if ((quota_allowed) > (2 *(total_bytes_sent/(duration.rel_value / 1000))))
{
- strike_counter++;
+ if (failed_measurement_counter < 2)
+ failed_measurement_counter++;
if (strike_counter == 2)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
end();
return;
}
-
if (is_asymmetric_send_constant == GNUNET_YES)
{
if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA)
static void
notify_connect (void *cls,
const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+ const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t ats_count)
{
if (cls == &p1)
{
GNUNET_assert (p->th != NULL);
}
+static size_t
+notify_ready_connect (void *cls, size_t size, void *buf)
+{
+ return 0;
+}
static void
exchange_hello_last (void *cls,
GNUNET_assert (GNUNET_OK ==
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
message, &me->id));
+
+ GNUNET_assert(NULL != (transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
+ &p1.id,
+ sizeof (struct GNUNET_MessageHeader), 0,
+ TIMEOUT,
+ ¬ify_ready_connect,
+ NULL)));
+
/* both HELLOs exchanged, get ready to test transmission! */
}
GNUNET_assert (GNUNET_OK ==
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
message, &me->id));
- GNUNET_TRANSPORT_offer_hello (p2.th, message);
+ GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
}
setup_peer (&p1, "test_quota_compliance_udp_peer1.conf");
setup_peer (&p2, "test_quota_compliance_udp_peer2.conf");
}
+ else if (is_unix)
+ {
+ if (is_asymmetric_recv_constant == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for UNIX transport plugin\n");
+ else if (is_asymmetric_send_constant == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (sender quota constant) for UNIX transport plugin\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for UNIX transport plugin\n");
+ setup_peer (&p1, "test_quota_compliance_unix_peer1.conf");
+ setup_peer (&p2, "test_quota_compliance_unix_peer2.conf");
+ }
else if (is_tcp_nat)
{
if (is_asymmetric_recv_constant == GNUNET_YES)
{
is_udp = GNUNET_YES;
}
+ else if (strstr(argv[0], "unix") != NULL)
+ {
+ is_unix = GNUNET_YES;
+ }
if (strstr(argv[0], "asymmetric_recv") != NULL)
{
else
GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","tcp","symmetric");
}
- if (is_udp == GNUNET_YES)
+ else if (is_udp == GNUNET_YES)
{
if (is_asymmetric_recv_constant == GNUNET_YES)
GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","asymmetric_recv_constant");
else
GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","symmetric");
}
- if (is_http == GNUNET_YES)
+ else if (is_unix == GNUNET_YES)
+ {
+ if (is_asymmetric_recv_constant == GNUNET_YES)
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","unix","asymmetric_recv_constant");
+ else if (is_asymmetric_send_constant == GNUNET_YES)
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","unix","asymmetric_send_constant");
+ else
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","unix","symmetric");
+ }
+ else if (is_http == GNUNET_YES)
{
if (is_asymmetric_recv_constant == GNUNET_YES)
GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","asymmetric_recv_constant");
else
GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","symmetric");
}
- if (is_https == GNUNET_YES)
+ else if (is_https == GNUNET_YES)
{
if (is_asymmetric_recv_constant == GNUNET_YES)
GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","asymmetric_recv_constant");
else
GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","symmetric");
}
+ else
+ {
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","noplugin","none");
+ }
+
+ GNUNET_DISK_directory_remove ("/tmp/test_quota_compliance_peer1");
+ GNUNET_DISK_directory_remove ("/tmp/test_quota_compliance_peer2");
+
fprintf(stderr, "Running `%s'\n", logger);
GNUNET_log_setup ("test-quota-compliance",
#if VERBOSE