#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
-/**
- * Note that this value must not significantly exceed
- * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
- * messages may be dropped even for a reliable transport.
- */
-#define TOTAL_MSGS (10000 * 2)
-
-#define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
+#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_MAX_QUOTA 1024 * 1024 * 1024
#define MEASUREMENT_MIN_QUOTA 1024
+#define SEND_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define MEASUREMENT_SOFT_LIMIT 1024
/**
* Testcase timeout
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 200)
+
#define MTYPE 11111
struct PeerContext
struct GNUNET_TRANSPORT_Handle *th;
struct GNUNET_PeerIdentity id;
#if START_ARM
- pid_t arm_pid;
+ struct GNUNET_OS_Process *arm_proc;
#endif
};
+/**
+ * Handle for a transmission-ready request.
+ */
+struct GNUNET_TRANSPORT_TransmitHandle
+{
+
+ /**
+ * Neighbour for this handle, NULL for control-traffic.
+ */
+ struct NeighbourList *neighbour;
+
+ /**
+ * Function to call when notify_size bytes are available
+ * for transmission.
+ */
+ GNUNET_CONNECTION_TransmitReadyNotify notify;
+
+ /**
+ * Closure for notify.
+ */
+ void *notify_cls;
+
+ /**
+ * transmit_ready task Id. The task is used to introduce the
+ * artificial delay that may be required to maintain the bandwidth
+ * limits. Later, this will be the ID of the "transmit_timeout"
+ * task which is used to signal a timeout if the transmission could
+ * not be done in a timely fashion.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier notify_delay_task;
+
+ /**
+ * Timeout for this request.
+ */
+ struct GNUNET_TIME_Absolute timeout;
+
+ /**
+ * How many bytes is our notify callback waiting for?
+ */
+ size_t notify_size;
+
+ /**
+ * How important is this message?
+ */
+ unsigned int priority;
+
+};
+
static struct PeerContext p1;
static struct PeerContext p2;
-static struct GNUNET_SCHEDULER_Handle *sched;
-
static int ok;
static int connected;
+static int measurement_running;
+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_tcp;
+static int is_tcp_nat;
+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 struct GNUNET_TIME_Absolute start_time;
static GNUNET_SCHEDULER_TaskIdentifier die_task;
static GNUNET_SCHEDULER_TaskIdentifier measurement_task;
+static GNUNET_SCHEDULER_TaskIdentifier measurement_counter_task;
-static int msg_scheduled;
-static int msg_sent;
-static int msg_recv_expected;
-static int msg_recv;
-
+static 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 ()
+end_send ()
{
- unsigned long long delta;
- GNUNET_SCHEDULER_cancel (sched, die_task);
+}
+
+static void
+end ()
+{
+ GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
-#if VERBOSE
+
+ if (measurement_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (measurement_task);
+ measurement_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ 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");
#endif
GNUNET_TRANSPORT_disconnect (p1.th);
GNUNET_TRANSPORT_disconnect (p2.th);
-#if VERBOSE
+#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transports disconnected, returning success!\n");
#endif
- delta = GNUNET_TIME_absolute_get_duration (start_time).value;
- fprintf (stderr,
- "\nThroughput was %llu kb/s\n",
- total_bytes * 1000 / 1024 / delta);
- ok = 0;
-
+ 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);
}
end_badly (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
-
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "end_badly \n ");
+ if (measurement_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (measurement_task);
+ measurement_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (measurement_counter_task);
+ measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
+ }
GNUNET_break (0);
if (p1.th != NULL)
GNUNET_TRANSPORT_disconnect (p1.th);
uint32_t num;
};
-
-static unsigned int
-get_size (unsigned int iter)
-{
- unsigned int ret;
-
- if (iter < 60000)
- return iter + sizeof (struct TestMessage);
- ret = (iter * iter * iter);
- return sizeof (struct TestMessage) + (ret % 60000);
-}
-
static unsigned int
-get_size_new (unsigned int iter)
+get_size (void)
{
return MEASUREMENT_MSG_SIZE + sizeof (struct TestMessage);
}
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)
{
- static int n;
unsigned int s;
- char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
const struct TestMessage *hdr;
hdr = (const struct TestMessage*) message;
- s = get_size_new (n);
+ s = get_size ();
+ if (measurement_running == GNUNET_NO)
+ return;
if (MTYPE != ntohs (message->type))
return;
- msg_recv_expected = n;
- msg_recv = ntohl(hdr->num);
- /*
- if (ntohs (message->size) != s)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u of size %u, got %u bytes of message %u\n",
- n, s,
- ntohs (message->size),
- ntohl (hdr->num));
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
- return;
- }
- if (ntohl (hdr->num) != n)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u of size %u, got %u bytes of message %u\n",
- n, s,
- ntohs (message->size),
- ntohl (hdr->num));
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
- return;
- }
- */
- /*
- memset (cbuf, n, s - sizeof (struct TestMessage));
- if (0 != memcmp (cbuf,
- &hdr[1],
- s - sizeof (struct TestMessage)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u with bits %u, but body did not match\n",
- n, (unsigned char) n);
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched, &end_badly, NULL);
- return;
- }
- */
#if DEBUG_MEASUREMENT
if (ntohl(hdr->num) % 5000 == 0)
{
ntohs (message->size));
}
#endif
- n++;
-
-
- if (0 == (n % (TOTAL_MSGS/10)))
- {
- fprintf (stderr, ".");
- }
+ /*
+ 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;
unsigned int ret;
+ transmit_handle = NULL;
+
+ if (measurement_task == GNUNET_SCHEDULER_NO_TASK)
+ return 0;
+
if (buf == NULL)
{
- GNUNET_break (0);
ok = 42;
return 0;
}
+
+ if (measurement_running != GNUNET_YES)
+ {
+ send_running = GNUNET_NO;
+ end_send();
+ return 0;
+ }
+
+ send_running = GNUNET_YES;
ret = 0;
- s = get_size_new (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);
- msg_sent = 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_new (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 */
}
while (size - ret >= s);
- GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
+ transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
&p1.id,
- s, 0, TIMEOUT,
- ¬ify_ready_new,
+ s, 0, SEND_TIMEOUT,
+ ¬ify_ready,
NULL);
- msg_scheduled = n;
- total_bytes += s;
+ total_bytes_sent += s;
return ret;
}
static void measure (unsigned long long quota_p1, unsigned long long quota_p2 );
+static void measurement_counter
+ (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
+
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ return;
+
+ fprintf(stderr,".");
+ measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &measurement_counter,
+ NULL);
+}
+
static void
-stop_measurement (void *cls,
+measurement_end (void *cls,
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;
+
+ measurement_task = GNUNET_SCHEDULER_NO_TASK;
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ return;
+
+ measurement_running = GNUNET_NO;
struct GNUNET_TIME_Relative duration = GNUNET_TIME_absolute_get_difference(start_time, GNUNET_TIME_absolute_get());
- fprintf (stderr, "\n");
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Measurement finished: \n Quota allowed: %llu kb/s\n Throughput: %llu kb/s\n", (current_quota_p1 / (1024)) , (total_bytes/(duration.value / 1000)/1024));
- if (current_quota_p1 < (MEASUREMENT_MIN_QUOTA))
+
+
+ if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (measurement_counter_task);
+ measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (transmit_handle != NULL)
+ {
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel(transmit_handle);
+ transmit_handle = NULL;
+ }
+
+ if (current_quota_p1 < current_quota_p2)
+ quota_allowed = current_quota_p1;
+ else
+ quota_allowed = current_quota_p2;
+
+
+ if (MEASUREMENT_SOFT_LIMIT > (quota_allowed/3))
+ delta = MEASUREMENT_SOFT_LIMIT;
+ else
+ 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)
+ {
+ 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;
+ 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*/
+ if ((total_bytes_sent/(duration.rel_value / 1000)) > (quota_allowed + delta))
+ {
+ 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;
+ 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
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "\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))))
+ {
+ if (failed_measurement_counter < 2)
+ failed_measurement_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
- measure (current_quota_p1/100, current_quota_p2/100);
+ {
+ if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA)
+ measure ((current_quota_p1) * 2, (current_quota_p2) * 2);
+ else
+ measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA);
+ }
}
-
static void measure (unsigned long long quota_p1, unsigned long long quota_p2 )
{
current_quota_p1 = quota_p1;
current_quota_p2 = quota_p2;
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting measurement: Duration: %u Quota: %u\n", MEASUREMENT_INTERVALL, current_quota_p1);
-#endif
+ 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);
- GNUNET_TRANSPORT_set_quota (p1.th,
+#endif
+ GNUNET_TRANSPORT_set_quota (p1.th,
&p2.id,
GNUNET_BANDWIDTH_value_init (current_quota_p1 ),
GNUNET_BANDWIDTH_value_init (current_quota_p1 ),
GNUNET_TIME_UNIT_FOREVER_REL,
NULL, NULL);
- GNUNET_TRANSPORT_set_quota (p2.th,
+ GNUNET_TRANSPORT_set_quota (p2.th,
&p1.id,
GNUNET_BANDWIDTH_value_init (current_quota_p2),
GNUNET_BANDWIDTH_value_init (current_quota_p2),
GNUNET_TIME_UNIT_FOREVER_REL,
NULL, NULL);
- GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
- &p1.id,
- get_size_new (0), 0, TIMEOUT,
- ¬ify_ready_new,
- NULL);
-
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly,
- NULL);
- measurement_task = GNUNET_SCHEDULER_add_delayed (sched,
- MEASUREMENT_INTERVALL,
- &stop_measurement,
- NULL);
- total_bytes = 0;
- start_time = GNUNET_TIME_absolute_get ();
+
+ 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 (measurement_counter_task);
+ measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &measurement_counter,
+ NULL);
+ measurement_task = GNUNET_SCHEDULER_add_delayed (MEASUREMENT_INTERVALL,
+ &measurement_end,
+ NULL);
+ total_bytes_sent = 0;
+ last_msg_sent = 0;
+ last_msg_recv = 0;
+ measurement_running = GNUNET_YES;
+ start_time = GNUNET_TIME_absolute_get ();
+
+ if (transmit_handle != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel(transmit_handle);
+ transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
+ &p1.id,
+ get_size (), 0, SEND_TIMEOUT,
+ ¬ify_ready,
+ NULL);
}
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)
{
}
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,
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);
}
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;
+ send_running = GNUNET_NO;
+ recv_running = GNUNET_NO;
- /* Setting initial quota for both peers */
- current_quota_p1 = 1024 * 1024 * 1024;
- current_quota_p2 = 1024 * 1024 * 1024;
-
- setup_peer (&p1, "test_quota_compliance_peer1.conf");
- setup_peer (&p2, "test_quota_compliance_peer2.conf");
+ 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_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)
+ 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");
+ }
+ else
+ GNUNET_assert (0);
GNUNET_assert(p1.th != NULL);
GNUNET_assert(p2.th != NULL);
#ifdef MINGW
return GNUNET_SYSERR;
#endif
+ if (strstr(argv[0], "tcp_nat") != NULL)
+ {
+ is_tcp_nat = GNUNET_YES;
+ }
+ else if (strstr(argv[0], "tcp") != NULL)
+ {
+ is_tcp = GNUNET_YES;
+ }
+ else if (strstr(argv[0], "https") != NULL)
+ {
+ is_https = GNUNET_YES;
+ }
+ else if (strstr(argv[0], "http") != NULL)
+ {
+ is_http = GNUNET_YES;
+ }
+ else if (strstr(argv[0], "udp") != NULL)
+ {
+ is_udp = GNUNET_YES;
+ }
+ else if (strstr(argv[0], "unix") != NULL)
+ {
+ is_unix = 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");
+ }
+ 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 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");
+ }
+ 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 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");
+ }
+ 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 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");
+ }
+ 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
"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;
projects / oweals / gnunet.git / blobdiff