#include "gnunet_transport_service.h"
#include "transport.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define VERBOSE_ARM GNUNET_NO
#define DEBUG_MEASUREMENT GNUNET_NO
#define DEBUG_CONNECTIONS GNUNET_NO
-#define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
-#define MEASUREMENT_MSG_SIZE 10000
+#define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define MEASUREMENT_MSG_SIZE 1024
#define MEASUREMENT_MSG_SIZE_BIG 32768
#define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024
-#define MEASUREMENT_MIN_QUOTA 1024 * 10
-#define SEND_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 35)
+#define MEASUREMENT_MIN_QUOTA 1024
+#define SEND_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define MEASUREMENT_SOFT_LIMIT 1024
+
/**
* Testcase timeout
*/
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_PeerIdentity id;
#if START_ARM
- pid_t arm_pid;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
static struct PeerContext p2;
-static struct GNUNET_SCHEDULER_Handle *sched;
-
static int ok;
static int connected;
static int send_running;
static int recv_running;
-static unsigned long long total_bytes;
+static unsigned long long total_bytes_sent;
+static unsigned long long last_msg_sent;
+static unsigned long long last_msg_recv;
static unsigned long long current_quota_p1;
static unsigned long long current_quota_p2;
static int is_http;
static int is_https;
static int is_udp;
+static int is_asymmetric_send_constant;
+static int is_asymmetric_recv_constant;
static struct GNUNET_TIME_Absolute start_time;
struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
-#if VERBOSE
-#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
-#else
#define OKPP do { ok++; } while (0)
-#endif
static void
end ()
{
- GNUNET_SCHEDULER_cancel (sched, die_task);
+ GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
if (measurement_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched, measurement_task);
+ GNUNET_SCHEDULER_cancel (measurement_task);
measurement_task = GNUNET_SCHEDULER_NO_TASK;
}
if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched, measurement_counter_task);
+ GNUNET_SCHEDULER_cancel (measurement_counter_task);
measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_SCHEDULER_shutdown (sched);
+ GNUNET_SCHEDULER_shutdown ();
#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
#endif
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transports disconnected, returning success!\n");
#endif
- GNUNET_SCHEDULER_shutdown (sched);
+ GNUNET_SCHEDULER_shutdown ();
}
stop_arm (struct PeerContext *p)
{
#if START_ARM
- if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- GNUNET_OS_process_wait (p->arm_pid);
+ GNUNET_OS_process_wait (p->arm_proc);
+ GNUNET_OS_process_close (p->arm_proc);
+ p->arm_proc = NULL;
#endif
GNUNET_CONFIGURATION_destroy (p->cfg);
}
{
if (measurement_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched, measurement_task);
+ GNUNET_SCHEDULER_cancel (measurement_task);
measurement_task = GNUNET_SCHEDULER_NO_TASK;
}
if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched, measurement_counter_task);
+ GNUNET_SCHEDULER_cancel (measurement_counter_task);
measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_break (0);
};
static unsigned int
-get_size (unsigned int iter)
+get_size (void)
{
return MEASUREMENT_MSG_SIZE + sizeof (struct TestMessage);
}
struct GNUNET_TIME_Relative latency,
uint32_t distance)
{
- static int n;
unsigned int s;
const struct TestMessage *hdr;
hdr = (const struct TestMessage*) message;
- s = get_size (n);
+ s = get_size ();
if (measurement_running == GNUNET_NO)
return;
if (MTYPE != ntohs (message->type))
return;
+
#if DEBUG_MEASUREMENT
if (ntohl(hdr->num) % 5000 == 0)
{
ntohs (message->size));
}
#endif
- n++;
+ /*
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got message %u\n",
+ ntohl (hdr->num));*/
+ last_msg_recv = ntohl (hdr->num);
}
static size_t
-notify_ready_new (void *cls, size_t size, void *buf)
+notify_ready (void *cls, size_t size, void *buf)
{
- static int n;
char *cbuf = buf;
struct TestMessage hdr;
unsigned int s;
send_running = GNUNET_YES;
ret = 0;
- s = get_size (n);
+ s = get_size ();
GNUNET_assert (size >= s);
GNUNET_assert (buf != NULL);
+ last_msg_sent++;
cbuf = buf;
do
{
hdr.header.size = htons (s);
hdr.header.type = htons (MTYPE);
- hdr.num = htonl (n);
+ hdr.num = htonl (last_msg_sent);
memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
ret += sizeof (struct TestMessage);
- memset (&cbuf[ret], n, s - sizeof (struct TestMessage));
+ memset (&cbuf[ret], last_msg_sent, s - sizeof (struct TestMessage));
ret += s - sizeof (struct TestMessage);
#if DEBUG_MEASUREMENT
if (n % 5000 == 0)
"Sending message %u\n",n);
}
#endif
- n++;
- s = get_size (n);
+
+ /* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message %u\n",last_msg_sent);*/
+
+ s = get_size ();
if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
break; /* sometimes pack buffer full, sometimes not */
}
transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
&p1.id,
s, 0, SEND_TIMEOUT,
- ¬ify_ready_new,
+ ¬ify_ready,
NULL);
- total_bytes += s;
+ total_bytes_sent += s;
return ret;
}
#if VERBOSE
fprintf(stderr,".");
#endif
- measurement_counter_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_UNIT_SECONDS,
+ measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
&measurement_counter,
NULL);
}
measurement_end (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ static int strike_counter;
+ unsigned long long quota_allowed = 0;
+ int delta = 0;
+
measurement_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched, measurement_counter_task);
+ GNUNET_SCHEDULER_cancel (measurement_counter_task);
measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
}
#if VERBOSE
fprintf(stderr,"\n");
#endif
- /*
+
if (transmit_handle != NULL)
{
GNUNET_TRANSPORT_notify_transmit_ready_cancel(transmit_handle);
transmit_handle = NULL;
}
- */
- if ((total_bytes/(duration.rel_value / 1000)) > (current_quota_p1 + (current_quota_p1 / 10)))
+
+ if (current_quota_p1 < current_quota_p2)
+ quota_allowed = current_quota_p1;
+ else
+ quota_allowed = current_quota_p2;
+
+
+ if (MEASUREMENT_SOFT_LIMIT > (quota_allowed/10))
+ delta = MEASUREMENT_SOFT_LIMIT;
+ else
+ delta = (quota_allowed/10);
+
+ /* 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)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "\nQuota compliance failed: \n"\
+ "Hard quota limit allowed: %10llu kB/s (%llu B/s)\n"\
+ "Soft quota limit allowed: %10llu kB/s (%llu B/s)\n"\
+ "Throughput : %10llu kB/s (%llu B/s)\n",
+ (quota_allowed / (1024)), quota_allowed,
+ ((quota_allowed+delta) / (1024)), quota_allowed+delta,
+ (total_bytes_sent/(duration.rel_value / 1000)/1024),
+ total_bytes_sent/(duration.rel_value / 1000));
+ ok = 1;
+ end();
+ }
+
+ /* Throughput is bigger than allowed quota + some extra*/
+ if ((total_bytes_sent/(duration.rel_value / 1000)) > (quota_allowed + delta))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"\nQuota compliance failed: \n"\
- "Quota allowed: %10llu kB/s\n"\
- "Throughput : %10llu kB/s\n", (current_quota_p1 / (1024)) , (total_bytes/(duration.rel_value / 1000)/1024));
+ "Hard quota limit allowed: %10llu kB/s (%llu B/s)\n"\
+ "Soft quota limit allowed: %10llu kB/s (%llu B/s)\n"\
+ "Throughput : %10llu kB/s (%llu B/s)\n",
+ (quota_allowed / (1024)), quota_allowed,
+ ((quota_allowed+delta) / (1024)), quota_allowed+delta,
+ (total_bytes_sent/(duration.rel_value / 1000)/1024),
+ total_bytes_sent/(duration.rel_value / 1000));
ok = 1;
-/* end();
- return;*/
+ end();
+ return;
}
else
{
-
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"\nQuota compliance ok: \n"\
"Quota allowed: %10llu kB/s\n"\
- "Throughput : %10llu kB/s\n", (current_quota_p1 / (1024)) , (total_bytes/(duration.rel_value / 1000)/1024));
+ "Throughput : %10llu kB/s\n", (quota_allowed / (1024)) , (total_bytes_sent/(duration.rel_value / 1000)/1024));
ok = 0;
}
- if (current_quota_p1 < MEASUREMENT_MIN_QUOTA)
+ if ((quota_allowed) > (2 *(total_bytes_sent/(duration.rel_value / 1000))))
+ {
+ strike_counter++;
+ if (strike_counter == 2)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Maximum transmission rate reached, stopping test\n");
+ end();
+ return;
+ }
+ }
+ else
+ {
+ strike_counter = 0;
+ }
+
+ if (quota_allowed == MEASUREMENT_MAX_QUOTA)
{
end();
return;
}
+
+ if (is_asymmetric_send_constant == GNUNET_YES)
+ {
+ if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA)
+ measure (current_quota_p1 * 2, MEASUREMENT_MAX_QUOTA);
+ else
+ measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA);
+ }
+ else if (is_asymmetric_recv_constant == GNUNET_YES)
+ {
+ if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA)
+ measure (MEASUREMENT_MAX_QUOTA, current_quota_p2 * 2);
+ else
+ measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA);
+ }
else
{
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Scheduling next measurement\n");
-#endif
- measure (current_quota_p1 / 10, current_quota_p2 / 10);
+ if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA)
+ measure ((current_quota_p1) * 2, (current_quota_p2) * 2);
+ else
+ measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA);
}
}
current_quota_p1 = quota_p1;
current_quota_p2 = quota_p2;
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting transport level measurement for %u seconds and quota %llu kB/s\n", MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p1 / 1024);
+ if ((is_asymmetric_send_constant == GNUNET_YES) || (is_asymmetric_recv_constant == GNUNET_YES))
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting transport level measurement for %u seconds, receiving peer quota %llu kB/s, sending peer quota %llu kB/s\n", MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p1 / 1024, current_quota_p2 / 1024);
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting transport level measurement for %u seconds, symmetric quota %llu kB/s\n", MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p2 / 1024);
+
#endif
GNUNET_TRANSPORT_set_quota (p1.th,
&p2.id,
GNUNET_TIME_UNIT_FOREVER_REL,
NULL, NULL);
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&end_badly,
NULL);
if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (sched, measurement_counter_task);
- measurement_counter_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_UNIT_SECONDS,
+ GNUNET_SCHEDULER_cancel (measurement_counter_task);
+ measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
&measurement_counter,
NULL);
- measurement_task = GNUNET_SCHEDULER_add_delayed (sched,
- MEASUREMENT_INTERVALL,
+ measurement_task = GNUNET_SCHEDULER_add_delayed (MEASUREMENT_INTERVALL,
&measurement_end,
NULL);
- total_bytes = 0;
+ total_bytes_sent = 0;
+ last_msg_sent = 0;
+ last_msg_recv = 0;
measurement_running = GNUNET_YES;
start_time = GNUNET_TIME_absolute_get ();
GNUNET_TRANSPORT_notify_transmit_ready_cancel(transmit_handle);
transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
&p1.id,
- get_size (0), 0, SEND_TIMEOUT,
- ¬ify_ready_new,
+ get_size (), 0, SEND_TIMEOUT,
+ ¬ify_ready,
NULL);
}
}
if (connected == 2)
{
- measure(MEASUREMENT_MAX_QUOTA,MEASUREMENT_MAX_QUOTA);
+ if (is_asymmetric_send_constant == GNUNET_YES)
+ measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MAX_QUOTA);
+ else if (is_asymmetric_recv_constant == GNUNET_YES)
+ measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MIN_QUOTA);
+ else
+ measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MIN_QUOTA);
}
}
{
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
- p->arm_pid = GNUNET_OS_start_process (NULL, NULL,
+ p->arm_proc = GNUNET_OS_start_process (NULL, NULL,
"gnunet-service-arm",
"gnunet-service-arm",
#if VERBOSE_ARM
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
- p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, NULL,
+ p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL,
p,
¬ify_receive_new,
¬ify_connect,
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GNUNET_assert (ok == 1);
OKPP;
- sched = s;
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&end_badly,
NULL);
measurement_running = GNUNET_NO;
if (is_tcp)
{
+ if (is_asymmetric_recv_constant == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for TCP 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 TCP transport plugin\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for TCP transport plugin\n");
setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
}
else if (is_http)
{
+ if (is_asymmetric_recv_constant == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for HTTP 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 HTTP transport plugin\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for HTTP transport plugin\n");
setup_peer (&p1, "test_quota_compliance_http_peer1.conf");
setup_peer (&p2, "test_quota_compliance_http_peer2.conf");
}
else if (is_https)
{
+ if (is_asymmetric_recv_constant == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for HTTPS 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 HTTPS transport plugin\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for HTTPS transport plugin\n");
setup_peer (&p1, "test_quota_compliance_https_peer1.conf");
setup_peer (&p2, "test_quota_compliance_https_peer2.conf");
}
else if (is_udp)
{
+ if (is_asymmetric_recv_constant == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for UDP 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 UDP transport plugin\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for UDP transport plugin\n");
setup_peer (&p1, "test_quota_compliance_udp_peer1.conf");
setup_peer (&p2, "test_quota_compliance_udp_peer2.conf");
}
else if (is_tcp_nat)
{
+ if (is_asymmetric_recv_constant == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for TCP NAT 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 TCP NAT transport plugin\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for TCP NAT transport plugin\n");
setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
}
{
is_udp = GNUNET_YES;
}
+
+ if (strstr(argv[0], "asymmetric_recv") != NULL)
+ {
+ is_asymmetric_recv_constant = GNUNET_YES;
+ }
+ else
+ is_asymmetric_recv_constant = GNUNET_NO;
+ if (strstr(argv[0], "asymmetric_send") != NULL)
+ {
+ is_asymmetric_send_constant = GNUNET_YES;
+ }
+ else
+ is_asymmetric_send_constant = GNUNET_NO;
+
+ char * logger;
+ if (is_tcp == GNUNET_YES)
+ {
+ if (is_asymmetric_recv_constant == GNUNET_YES)
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","tcp","asymmetric_recv_constant");
+ else if (is_asymmetric_send_constant == GNUNET_YES)
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","tcp","asymmetric_send_constant");
+ else
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","tcp","symmetric");
+ }
+ 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 if (is_asymmetric_send_constant == GNUNET_YES)
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","asymmetric_send_constant");
+ else
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","symmetric");
+ }
+ 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 if (is_asymmetric_send_constant == GNUNET_YES)
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","asymmetric_send_constant");
+ else
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","symmetric");
+ }
+ 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 if (is_asymmetric_send_constant == GNUNET_YES)
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","asymmetric_send_constant");
+ else
+ GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","symmetric");
+ }
+ fprintf(stderr, "Running `%s'\n", logger);
GNUNET_log_setup ("test-quota-compliance",
#if VERBOSE
"DEBUG",
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
-
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv1) / sizeof (char *)) - 1,
- argv1, "test-quota-compliance", "nohelp",
+ argv1, logger , "nohelp",
options, &run, &ok);
ret = ok;
stop_arm (&p1);
stop_arm (&p2);
+ GNUNET_free(logger);
GNUNET_DISK_directory_remove ("/tmp/test_quota_compliance_peer1");
GNUNET_DISK_directory_remove ("/tmp/test_quota_compliance_peer2");
return ret;