[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (80b80475b -> 561596641)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (80b80475b -> 561596641) |
|
Date: |
Mon, 14 Dec 2020 11:19:03 +0100 |
This is an automated email from the git hooks/post-receive script.
t3sserakt pushed a change to branch master
in repository gnunet.
from 80b80475b minor fix
new 6e3ca264f - added testing logic for backchannel and rekey tests. Fixed
bugs for rekey logic.
new 7a8531c12 Merge branch 'master' of ssh://gnunet.org/gnunet
new 11d9dc396 Merge branch 'master' of ssh://gnunet.org/gnunet
new 561596641 - added code again that was accidentally lost during merge
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.buildbot/firefly-x86_64-amdepyc_test_tng.sh | 2 +-
src/transport/Makefile.am | 18 +-
src/transport/gnunet-communicator-udp.c | 275 ++++++++++++++++-----
src/transport/test_communicator_basic.c | 129 ++++++++--
.../test_communicator_tcp_basic_peer1.conf | 4 +
.../test_communicator_tcp_basic_peer2.conf | 4 +
.../test_communicator_tcp_rekey_peer1.conf | 4 +
.../test_communicator_tcp_rekey_peer2.conf | 4 +
.../test_communicator_udp_backchannel_peer1.conf | 5 +
.../test_communicator_udp_backchannel_peer2.conf | 5 +
.../test_communicator_udp_basic_peer1.conf | 5 +
.../test_communicator_udp_basic_peer2.conf | 5 +
.../test_communicator_udp_rekey_peer1.conf | 6 +-
.../test_communicator_udp_rekey_peer2.conf | 6 +-
.../test_communicator_unix_basic_peer1.conf | 4 +
.../test_communicator_unix_basic_peer2.conf | 4 +
src/transport/transport-testing-communicator.c | 57 +++++
src/transport/transport-testing-communicator.h | 5 +
18 files changed, 448 insertions(+), 94 deletions(-)
diff --git a/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
b/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
index 162363b5a..ff504ae57 100755
--- a/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
+++ b/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
@@ -3,6 +3,6 @@
# echo "Skipped"
pushd src/transport
-make check TESTS='test_communicator_basic-tcp test_communicator_rekey-tcp
test_communicator_basic-unix test_communicator_basic-udp
test_communicator_backchannel-udp'
+make check TESTS='test_communicator_basic-tcp test_communicator_rekey-tcp
test_communicator_basic-unix test_communicator_basic-udp
test_communicator_backchannel-udp test_communicator_rekey-udp'
pkill --signal 9 -U buildbot gnunet
popd
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 800a27aa2..0f9d40e13 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -813,42 +813,48 @@ test_communicator_basic_unix_SOURCES = \
test_communicator_basic_unix_LDADD = \
libgnunettransporttesting2.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
test_communicator_basic_tcp_SOURCES = \
test_communicator_basic.c
test_communicator_basic_tcp_LDADD = \
libgnunettransporttesting2.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
test_communicator_basic_udp_SOURCES = \
test_communicator_basic.c
test_communicator_basic_udp_LDADD = \
libgnunettransporttesting2.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
test_communicator_rekey_tcp_SOURCES = \
test_communicator_basic.c
test_communicator_rekey_tcp_LDADD = \
libgnunettransporttesting2.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
test_communicator_rekey_udp_SOURCES = \
test_communicator_basic.c
test_communicator_rekey_udp_LDADD = \
libgnunettransporttesting2.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
test_communicator_backchannel_udp_SOURCES = \
test_communicator_basic.c
test_communicator_backchannel_udp_LDADD = \
libgnunettransporttesting2.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
endif
test_plugin_unix_SOURCES = \
diff --git a/src/transport/gnunet-communicator-udp.c
b/src/transport/gnunet-communicator-udp.c
index 073b1ea02..1f87ba6d4 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -137,10 +137,10 @@
#define MAX_SECRETS 128000
/**
- * How often do we rekey based on number of bytes transmitted?
+ * Default value for how often we do rekey based on number of bytes
transmitted?
* (additionally randomized).
*/
-#define REKEY_MAX_BYTES (1024LLU * 1024 * 1024 * 4LLU)
+#define DEFAULT_REKEY_MAX_BYTES (1024LLU * 1024 * 1024 * 4LLU)
/**
* Address prefix used by the communicator.
@@ -509,6 +509,11 @@ struct SharedSecret
*/
struct SenderAddress
{
+ /**
+ * Shared secret we use with @e target for rekeying.
+ */
+ struct SharedSecret *ss_rekey;
+
/**
* Flag indicating sender is initiated rekeying for this receiver.
*/
@@ -759,6 +764,10 @@ struct BroadcastInterface
*/
static struct GNUNET_TIME_Relative rekey_interval;
+/**
+ * How often we do rekey based on number of bytes transmitted
+ */
+static unsigned long long rekey_max_bytes;
/**
* Shared secret we finished the last kce working queue for.
*/
@@ -1056,14 +1065,14 @@ secret_destroy (struct SharedSecret *ss, int withoutKce)
struct ReceiverAddress *receiver;
struct KeyCacheEntry *kce;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "secret destroy %u %u\n",
- withoutKce,
- ss->sequence_allowed);
-
if (withoutKce && (ss->sequence_allowed > 0))
return GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "secret %s destroy %u %u\n",
+ GNUNET_h2s (&ss->master),
+ withoutKce,
+ ss->sequence_allowed);
if (NULL != (sender = ss->sender))
{
GNUNET_CONTAINER_DLL_remove (sender->ss_head, sender->ss_tail, ss);
@@ -1075,6 +1084,9 @@ secret_destroy (struct SharedSecret *ss, int withoutKce)
receiver->num_secrets--;
// Uncomment this for alternativ 1 of backchannel functionality
receiver->acks_available -= (ss->sequence_allowed - ss->sequence_used);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u receiver->acks_available 3\n",
+ receiver->acks_available);
// Until here for alternativ 1
}
while (NULL != (kce = ss->kce_head))
@@ -1194,15 +1206,15 @@ check_timeouts (void *cls)
rt = GNUNET_TIME_UNIT_FOREVER_REL;
while (NULL != (receiver = GNUNET_CONTAINER_heap_peek (receivers_heap)))
{
- if (GNUNET_YES != receiver->receiver_destroy_called)
- {
- rt = GNUNET_TIME_absolute_get_remaining (receiver->timeout);
- if (0 != rt.rel_value_us)
- break;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiver timed out\n");
- receiver_destroy (receiver);
- }
+ /* if (GNUNET_YES != receiver->receiver_destroy_called) */
+ /* { */
+ rt = GNUNET_TIME_absolute_get_remaining (receiver->timeout);
+ if (0 != rt.rel_value_us)
+ break;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Receiver timed out\n");
+ receiver_destroy (receiver);
+ // }
}
st = GNUNET_TIME_UNIT_FOREVER_REL;
while (NULL != (sender = GNUNET_CONTAINER_heap_peek (senders_heap)))
@@ -1433,7 +1445,8 @@ destroy_all_secrets (struct SharedSecret *ss, int
withoutKce)
int at_least_one_destroyed = GNUNET_NO;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting destroy all.\n");
+ "Starting destroy all withoutKce: %u.\n",
+ withoutKce);
if (NULL != (sender = ss->sender))
{
@@ -1462,6 +1475,8 @@ destroy_all_secrets (struct SharedSecret *ss, int
withoutKce)
if ((ss != ss_start) && ! at_least_one_destroyed)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Really destroying all.\n");
destroy_all_secrets (ss_start, GNUNET_NO);
}
@@ -1470,7 +1485,7 @@ destroy_all_secrets (struct SharedSecret *ss, int
withoutKce)
}
static void
-add_acks (struct SharedSecret *ss, int acks_to_add, int remove_from_receiver)
+add_acks (struct SharedSecret *ss, int acks_to_add)
{
struct ReceiverAddress *receiver = ss->receiver;
@@ -1489,6 +1504,9 @@ add_acks (struct SharedSecret *ss, int acks_to_add, int
remove_from_receiver)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Tell transport we have %u more acks!\n",
acks_to_add);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u kce for rekeying.\n",
+ receiver->number_rekeying_kce);
GNUNET_TRANSPORT_communicator_mq_update (ch,
receiver->d_qh,
acks_to_add,
@@ -1496,33 +1514,65 @@ add_acks (struct SharedSecret *ss, int acks_to_add, int
remove_from_receiver)
// Until here for alternativ 1
/* move ss to head to avoid discarding it anytime soon! */
- if (remove_from_receiver)
- GNUNET_CONTAINER_DLL_remove (receiver->ss_head, receiver->ss_tail, ss);
+
+ GNUNET_CONTAINER_DLL_remove (receiver->ss_head, receiver->ss_tail, ss);
GNUNET_CONTAINER_DLL_insert (receiver->ss_head, receiver->ss_tail, ss);
destroy_all_secrets (ss, GNUNET_YES);
+}
+static uint32_t
+reset_rekey_kces (struct ReceiverAddress *receiver,
+ uint32_t acks_to_add)
+{
+ int needed_for_rekeying;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u kce for rekeying and %u acks_to_add\n",
+ receiver->number_rekeying_kce,
+ acks_to_add);
- // Uncomment this for alternativ 2 of backchannel functionality
- /*if (receiver->acks_available != ack->acks_available)
+ needed_for_rekeying = (3 - receiver->number_rekeying_kce);
+ if (acks_to_add <= needed_for_rekeying)
{
- receiver->acks_available = ack->acks_available;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Tell transport we have different number of acks!\n");
- GNUNET_TRANSPORT_communicator_mq_update (ch,
- receiver->d_qh,
- receiver->acks_available,
- 1);
- }*/
- // Until here for alternativ 2
+ receiver->number_rekeying_kce += acks_to_add;
+ acks_to_add = 0;
+ }
+ else
+ {
+ acks_to_add -= (3 - receiver->number_rekeying_kce);
+ receiver->number_rekeying_kce = 3;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u kce for rekeying and %u acks_to_add\n",
+ receiver->number_rekeying_kce,
+ acks_to_add);
+ return acks_to_add;
}
static void
add_acks_rekey (struct ReceiverAddress *receiver)
{
- add_acks (receiver->ss_rekey, receiver->ss_rekey->sequence_allowed - 3,
- GNUNET_NO);
+ uint32_t acks_to_add = receiver->ss_rekey->sequence_allowed;
+
+ if (receiver->number_rekeying_kce < 3)
+ acks_to_add = reset_rekey_kces (receiver, acks_to_add);
receiver->acks_available = receiver->ss_rekey->sequence_allowed;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u receiver->acks_available 4\n",
+ receiver->acks_available);
+ /* add_acks (receiver->ss_rekey, acks_to_add - 3); */
+ if (0 != acks_to_add)
+ {
+ add_acks (receiver->ss_rekey, acks_to_add);
+ }
receiver->ss_rekey = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "# rekeying successful\n");
+ GNUNET_STATISTICS_update (stats,
+ "# rekeying successful",
+ 1,
+ GNUNET_NO);
}
/**
@@ -1540,15 +1590,17 @@ handle_ack (void *cls, const struct GNUNET_PeerIdentity
*pid, void *value)
{
const struct UDPAck *ack = cls;
struct ReceiverAddress *receiver = value;
- int acks_to_add;
+ uint32_t acks_to_add;
uint32_t allowed;
+ // int needed_for_rekeying;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "in handle ack\n");
+ "in handle ack with cmac %s\n",
+ GNUNET_h2s (&ack->cmac));
if (NULL != receiver->ss_rekey)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received secret with cmac %s \n",
+ "We have rekey secret with cmac %s \n",
GNUNET_h2s (&receiver->ss_rekey->cmac));
if ((NULL != receiver->ss_rekey) && (0 == memcmp (&ack->cmac,
@@ -1598,16 +1650,37 @@ handle_ack (void *cls, const struct GNUNET_PeerIdentity
*pid, void *value)
// Uncomment this for alternativ 1 of backchannel functionality
acks_to_add = (allowed - ss->sequence_allowed);
if ((GNUNET_NO == receiver->rekeying) &&
- (receiver->number_rekeying_kce <
- 3) )
+ (receiver->number_rekeying_kce < 3) )
+ acks_to_add = reset_rekey_kces (receiver, acks_to_add);
+ /* if ((GNUNET_NO == receiver->rekeying) && */
+ /* (receiver->number_rekeying_kce < */
+ /* 3) ) */
+ /* { */
+ /* needed_for_rekeying = (3 - receiver->number_rekeying_kce); */
+ /* if (acks_to_add <= needed_for_rekeying) */
+ /* { */
+ /* receiver->number_rekeying_kce += acks_to_add; */
+ /* acks_to_add = 0; */
+ /* } */
+ /* else */
+ /* { */
+ /* acks_to_add -= (3 - receiver->number_rekeying_kce); */
+ /* receiver->number_rekeying_kce = 3; */
+ /* } */
+ /* } */
+ /* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, */
+ /* "%u kce for rekeying\n", */
+ /* receiver->number_rekeying_kce); */
+
+ if ((0 != acks_to_add) && (GNUNET_NO == receiver->rekeying))
{
- acks_to_add -= (3 - receiver->number_rekeying_kce);
- receiver->number_rekeying_kce = 3;
+ receiver->acks_available += (allowed - ss->sequence_allowed);
+ ss->sequence_allowed = allowed;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u receiver->acks_available 5\n",
+ receiver->acks_available);
+ add_acks (ss, acks_to_add);
}
- receiver->acks_available += (allowed - ss->sequence_allowed);
- ss->sequence_allowed = allowed;
-
- add_acks (ss, acks_to_add, GNUNET_YES);
}
return GNUNET_NO;
}
@@ -1670,11 +1743,15 @@ kce_generate_cb (void *cls)
struct SharedSecret *ss = cls;
kce_task = NULL;
- if (ss->sender->acks_available < KCN_TARGET)
+ if (((GNUNET_NO == ss->sender->rekeying) && (ss->sender->acks_available <
+ KCN_TARGET) ) ||
+ ((ss->sender->ss_rekey == ss) && (GNUNET_YES == ss->sender->rekeying) &&
+ (ss->sender->acks_available < 128)))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Precomputing keys\n");
+ "Precomputing keys for master %s\n",
+ GNUNET_h2s (&(ss->master)));
for (int i = 0; i < GENERATE_AT_ONCE; i++)
kce_generate (ss, ++ss->sequence_allowed);
@@ -1702,6 +1779,11 @@ kce_generate_rekey_cb (void *cls)
if (NULL == kce_task)
{
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Precomputing keys for rekey master %s\n",
+ GNUNET_h2s (&(ss->master)));
+
for (int i = 0; i < GENERATE_AT_ONCE; i++)
kce_generate (ss, ++ss->sequence_allowed);
@@ -1760,23 +1842,33 @@ consider_ss_ack (struct SharedSecret *ss, int initial)
if (((NULL != kce_task) && kce_task_finished) || (GNUNET_NO == initial))
{
struct UDPAck ack;
+ struct SharedSecret *ss_tell;
+
+ if (GNUNET_NO != initial)
+ ss_tell = ss_finished;
+ else
+ ss_tell = ss;
ack.header.type = htons (GNUNET_MESSAGE_TYPE_COMMUNICATOR_UDP_ACK);
ack.header.size = htons (sizeof(ack));
- ack.sequence_max = htonl (ss_finished->sequence_allowed);
+ ack.sequence_max = htonl (ss_tell->sequence_allowed);
ack.acks_available = ss->sender->acks_available;
- ack.cmac = ss_finished->cmac;
+ ack.cmac = ss_tell->cmac;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Notifying transport of UDPAck %s with intial %u\n",
- GNUNET_i2s_full (&ss_finished->sender->target),
- initial);
+ "Notifying transport of UDPAck %s with intial %u and master
%s\n",
+ GNUNET_i2s_full (&ss_tell->sender->target),
+ initial,
+ GNUNET_h2s (&(ss_tell->master)));
GNUNET_TRANSPORT_communicator_notify (ch,
- &ss_finished->sender->target,
+ &ss_tell->sender->target,
COMMUNICATOR_ADDRESS_PREFIX,
&ack.header);
- destroy_all_secrets (ss, GNUNET_YES);
- kce_task = NULL;
- kce_task_finished = GNUNET_NO;
+ if (GNUNET_NO != initial)
+ {
+ destroy_all_secrets (ss, GNUNET_YES);
+ kce_task = NULL;
+ kce_task_finished = GNUNET_NO;
+ }
}
else if ((NULL == kce_task) && ((KCN_THRESHOLD >
ss->sender->acks_available)||
(GNUNET_YES == ss->sender->rekeying) ||
@@ -1835,6 +1927,10 @@ decrypt_box (const struct UDPBox *box,
"# bytes decrypted with BOX",
sizeof(out_buf),
GNUNET_NO);
+ GNUNET_STATISTICS_update (stats,
+ "# messages decrypted with BOX",
+ 1,
+ GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"decrypted UDPBox with kid %s\n",
GNUNET_sh2s (&box->kid));
@@ -1842,16 +1938,17 @@ decrypt_box (const struct UDPBox *box,
if ((GNUNET_NO == box->rekeying) && (GNUNET_YES == ss->sender->rekeying))
{
ss->sender->rekeying = GNUNET_NO;
+ ss->sender->ss_rekey = NULL;
// destroy_all_secrets (ss, GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiver stopped rekeying.\n");
}
else if (GNUNET_NO == box->rekeying)
- consider_ss_ack (ss, GNUNET_YES);
+ consider_ss_ack (ss, GNUNET_NO);
else{
ss->sender->rekeying = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiver started rekeying.\n");
+ "Got Box: Receiver doing rekeying.\n");
}
}
@@ -1921,6 +2018,7 @@ decrypt_rekey (const struct UDPRekey *rekey,
/* GNUNET_assert (ss_rekey->prev == NULL && sender->ss_head != ss_rekey); */
/* GNUNET_assert (ss_rekey->next == NULL && sender->ss_tail != ss_rekey); */
GNUNET_CONTAINER_DLL_insert (sender->ss_head, sender->ss_tail, ss_rekey);
+ sender->ss_rekey = ss_rekey;
sender->num_secrets++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received secret with cmac %s\n",
@@ -2157,6 +2255,7 @@ sock_read (void *cls)
box->rekeying);
else
do_decrypt = GNUNET_YES;
+
if ((GNUNET_YES == do_decrypt)&& (NULL != kce) && (GNUNET_YES ==
kce->ss->sender->rekeying))
{
@@ -2165,6 +2264,10 @@ sock_read (void *cls)
GNUNET_sh2s (&rekey->kid));
sender = setup_sender (&rekey->sender, (const struct sockaddr *) &sa,
salen);
+
+ if (NULL != sender->ss_rekey)
+ return;
+
decrypt_rekey (rekey, (size_t) rcvd, kce, sender);
return;
}
@@ -2290,6 +2393,7 @@ sock_read (void *cls)
if ((GNUNET_NO == kx->rekeying) && (GNUNET_YES == ss->sender->rekeying))
{
ss->sender->rekeying = GNUNET_NO;
+ sender->ss_rekey = NULL;
// destroy_all_secrets (ss, GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiver stopped rekeying.\n");
@@ -2299,7 +2403,7 @@ sock_read (void *cls)
else{
ss->sender->rekeying = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiver started rekeying.\n");
+ "Got KX: Receiver doing rekeying.\n");
}
/*if (sender->num_secrets > MAX_SECRETS)
secret_destroy (sender->ss_tail);*/
@@ -2584,12 +2688,12 @@ check_for_rekeying (struct ReceiverAddress *receiver,
struct UDPBox *box)
receiver->rekey_timeout.abs_value_us);
if ((0 == rt.rel_value_us)||(receiver->rekey_send_bytes >
- REKEY_MAX_BYTES) )
+ rekey_max_bytes) )
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Bytes send %lu greater than %llu max bytes\n.",
receiver->rekey_send_bytes,
- REKEY_MAX_BYTES);
+ rekey_max_bytes);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Relative time is %lu and timeout is %lu\n.",
rt.rel_value_us,
@@ -2631,9 +2735,14 @@ send_UDPRekey (struct ReceiverAddress *receiver, struct
SharedSecret *ss)
- (receiver->rekey_acks_available % 3)) / 3;
is_ss_rekey_sequence_allowed_zero = (0 ==
receiver->ss_rekey->sequence_allowed);
- is_acks_available_below = (receiver->acks_available > not_below);
+ is_acks_available_below = (receiver->acks_available >= not_below);
send_rekey = (0 == (receiver->acks_available - not_below) % not_below) &&
is_acks_available_below && is_ss_rekey_sequence_allowed_zero;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "send_rekey: %u, %u, %u\n",
+ send_rekey,
+ receiver->rekey_acks_available,
+ receiver->acks_available);
}
else if (NULL == receiver->ss_rekey)
{
@@ -2641,6 +2750,7 @@ send_UDPRekey (struct ReceiverAddress *receiver, struct
SharedSecret *ss)
GNUNET_CRYPTO_ecdhe_key_create (&epriv);
receiver->ss_rekey = setup_shared_secret_enc (&epriv, receiver,
GNUNET_NO);
+ receiver->ss_rekey->sequence_allowed = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Setup secret with cmac %s\n",
GNUNET_h2s (&(receiver->ss_rekey->cmac)));
@@ -2700,6 +2810,9 @@ send_UDPRekey (struct ReceiverAddress *receiver, struct
SharedSecret *ss)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending rekey with cmac %s\n",
GNUNET_h2s (&(receiver->ss_rekey->cmac)));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u rekey kces left.\n",
+ receiver->number_rekeying_kce);
if (-1 == GNUNET_NETWORK_socket_sendto (udp_sock,
rekey_dgram,
@@ -2708,6 +2821,10 @@ send_UDPRekey (struct ReceiverAddress *receiver, struct
SharedSecret *ss)
receiver->address_len))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "send");
+ receiver->acks_available--;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u receiver->acks_available 1\n",
+ receiver->acks_available);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending UDPRekey to %s\n", GNUNET_a2s (receiver->address,
receiver->
@@ -2737,6 +2854,12 @@ mq_send_d (struct GNUNET_MQ_Handle *mq,
if ((msize > receiver->d_mtu) ||
(0 == receiver->acks_available))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "msize: %u, mtu: %lu, acks: %u\n",
+ msize,
+ receiver->d_mtu,
+ receiver->acks_available);
+
GNUNET_break (0);
if (GNUNET_YES != receiver->receiver_destroy_called)
receiver_destroy (receiver);
@@ -2789,8 +2912,6 @@ mq_send_d (struct GNUNET_MQ_Handle *mq,
else
box->rekeying = GNUNET_YES;
- check_for_rekeying (receiver, box);
-
if (-1 == GNUNET_NETWORK_socket_sendto (udp_sock,
dgram,
sizeof(dgram),
@@ -2798,11 +2919,15 @@ mq_send_d (struct GNUNET_MQ_Handle *mq,
receiver->address_len))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "send");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending UDPBox to %s\n", GNUNET_a2s (receiver->address,
- receiver->address_len));
+ "Sending UDPBox %u acks left\n",
+ receiver->acks_available);
GNUNET_MQ_impl_send_continue (mq);
receiver->acks_available--;
- if (0 == receiver->acks_available)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%u receiver->acks_available 2\n",
+ receiver->acks_available);
+ check_for_rekeying (receiver, box);
+ if (0 == receiver->acks_available - receiver->number_rekeying_kce)
{
/* We have no more ACKs */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2810,6 +2935,8 @@ mq_send_d (struct GNUNET_MQ_Handle *mq,
if (GNUNET_YES == receiver->rekeying)
{
receiver->rekeying = GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sender stopped rekeying\n");
if ((NULL != receiver->ss_rekey) && (0 <
receiver->ss_rekey->
@@ -3120,6 +3247,8 @@ get_sender_delete_it (void *cls,
static void
do_shutdown (void *cls)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "do_shutdown\n");
if (NULL != nat)
{
GNUNET_NAT_unregister (nat);
@@ -3166,6 +3295,11 @@ do_shutdown (void *cls)
GNUNET_CONTAINER_multishortmap_destroy (key_cache);
GNUNET_CONTAINER_heap_destroy (senders_heap);
GNUNET_CONTAINER_heap_destroy (receivers_heap);
+ if (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = NULL;
+ }
if (NULL != ch)
{
GNUNET_TRANSPORT_communicator_disconnect (ch);
@@ -3191,6 +3325,8 @@ do_shutdown (void *cls)
GNUNET_NT_scanner_done (is);
is = NULL;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "do_shutdown finished\n");
}
@@ -3522,6 +3658,13 @@ run (void *cls,
&rekey_interval))
rekey_interval = DEFAULT_REKEY_TIME_INTERVAL;
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_size (cfg,
+ COMMUNICATOR_CONFIG_SECTION,
+ "REKEY_MAX_BYTES",
+ &rekey_max_bytes))
+ rekey_max_bytes = DEFAULT_REKEY_MAX_BYTES;
+
in = udp_address_to_sockaddr (bindto, &in_len);
if (NULL == in)
{
diff --git a/src/transport/test_communicator_basic.c
b/src/transport/test_communicator_basic.c
index 7ea04afdb..10c942daa 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -73,6 +73,10 @@ static struct
GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *my_tc;
static char *test_name;
+static struct GNUNET_STATISTICS_GetHandle *box_stats;
+
+static struct GNUNET_STATISTICS_GetHandle *rekey_stats;
+
#define SHORT_MESSAGE_SIZE 128
#define LONG_MESSAGE_SIZE 32000 /* FIXME */
@@ -90,7 +94,7 @@ static unsigned int iterations_left = TOTAL_ITERATIONS;
#define TIMEOUT_MULTIPLIER 1
#define DELAY \
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,50)
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,200)
#define SHORT_BURST_WINDOW \
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,2)
@@ -514,6 +518,30 @@ update_avg_latency (const char*payload)
}
+process_statistics_box_done (void *cls, int success)
+{
+ if (NULL != box_stats)
+ box_stats = NULL;
+ if (NULL == rekey_stats)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished\n");
+ GNUNET_SCHEDULER_shutdown ();
+ }
+}
+
+process_statistics_rekey_done (void *cls, int success)
+{
+ if (NULL != rekey_stats)
+ rekey_stats = NULL;
+ if (NULL == box_stats)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished\n");
+ GNUNET_SCHEDULER_shutdown ();
+ }
+}
+
static int
process_statistics (void *cls,
const char *subsystem,
@@ -521,6 +549,41 @@ process_statistics (void *cls,
uint64_t value,
int is_persistent)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Statistic: Name %s and value %lu\n",
+ name,
+ value);
+ if ((0 == strcmp ("rekey", test_name)) && (0 == strcmp (
+ "# rekeying successful",
+ name)) && (0 == value))
+ {
+ ret = 2;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No successful rekeying!\n");
+ GNUNET_SCHEDULER_shutdown ();
+ }
+ if ((0 == strcmp ("backchannel", test_name)) &&
+ (0 == strcmp (
+ "# messages decrypted with BOX",
+ name))
+ && (9000 > value))
+ {
+ ret = 2;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Not enough BOX messages!\n");
+ GNUNET_SCHEDULER_shutdown ();
+ }
+ if ((0 == strcmp ("rekey", test_name)) &&
+ (0 == strcmp (
+ "# messages decrypted with BOX",
+ name))
+ && (6000 > value))
+ {
+ ret = 2;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Not enough BOX messages!\n");
+ GNUNET_SCHEDULER_shutdown ();
+ }
return GNUNET_OK;
}
@@ -660,18 +723,31 @@ incoming_message_cb (void *cls,
short_test (NULL);
break;
}
- /* if (("rekey" == test_name) || ("backchannel" == test_name)) */
- /* { */
- /* GNUNET_STATISTICS_get (stats[1], */
- /* "C-UDP", */
- /* "# bytes decrypted with Rekey", */
- /* NULL, */
- /* &process_statistics, */
- /* NULL); */
- /* } */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Finished\n");
- GNUNET_SCHEDULER_shutdown ();
+ if ((0 == strcmp ("rekey", test_name))||(0 == strcmp ("backchannel",
+ test_name)) )
+ {
+ if (NULL != box_stats)
+ GNUNET_STATISTICS_get_cancel (box_stats);
+ box_stats = GNUNET_STATISTICS_get (stats[1],
+ "C-UDP",
+ "# messages decrypted with BOX",
+ process_statistics_box_done,
+ &process_statistics,
+ NULL);
+ if (NULL != rekey_stats)
+ GNUNET_STATISTICS_get_cancel (rekey_stats);
+ rekey_stats = GNUNET_STATISTICS_get (stats[0],
+ "C-UDP",
+ "# rekeying successful",
+ process_statistics_rekey_done,
+ &process_statistics,
+ NULL);
+ }
+ else{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished\n");
+ GNUNET_SCHEDULER_shutdown ();
+ }
}
break;
}
@@ -682,6 +758,19 @@ incoming_message_cb (void *cls,
static void
do_shutdown (void *cls)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "shuting down test.\”");
+
+ if (NULL != box_stats)
+ {
+ GNUNET_STATISTICS_get_cancel (box_stats);
+ box_stats = NULL;
+ }
+ if (NULL != rekey_stats)
+ {
+ GNUNET_STATISTICS_get_cancel (rekey_stats);
+ rekey_stats = NULL;
+ }
if (NULL != to_task)
{
GNUNET_SCHEDULER_cancel (to_task);
@@ -690,6 +779,7 @@ do_shutdown (void *cls)
for (unsigned int i = 0; i < NUM_PEERS; i++)
{
GNUNET_TRANSPORT_TESTING_transport_communicator_service_stop (tc_hs[i]);
+ GNUNET_STATISTICS_destroy (stats[i], GNUNET_NO);
}
}
@@ -697,7 +787,7 @@ do_shutdown (void *cls)
/**
* @brief Main function called by the scheduler
*
- * @param cls Closure - Handle to configuration
+ * @param cls Closure - Handle to confiation
*/
static void
run (void *cls)
@@ -720,11 +810,12 @@ run (void *cls)
&handle_backchannel_cb,
cfg_peers_name[i]); /* cls */
- /* if (("rekey" == test_name) || ("backchannel" == test_name)) */
- /* { */
- /* stats[i] = GNUNET_STATISTICS_create ("C-UDP", */
- /* cfg_peers[i]); */
- /* } */
+ if ((0 == strcmp ("rekey", test_name))||(0 == strcmp ("backchannel",
+ test_name)) )
+ {
+ stats[i] = GNUNET_STATISTICS_create ("C-UDP",
+ cfg_peers[i]);
+ }
}
GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
NULL);
diff --git a/src/transport/test_communicator_tcp_basic_peer1.conf
b/src/transport/test_communicator_tcp_basic_peer1.conf
index c08737b7b..2411f485b 100644
--- a/src/transport/test_communicator_tcp_basic_peer1.conf
+++ b/src/transport/test_communicator_tcp_basic_peer1.conf
@@ -22,6 +22,10 @@ UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
+[statistics]
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
+
[communicator-unix]
UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock
diff --git a/src/transport/test_communicator_tcp_basic_peer2.conf
b/src/transport/test_communicator_tcp_basic_peer2.conf
index 45b7e7844..8005718bf 100644
--- a/src/transport/test_communicator_tcp_basic_peer2.conf
+++ b/src/transport/test_communicator_tcp_basic_peer2.conf
@@ -23,6 +23,10 @@ UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
+[statistics]
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
+
[communicator-unix]
UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
diff --git a/src/transport/test_communicator_tcp_rekey_peer1.conf
b/src/transport/test_communicator_tcp_rekey_peer1.conf
index 901f415ef..82fbf353a 100644
--- a/src/transport/test_communicator_tcp_rekey_peer1.conf
+++ b/src/transport/test_communicator_tcp_rekey_peer1.conf
@@ -23,6 +23,10 @@ ENABLE_IPSCAN = YES
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
+[statistics]
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
+
[resolver]
PORT = 62089
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
diff --git a/src/transport/test_communicator_tcp_rekey_peer2.conf
b/src/transport/test_communicator_tcp_rekey_peer2.conf
index 643b037b2..1036039c4 100644
--- a/src/transport/test_communicator_tcp_rekey_peer2.conf
+++ b/src/transport/test_communicator_tcp_rekey_peer2.conf
@@ -23,6 +23,10 @@ UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
+[statistics]
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
+
[resolver]
PORT = 62090
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
diff --git a/src/transport/test_communicator_udp_backchannel_peer1.conf
b/src/transport/test_communicator_udp_backchannel_peer1.conf
index b99a76d6c..59e6d68e3 100644
--- a/src/transport/test_communicator_udp_backchannel_peer1.conf
+++ b/src/transport/test_communicator_udp_backchannel_peer1.conf
@@ -23,6 +23,10 @@ ENABLE_IPSCAN = YES
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
+[statistics]
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
+
[resolver]
PORT = 62089
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
@@ -35,6 +39,7 @@ BINDTO = 60002
DISABLE_V6 = YES
[communicator-udp]
+#PREFIX = valgrind --leak-check=full --track-origins=yes
BINDTO = 60002
DISABLE_V6 = YES
MAX_QUEUE_LENGTH=5000
diff --git a/src/transport/test_communicator_udp_backchannel_peer2.conf
b/src/transport/test_communicator_udp_backchannel_peer2.conf
index 48bd54c8b..3abf7999b 100644
--- a/src/transport/test_communicator_udp_backchannel_peer2.conf
+++ b/src/transport/test_communicator_udp_backchannel_peer2.conf
@@ -23,6 +23,10 @@ UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
+[statistics]
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
+
[resolver]
PORT = 62090
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
@@ -35,6 +39,7 @@ BINDTO = 60003
DISABLE_V6 = YES
[communicator-udp]
+#PREFIX = valgrind --leak-check=full --track-origins=yes
BINDTO = 60003
DISABLE_V6 = YES
MAX_QUEUE_LENGTH=5000
diff --git a/src/transport/test_communicator_udp_basic_peer1.conf
b/src/transport/test_communicator_udp_basic_peer1.conf
index d53a55210..c6ff024ee 100644
--- a/src/transport/test_communicator_udp_basic_peer1.conf
+++ b/src/transport/test_communicator_udp_basic_peer1.conf
@@ -23,11 +23,16 @@ ENABLE_IPSCAN = YES
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
+[statistics]
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
+
[resolver]
PORT = 62089
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
[communicator-udp]
+#PREFIX = valgrind --leak-check=full --track-origins=yes
BINDTO = 60002
DISABLE_V6 = YES
MAX_QUEUE_LENGTH=5000
diff --git a/src/transport/test_communicator_udp_basic_peer2.conf
b/src/transport/test_communicator_udp_basic_peer2.conf
index f05ebc5cb..b353b03e9 100644
--- a/src/transport/test_communicator_udp_basic_peer2.conf
+++ b/src/transport/test_communicator_udp_basic_peer2.conf
@@ -24,11 +24,16 @@ UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
+[statistics]
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
+
[resolver]
PORT = 62090
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
[communicator-udp]
+#PREFIX = valgrind --leak-check=full --track-origins=yes
BINDTO = 60003
DISABLE_V6 = YES
MAX_QUEUE_LENGTH=5000
diff --git a/src/transport/test_communicator_udp_rekey_peer1.conf
b/src/transport/test_communicator_udp_rekey_peer1.conf
index 8fede6f8c..6bfeafe33 100644
--- a/src/transport/test_communicator_udp_rekey_peer1.conf
+++ b/src/transport/test_communicator_udp_rekey_peer1.conf
@@ -23,6 +23,10 @@ ENABLE_IPSCAN = YES
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
+[statistics]
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
+
[resolver]
PORT = 62089
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
@@ -41,7 +45,7 @@ REKEY_INTERVAL = 100ms
BINDTO = 60002
DISABLE_V6 = YES
MAX_QUEUE_LENGTH=5000
-REKEY_INTERVAL = 1s
+REKEY_MAX_BYTES=9MiB
[communicator-test]
BACKCHANNEL_ENABLED = YES
diff --git a/src/transport/test_communicator_udp_rekey_peer2.conf
b/src/transport/test_communicator_udp_rekey_peer2.conf
index f545ba07a..474ca0c15 100644
--- a/src/transport/test_communicator_udp_rekey_peer2.conf
+++ b/src/transport/test_communicator_udp_rekey_peer2.conf
@@ -23,6 +23,10 @@ UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
+[statistics]
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
+
[resolver]
PORT = 62090
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
@@ -41,7 +45,7 @@ REKEY_INTERVAL = 100ms
BINDTO = 60003
DISABLE_V6 = YES
MAX_QUEUE_LENGTH=5000
-REKEY_INTERVAL = 1s
+REKEY_MAX_BYTES=9MiB
[communicator-test]
BACKCHANNEL_ENABLED = YES
diff --git a/src/transport/test_communicator_unix_basic_peer1.conf
b/src/transport/test_communicator_unix_basic_peer1.conf
index 8e9700108..13ba2d16b 100644
--- a/src/transport/test_communicator_unix_basic_peer1.conf
+++ b/src/transport/test_communicator_unix_basic_peer1.conf
@@ -23,6 +23,10 @@ ENABLE_IPSCAN = YES
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/peerstore.sock
+[statistics]
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_1.sock
+
[resolver]
PORT = 62089
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_1.sock
diff --git a/src/transport/test_communicator_unix_basic_peer2.conf
b/src/transport/test_communicator_unix_basic_peer2.conf
index c12cc9111..727e844a7 100644
--- a/src/transport/test_communicator_unix_basic_peer2.conf
+++ b/src/transport/test_communicator_unix_basic_peer2.conf
@@ -23,6 +23,10 @@ UNIXPATH = $GNUNET_TMP/communicator-unix-2/nat.sock
[peerstore]
UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/peerstore.sock
+[statistics]
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics_test_2.sock
+
[resolver]
PORT = 62090
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver_test_2.sock
diff --git a/src/transport/transport-testing-communicator.c
b/src/transport/transport-testing-communicator.c
index 6d74b12e8..56240864c 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -766,6 +766,23 @@ shutdown_process (struct GNUNET_OS_Process *proc)
GNUNET_OS_process_destroy (proc);
}
+/**
+ * @brief Task run at shutdown to kill the statistics process
+ *
+ * @param cls Closure - Process of communicator
+ */
+static void
+shutdown_statistics (void *cls)
+{
+ struct GNUNET_OS_Process *proc = cls;
+ shutdown_process (proc);
+}
+
+/**
+ * @brief Task run at shutdown to kill the peerstore process
+ *
+ * @param cls Closure - Process of communicator
+ */
static void
shutdown_peerstore (void *cls)
{
@@ -773,6 +790,11 @@ shutdown_peerstore (void *cls)
shutdown_process (proc);
}
+/**
+ * @brief Task run at shutdown to kill a communicator process
+ *
+ * @param cls Closure - Process of communicator
+ */
static void
shutdown_communicator (void *cls)
{
@@ -852,6 +874,10 @@ shutdown_resolver (void *cls)
}
+/**
+ * @brief Start Resolver
+ *
+ */
static void
resolver_start (struct
GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
@@ -881,6 +907,34 @@ resolver_start (struct
}
+/**
+ * @brief Start Statistics
+ *
+ */
+static void
+statistics_start (
+ struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
+{
+ char *binary;
+
+ binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-statistics");
+ tc_h->stat_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL,
+ NULL,
+ NULL,
+ binary,
+ "gnunet-service-statistics",
+ "-c",
+ tc_h->cfg_filename,
+ NULL);
+ if (NULL == tc_h->stat_proc)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start Statistics!");
+ return;
+ }
+ LOG (GNUNET_ERROR_TYPE_INFO, "started Statistics\n");
+ GNUNET_free (binary);
+}
/**
* @brief Start Peerstore
@@ -1009,6 +1063,8 @@
GNUNET_TRANSPORT_TESTING_transport_communicator_service_start (
resolver_start (tc_h);
/* Start peerstore service */
peerstore_start (tc_h);
+ /* Start statistic service */
+ statistics_start (tc_h);
/* Schedule start communicator */
communicator_start (tc_h,
binary_name);
@@ -1025,6 +1081,7 @@
GNUNET_TRANSPORT_TESTING_transport_communicator_service_stop (
shutdown_nat (tc_h->nat_proc);
shutdown_resolver (tc_h->resolver_proc);
shutdown_peerstore (tc_h->ps_proc);
+ shutdown_statistics (tc_h->stat_proc);
GNUNET_CONFIGURATION_destroy (tc_h->cfg);
GNUNET_free (tc_h);
}
diff --git a/src/transport/transport-testing-communicator.h
b/src/transport/transport-testing-communicator.h
index 693e61515..1875258b4 100644
--- a/src/transport/transport-testing-communicator.h
+++ b/src/transport/transport-testing-communicator.h
@@ -199,6 +199,11 @@ struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle
*/
struct GNUNET_OS_Process *resolver_proc;
+ /**
+ * statistics service process
+ */
+ struct GNUNET_OS_Process *stat_proc;
+
/**
* peerstore service process
*/
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (80b80475b -> 561596641),
gnunet <=