X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Ftest_core_quota_compliance.c;h=bf9197f0c156bb0fe18e110a2cc5a7b7d461e6c1;hb=4e1baae59f18ee5d7cd47afe28ced3daaaa5a5ad;hp=6c5a528ec4e76b8a08a3d127f53f828662751d5c;hpb=c99fe3ca615e6675d690f7b2740ca398c2bccc55;p=oweals%2Fgnunet.git diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 6c5a528ec..bf9197f0c 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -20,13 +20,8 @@ /** * @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" -#include "gnunet_constants.h" #include "gnunet_arm_service.h" #include "gnunet_core_service.h" #include "gnunet_getopt_lib.h" @@ -36,15 +31,11 @@ #include "gnunet_transport_service.h" #include "gnunet_statistics_service.h" -#define VERBOSE GNUNET_NO -#define DEBUG_TRANSMISSION GNUNET_NO #define SYMMETRIC 0 #define ASYMMETRIC_SEND_LIMITED 1 #define ASYMMETRIC_RECV_LIMITED 2 -#define START_ARM GNUNET_YES - /** * Note that this value must not significantly exceed * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise @@ -55,18 +46,16 @@ /** * 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, 300) /** * What delay do we request from the core service for transmission? - * Any value smaller than the CORK delay will disable CORKing, which - * is what we want here. */ -#define FAST_TIMEOUT GNUNET_TIME_relative_divide (GNUNET_CONSTANTS_MAX_CORK_DELAY, 2) +#define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150) #define MTYPE 12345 #define MESSAGESIZE 1024 -#define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) +#define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) static unsigned long long total_bytes_sent; static unsigned long long total_bytes_recv; @@ -77,19 +66,21 @@ static GNUNET_SCHEDULER_TaskIdentifier err_task; static GNUNET_SCHEDULER_TaskIdentifier measure_task; +static GNUNET_SCHEDULER_TaskIdentifier connect_task; + struct PeerContext { struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CORE_Handle *ch; - struct GNUNET_PeerIdentity id; + struct GNUNET_CORE_TransmitHandle *nth; + struct GNUNET_PeerIdentity id; struct GNUNET_TRANSPORT_Handle *th; struct GNUNET_MessageHeader *hello; struct GNUNET_STATISTICS_Handle *stats; + struct GNUNET_TRANSPORT_GetHelloHandle *ghh; int connect_status; -#if START_ARM struct GNUNET_OS_Process *arm_proc; -#endif }; static struct PeerContext p1; @@ -108,53 +99,104 @@ static int running; #if VERBOSE -#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) +#define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) #else #define OKPP do { ok++; } while (0) #endif -struct TestMessage +struct TestMessage { struct GNUNET_MessageHeader header; uint32_t num; }; +static void +process_hello (void *cls, const struct GNUNET_MessageHeader *message); + static void terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - GNUNET_CORE_disconnect (p1.ch); + struct GNUNET_CORE_Handle *ch; + + err_task = GNUNET_SCHEDULER_NO_TASK; + GNUNET_STATISTICS_destroy (p1.stats, GNUNET_NO); + GNUNET_STATISTICS_destroy (p2.stats, GNUNET_NO); + GNUNET_TRANSPORT_get_hello_cancel (p2.ghh); + GNUNET_TRANSPORT_get_hello_cancel (p1.ghh); + if (p1.nth != NULL) + { + GNUNET_CORE_notify_transmit_ready_cancel (p1.nth); + p1.nth = NULL; + } + if (connect_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel (connect_task); + connect_task = GNUNET_SCHEDULER_NO_TASK; + } + 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); p2.th = NULL; + GNUNET_free_non_null (p1.hello); + GNUNET_free_non_null (p2.hello); } static void terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + err_task = GNUNET_SCHEDULER_NO_TASK; + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase failed!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase failed!\n"); //GNUNET_break (0); - + if (p1.nth != NULL) + { + GNUNET_CORE_notify_transmit_ready_cancel (p1.nth); + p1.nth = NULL; + } if (measure_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel(measure_task); + GNUNET_SCHEDULER_cancel (measure_task); + if (connect_task != GNUNET_SCHEDULER_NO_TASK) + { + GNUNET_SCHEDULER_cancel (connect_task); + connect_task = GNUNET_SCHEDULER_NO_TASK; + } - GNUNET_CORE_disconnect (p1.ch); + GNUNET_TRANSPORT_get_hello_cancel (p1.ghh); + GNUNET_TRANSPORT_get_hello_cancel (p2.ghh); + if (NULL != p1.ch) + GNUNET_CORE_disconnect (p1.ch); p1.ch = NULL; - GNUNET_CORE_disconnect (p2.ch); + if (NULL != p2.ch) + GNUNET_CORE_disconnect (p2.ch); p2.ch = NULL; - GNUNET_TRANSPORT_disconnect (p1.th); + if (NULL != p1.th) + GNUNET_TRANSPORT_disconnect (p1.th); p1.th = NULL; - GNUNET_TRANSPORT_disconnect (p2.th); + if (NULL != p2.th) + GNUNET_TRANSPORT_disconnect (p2.th); p2.th = NULL; ok = 42; } +static void +try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + connect_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, + NULL); + GNUNET_TRANSPORT_try_connect (p1.th, &p2.id, NULL, NULL); /*FIXME TRY_CONNECT change */ + GNUNET_TRANSPORT_try_connect (p2.th, &p1.id, NULL, NULL); /*FIXME TRY_CONNECT change */ +} + /** * Callback function to process statistic values. * @@ -166,141 +208,106 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration */ static int -print_stat (void *cls, - const char *subsystem, - const char *name, - uint64_t value, - int is_persistent) +print_stat (void *cls, const char *subsystem, const char *name, uint64_t value, + int is_persistent) { - if (cls==&p1) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer1 %50s = %12llu\n", - name, - (unsigned long long) value); - if (cls==&p2) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer2 %50s = %12llu\n", - name, - (unsigned long long) value); + if (cls == &p1) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer1 %50s = %12llu\n", name, + (unsigned long long) value); + if (cls == &p2) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer2 %50s = %12llu\n", name, + (unsigned long long) value); return GNUNET_OK; } static void measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - unsigned long long int delta; - unsigned long long int throughput_out; - unsigned long long int throughput_in; - unsigned long long int max_quota_in; - unsigned long long int max_quota_out; - unsigned long long int quota_delta; + unsigned long long delta; + unsigned long long throughput_out; + unsigned long long throughput_in; + unsigned long long max_quota_in; + unsigned long long max_quota_out; + unsigned long long quota_delta; + enum GNUNET_ErrorType kind = GNUNET_ERROR_TYPE_DEBUG; measure_task = GNUNET_SCHEDULER_NO_TASK; - fprintf(stdout,"\n"); + FPRINTF (stdout, "%s", "\n"); running = GNUNET_NO; - delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value; - - throughput_out = total_bytes_sent * 1000 / 1024 / delta; - throughput_in = total_bytes_recv * 1000 / 1024 / delta; + delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us; - if (current_quota_p1_in < current_quota_p2_in) - max_quota_in = current_quota_p1_in; - else - max_quota_in = current_quota_p2_in; - if (current_quota_p1_out < current_quota_p2_out) - max_quota_out = current_quota_p1_out; - else - max_quota_out = current_quota_p2_out; + throughput_out = total_bytes_sent * 1000000LL / delta; /* convert to bytes/s */ + throughput_in = total_bytes_recv * 1000000LL / delta; /* convert to bytes/s */ + max_quota_in = GNUNET_MIN (current_quota_p1_in, current_quota_p2_in); + max_quota_out = GNUNET_MIN (current_quota_p1_out, current_quota_p2_out); if (max_quota_out < max_quota_in) - quota_delta = max_quota_in / 10; + quota_delta = max_quota_in / 3; else - quota_delta = max_quota_out / 10; + quota_delta = max_quota_out / 3; - if ((throughput_out > (max_quota_out+quota_delta)/1024) || (throughput_in > (max_quota_in+quota_delta)/1024)) - ok = 1; + if ((throughput_out > (max_quota_out + quota_delta)) || + (throughput_in > (max_quota_in + quota_delta))) + ok = 1; /* fail */ else - ok = 0; - - GNUNET_STATISTICS_get (p1.stats, - "core", - "# discarded CORE_SEND requests", - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - &print_stat, &p1); - - GNUNET_STATISTICS_get (p1.stats, - "core", - "# discarded CORE_SEND request bytes", - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - &print_stat, &p1); - GNUNET_STATISTICS_get (p1.stats, - "core", - "# discarded lower priority CORE_SEND requests", - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - &print_stat, NULL); - GNUNET_STATISTICS_get (p1.stats, - "core", - "# discarded lower priority CORE_SEND request bytes", - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - &print_stat, &p1); - GNUNET_STATISTICS_get (p2.stats, - "core", - "# discarded CORE_SEND requests", - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - &print_stat, &p2); - - GNUNET_STATISTICS_get (p2.stats, - "core", - "# discarded CORE_SEND request bytes", - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - &print_stat, &p2); - GNUNET_STATISTICS_get (p2.stats, - "core", - "# discarded lower priority CORE_SEND requests", - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - &print_stat, &p2); - GNUNET_STATISTICS_get (p2.stats, - "core", - "# discarded lower priority CORE_SEND request bytes", - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - &print_stat, &p2); - - enum GNUNET_ErrorType kind = GNUNET_ERROR_TYPE_DEBUG; - if (ok==1) - { - kind = GNUNET_ERROR_TYPE_ERROR; - } + ok = 0; /* pass */ + GNUNET_STATISTICS_get (p1.stats, "core", "# discarded CORE_SEND requests", + GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1); + + GNUNET_STATISTICS_get (p1.stats, "core", + "# discarded CORE_SEND request bytes", + GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1); + GNUNET_STATISTICS_get (p1.stats, "core", + "# discarded lower priority CORE_SEND requests", + GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, NULL); + GNUNET_STATISTICS_get (p1.stats, "core", + "# discarded lower priority CORE_SEND request bytes", + GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1); + GNUNET_STATISTICS_get (p2.stats, "core", "# discarded CORE_SEND requests", + GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2); + + GNUNET_STATISTICS_get (p2.stats, "core", + "# discarded CORE_SEND request bytes", + GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2); + GNUNET_STATISTICS_get (p2.stats, "core", + "# discarded lower priority CORE_SEND requests", + GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2); + GNUNET_STATISTICS_get (p2.stats, "core", + "# discarded lower priority CORE_SEND request bytes", + GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2); + + if (ok != 0) + kind = GNUNET_ERROR_TYPE_ERROR; switch (test) { case SYMMETRIC: - GNUNET_log (kind,"Core quota compliance test with symmetric quotas: %s\n", (ok==0)?"PASSED":"FAILED"); - break; + GNUNET_log (kind, "Core quota compliance test with symmetric quotas: %s\n", + (0 == ok) ? "PASSED" : "FAILED"); + break; case ASYMMETRIC_SEND_LIMITED: - GNUNET_log (kind,"Core quota compliance test with limited sender quota: %s\n", (ok==0)?"PASSED":"FAILED"); - break; + GNUNET_log (kind, + "Core quota compliance test with limited sender quota: %s\n", + (0 == ok) ? "PASSED" : "FAILED"); + break; case ASYMMETRIC_RECV_LIMITED: - GNUNET_log (kind,"Core quota compliance test with limited receiver quota: %s\n", (ok==0)?"PASSED":"FAILED"); - break; + GNUNET_log (kind, + "Core quota compliance test with limited receiver quota: %s\n", + (0 == ok) ? "PASSED" : "FAILED"); + break; }; - GNUNET_log (kind,"Peer 1 send rate: %llu kB/s (%llu Bytes in %u sec.)\n",throughput_out,total_bytes_sent, delta/1000); - GNUNET_log (kind,"Peer 1 send quota: %llu kB/s\n",current_quota_p1_out / 1024); - GNUNET_log (kind,"Peer 2 receive rate: %llu kB/s (%llu Bytes in %u sec.)\n",throughput_in,total_bytes_recv, delta/1000); - GNUNET_log (kind,"Peer 2 receive quota: %llu kB/s\n",current_quota_p2_in / 1024); + GNUNET_log (kind, "Peer 1 send rate: %llu b/s (%llu bytes in %llu ms)\n", + throughput_out, total_bytes_sent, delta); + GNUNET_log (kind, "Peer 1 send quota: %llu b/s\n", current_quota_p1_out); + GNUNET_log (kind, "Peer 2 receive rate: %llu b/s (%llu bytes in %llu ms)\n", + throughput_in, total_bytes_recv, delta); + GNUNET_log (kind, "Peer 2 receive quota: %llu b/s\n", current_quota_p2_in); /* - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. inbound quota allowed: %llu kB/s\n",max_quota_in /1024); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. outbound quota allowed: %llu kB/s\n",max_quota_out/1024); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. inbound quota allowed: %llu b/s\n",max_quota_in ); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. outbound quota allowed: %llu b/s\n",max_quota_out); */ GNUNET_SCHEDULER_cancel (err_task); - GNUNET_SCHEDULER_add_now (&terminate_task, NULL); + err_task = GNUNET_SCHEDULER_add_now (&terminate_task, NULL); } @@ -311,49 +318,45 @@ transmit_ready (void *cls, size_t size, void *buf) struct TestMessage hdr; unsigned int ret; + p1.nth = NULL; GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE); if (buf == NULL) - { - if (p1.ch != NULL) - GNUNET_break (NULL != - GNUNET_CORE_notify_transmit_ready (p1.ch, - 0, - FAST_TIMEOUT, - &p2.id, - MESSAGESIZE, - &transmit_ready, &p1)); - return 0; - } + { + if ((p1.ch != NULL) && (p1.connect_status == 1)) + GNUNET_break (NULL != + (p1.nth = + GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, + GNUNET_CORE_PRIO_BEST_EFFORT, + FAST_TIMEOUT, &p2.id, + MESSAGESIZE, + &transmit_ready, &p1))); + return 0; + } GNUNET_assert (tr_n < TOTAL_MSGS); ret = 0; GNUNET_assert (size >= MESSAGESIZE); GNUNET_assert (buf != NULL); cbuf = buf; do - { -#if DEBUG_TRANSMISSION - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending message %u of size %u at offset %u\n", - tr_n, - MESSAGESIZE, - ret); -#endif - hdr.header.size = htons (MESSAGESIZE); - hdr.header.type = htons (MTYPE); - hdr.num = htonl (tr_n); - memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage)); - ret += sizeof (struct TestMessage); - memset (&cbuf[ret], tr_n, MESSAGESIZE - sizeof (struct TestMessage)); - ret += MESSAGESIZE - sizeof (struct TestMessage); - tr_n++; - if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16)) - break; /* sometimes pack buffer full, sometimes not */ - } + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Sending message %u of size %u at offset %u\n", tr_n, + MESSAGESIZE, ret); + hdr.header.size = htons (MESSAGESIZE); + hdr.header.type = htons (MTYPE); + hdr.num = htonl (tr_n); + memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage)); + ret += sizeof (struct TestMessage); + memset (&cbuf[ret], tr_n, MESSAGESIZE - sizeof (struct TestMessage)); + ret += MESSAGESIZE - sizeof (struct TestMessage); + tr_n++; + if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16)) + break; /* sometimes pack buffer full, sometimes not */ + } while (size - ret >= MESSAGESIZE); GNUNET_SCHEDULER_cancel (err_task); - err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, - &terminate_task_error, - NULL); + err_task = + GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); total_bytes_sent += ret; return ret; @@ -362,81 +365,87 @@ transmit_ready (void *cls, size_t size, void *buf) static void -connect_notify (void *cls, - const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) +connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) { struct PeerContext *pc = cls; + if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity))) + return; /* loopback */ GNUNET_assert (pc->connect_status == 0); pc->connect_status = 1; if (pc == &p1) - { -#if DEBUG_TRANSMISSION - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Encrypted connection established to peer `%4s'\n", - GNUNET_i2s (peer)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking core (1) for transmission to peer `%4s'\n", - GNUNET_i2s (&p2.id)); -#endif - if (err_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (err_task); - err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, - &terminate_task_error, - NULL); - start_time = GNUNET_TIME_absolute_get (); - running = GNUNET_YES; - 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_log (GNUNET_ERROR_TYPE_DEBUG, + "Encrypted connection established to peer `%4s'\n", + GNUNET_i2s (peer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Asking core (1) for transmission to peer `%4s'\n", + GNUNET_i2s (&p2.id)); + if (err_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (err_task); + err_task = + GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); + start_time = GNUNET_TIME_absolute_get (); + running = GNUNET_YES; + measure_task = + GNUNET_SCHEDULER_add_delayed (MEASUREMENT_LENGTH, &measurement_stop, + NULL); + + GNUNET_break (NULL != + (p1.nth = + GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, + GNUNET_CORE_PRIO_BEST_EFFORT, + TIMEOUT, &p2.id, + MESSAGESIZE, + &transmit_ready, &p1))); + } } static void -disconnect_notify (void *cls, - const struct GNUNET_PeerIdentity *peer) +disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) { struct PeerContext *pc = cls; + + if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity))) + return; /* loopback */ pc->connect_status = 0; -#if DEBUG_TRANSMISSION - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Encrypted connection to `%4s' cut\n", GNUNET_i2s (peer)); -#endif + if (GNUNET_SCHEDULER_NO_TASK != measure_task) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Measurement aborted due to disconnect!\n"); + GNUNET_SCHEDULER_cancel (measure_task); + measure_task = GNUNET_SCHEDULER_NO_TASK; + } + if (pc->nth != NULL) + { + GNUNET_CORE_notify_transmit_ready_cancel (pc->nth); + pc->nth = NULL; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted connection to `%4s' cut\n", + GNUNET_i2s (peer)); } static int -inbound_notify (void *cls, - const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) +inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, + const struct GNUNET_MessageHeader *message) { -#if DEBUG_TRANSMISSION GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Core provides inbound data from `%4s' %llu.\n", GNUNET_i2s (other), ntohs(message->size)); -#endif - total_bytes_recv += ntohs(message->size); + "Core provides inbound data from `%4s' %llu.\n", + GNUNET_i2s (other), ntohs (message->size)); + total_bytes_recv += ntohs (message->size); return GNUNET_OK; } static int -outbound_notify (void *cls, - const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) +outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, + const struct GNUNET_MessageHeader *message) { -#if DEBUG_TRANSMISSION GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core notifies about outbound data for `%4s'.\n", GNUNET_i2s (other)); -#endif return GNUNET_OK; } @@ -445,58 +454,47 @@ static size_t transmit_ready (void *cls, size_t size, void *buf); static int -process_mtype (void *cls, - const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) +process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_MessageHeader *message) { static int n; const struct TestMessage *hdr; - hdr = (const struct TestMessage*) message; + hdr = (const struct TestMessage *) message; if (MTYPE != ntohs (message->type)) return GNUNET_SYSERR; if (ntohs (message->size) != MESSAGESIZE) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Expected message %u of size %u, got %u bytes of message %u\n", - n, MESSAGESIZE, - ntohs (message->size), - ntohl (hdr->num)); - GNUNET_SCHEDULER_cancel (err_task); - err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL); - return GNUNET_SYSERR; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Expected message %u of size %u, got %u bytes of message %u\n", + n, MESSAGESIZE, ntohs (message->size), ntohl (hdr->num)); + GNUNET_SCHEDULER_cancel (err_task); + err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL); + return GNUNET_SYSERR; + } 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, MESSAGESIZE, - ntohs (message->size), - ntohl (hdr->num)); - GNUNET_SCHEDULER_cancel (err_task); - err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL); - return GNUNET_SYSERR; - } -#if DEBUG_TRANSMISSION - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Got message %u of size %u\n", - ntohl (hdr->num), - ntohs (message->size)); -#endif + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Expected message %u of size %u, got %u bytes of message %u\n", + n, MESSAGESIZE, ntohs (message->size), ntohl (hdr->num)); + GNUNET_SCHEDULER_cancel (err_task); + err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL); + return GNUNET_SYSERR; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n", + ntohl (hdr->num), ntohs (message->size)); n++; if (0 == (n % 10)) - fprintf (stderr, "."); + FPRINTF (stderr, "%s", "."); if (running == GNUNET_YES) - GNUNET_break (NULL != - GNUNET_CORE_notify_transmit_ready (p1.ch, - 0, - FAST_TIMEOUT, - &p2.id, - MESSAGESIZE, - &transmit_ready, &p1)); + GNUNET_break (NULL != + GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, + GNUNET_CORE_PRIO_BEST_EFFORT, + FAST_TIMEOUT, &p2.id, + MESSAGESIZE, + &transmit_ready, &p1)); return GNUNET_OK; } @@ -510,76 +508,57 @@ static struct GNUNET_CORE_MessageHandler handlers[] = { static void init_notify (void *cls, - struct GNUNET_CORE_Handle *server, - const struct GNUNET_PeerIdentity *my_identity, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) + const struct GNUNET_PeerIdentity *my_identity) { struct PeerContext *p = cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection to CORE service of `%4s' established\n", GNUNET_i2s (my_identity)); - GNUNET_assert (server != NULL); + GNUNET_assert (NULL != my_identity); p->id = *my_identity; - p->ch = server; if (cls == &p1) - { - GNUNET_assert (ok == 2); - OKPP; - /* connect p2 */ - GNUNET_CORE_connect (p2.cfg, 1, - &p2, - &init_notify, - &connect_notify, - &disconnect_notify, - NULL, - &inbound_notify, - GNUNET_YES, - &outbound_notify, GNUNET_YES, handlers); - } + { + GNUNET_assert (ok == 2); + OKPP; + /* connect p2 */ + p2.ch = + GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify, + &disconnect_notify, &inbound_notify, GNUNET_YES, + &outbound_notify, GNUNET_YES, handlers); + } else - { - GNUNET_assert (ok == 3); - OKPP; - GNUNET_assert (cls == &p2); -#if DEBUG_TRANSMISSION - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking core (1) to connect to peer `%4s'\n", - GNUNET_i2s (&p2.id)); -#endif - GNUNET_CORE_peer_request_connect (p1.ch, - GNUNET_TIME_UNIT_SECONDS, - &p2.id, - NULL, NULL); - } + { + GNUNET_assert (ok == 3); + OKPP; + GNUNET_assert (cls == &p2); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Asking core (1) to connect to peer `%4s'\n", + GNUNET_i2s (&p2.id)); + connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL); + } } static void -process_hello (void *cls, - const struct GNUNET_MessageHeader *message) +process_hello (void *cls, const struct GNUNET_MessageHeader *message) { struct PeerContext *p = cls; - GNUNET_TRANSPORT_get_hello_cancel (p->th, &process_hello, p); - -#if DEBUG_TRANSMISSION GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received (my) `%s' from transport service\n", - "HELLO"); -#endif + "Received (my) `%s' from transport service\n", "HELLO"); GNUNET_assert (message != NULL); 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); } @@ -587,181 +566,174 @@ process_hello (void *cls, static void setup_peer (struct PeerContext *p, const char *cfgname) { + char *binary; + + binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); p->cfg = GNUNET_CONFIGURATION_create (); -#if START_ARM - p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", -#if VERBOSE - "-L", "DEBUG", -#endif - "-c", cfgname, NULL); -#endif + p->arm_proc = + GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, + NULL, NULL, NULL, + binary, + "gnunet-service-arm", + "-c", cfgname, NULL); GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); - p->stats = GNUNET_STATISTICS_create ("core",p->cfg); - GNUNET_assert (p->stats!=NULL); + p->stats = GNUNET_STATISTICS_create ("core", p->cfg); + GNUNET_assert (p->stats != NULL); p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); GNUNET_assert (p->th != NULL); - GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); + p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); + GNUNET_free (binary); } static void -run (void *cls, - char *const *args, - const char *cfgfile, +run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { GNUNET_assert (ok == 1); OKPP; - err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, - &terminate_task_error, - NULL); + err_task = + GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); if (test == SYMMETRIC) - { - setup_peer (&p1, "test_core_quota_peer1.conf"); - setup_peer (&p2, "test_core_quota_peer2.conf"); - } + { + setup_peer (&p1, "test_core_quota_peer1.conf"); + setup_peer (&p2, "test_core_quota_peer2.conf"); + } else if (test == ASYMMETRIC_SEND_LIMITED) - { - setup_peer (&p1, "test_core_quota_asymmetric_send_limit_peer1.conf"); - setup_peer (&p2, "test_core_quota_asymmetric_send_limit_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) - { - setup_peer (&p1, "test_core_quota_asymmetric_recv_limited_peer1.conf"); - setup_peer (&p2, "test_core_quota_asymmetric_recv_limited_peer2.conf"); - } + { + setup_peer (&p1, "test_core_quota_asymmetric_recv_limited_peer1.conf"); + setup_peer (&p2, "test_core_quota_asymmetric_recv_limited_peer2.conf"); + } GNUNET_assert (test != -1); - GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number (p1.cfg, - "CORE", - "TOTAL_QUOTA_IN", - ¤t_quota_p1_in)); - GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number (p2.cfg, - "CORE", - "TOTAL_QUOTA_IN", - ¤t_quota_p2_in)); - GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number (p1.cfg, - "CORE", - "TOTAL_QUOTA_OUT", - ¤t_quota_p1_out)); - GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number (p2.cfg, - "CORE", - "TOTAL_QUOTA_OUT", - ¤t_quota_p2_out)); - - GNUNET_CORE_connect (p1.cfg, 1, - &p1, - &init_notify, - &connect_notify, - &disconnect_notify, - NULL, - &inbound_notify, - GNUNET_YES, &outbound_notify, GNUNET_YES, handlers); + GNUNET_assert (GNUNET_SYSERR != + GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", + "WAN_QUOTA_IN", + ¤t_quota_p1_in)); + GNUNET_assert (GNUNET_SYSERR != + GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", + "WAN_QUOTA_IN", + ¤t_quota_p2_in)); + GNUNET_assert (GNUNET_SYSERR != + GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", + "WAN_QUOTA_OUT", + ¤t_quota_p1_out)); + GNUNET_assert (GNUNET_SYSERR != + GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", + "WAN_QUOTA_OUT", + ¤t_quota_p2_out)); + + p1.ch = + GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify, + &disconnect_notify, &inbound_notify, GNUNET_YES, + &outbound_notify, GNUNET_YES, handlers); } static void stop_arm (struct PeerContext *p) { -#if START_ARM - if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) + if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) + if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", + GNUNET_OS_process_get_pid (p->arm_proc)); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; -#endif GNUNET_CONFIGURATION_destroy (p->cfg); } + static int check () { - - char *const argv[] = { "test-core-quota-compliance", "-c", "test_core_api_data.conf", -#if VERBOSE - "-L", "DEBUG", -#endif NULL }; struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, - argv, "test-core-quota-compliance", "nohelp", options, &run, &ok); + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, + "test-core-quota-compliance", "nohelp", options, &run, + &ok); stop_arm (&p1); stop_arm (&p2); return ok; } + int main (int argc, char *argv[]) { int ret; test = -1; - if (strstr(argv[0], "_symmetric") != NULL) - { - test = SYMMETRIC; - } - else if (strstr(argv[0], "_asymmetric_send") != NULL) - { - test = ASYMMETRIC_SEND_LIMITED; - } - else if (strstr(argv[0], "_asymmetric_recv") != NULL) - { - test = ASYMMETRIC_RECV_LIMITED; - } + if (strstr (argv[0], "_symmetric") != NULL) + { + test = SYMMETRIC; + } + else if (strstr (argv[0], "_asymmetric_send") != NULL) + { + test = ASYMMETRIC_SEND_LIMITED; + } + else if (strstr (argv[0], "_asymmetric_recv") != NULL) + { + 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/"); - } + { + 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/"); - } + { + 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_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 "WARNING", -#endif NULL); ret = check (); 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/"); - } + { + 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/"); - } + { + 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_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/"); + } return ret; } -/* end of test_core_api_reliability.c */ + +/* end of test_core_quota_compliance.c */