diff options
author | jospaeth <spaethj@in.tum.de> | 2020-09-13 20:44:53 +0200 |
---|---|---|
committer | jospaeth <spaethj@in.tum.de> | 2020-09-13 20:44:53 +0200 |
commit | b5f17eecddb693129387e4d363c97452f2871794 (patch) | |
tree | f4c6b45e6ecb1aa635f1f2c1b821fb95f21cdb73 | |
parent | 1ea833b91a139d163e7d041aede4eefe7789ff83 (diff) | |
parent | 5ebf4c2f377f10168f1385ef171be840a64267f1 (diff) | |
download | gnunet-spaeth/escrow_plugins.tar.gz gnunet-spaeth/escrow_plugins.zip |
Merge remote-tracking branch 'origin/master' into spaeth/escrow_pluginsspaeth/escrow_plugins
-rwxr-xr-x[-rw-r--r--] | .buildbot/firefly-x86_64-amdepyc_test_tng.sh | 2 | ||||
-rw-r--r-- | doc/index.html | 9 | ||||
-rw-r--r-- | src/transport/test_communicator_basic.c | 7 |
3 files changed, 10 insertions, 8 deletions
diff --git a/.buildbot/firefly-x86_64-amdepyc_test_tng.sh b/.buildbot/firefly-x86_64-amdepyc_test_tng.sh index 031615517..75a1cb994 100644..100755 --- a/.buildbot/firefly-x86_64-amdepyc_test_tng.sh +++ b/.buildbot/firefly-x86_64-amdepyc_test_tng.sh | |||
@@ -3,6 +3,6 @@ | |||
3 | # echo "Skipped" | 3 | # echo "Skipped" |
4 | 4 | ||
5 | pushd src/transport | 5 | pushd src/transport |
6 | make check TESTS='test_communicator_basic-tcp test_communicator_rekey-tcp' | 6 | make check TESTS='test_communicator_basic-tcp test_communicator_rekey-tcp test_communicator_basic-unix' |
7 | pkill --signal 9 -U buildbot gnunet | 7 | pkill --signal 9 -U buildbot gnunet |
8 | popd | 8 | popd |
diff --git a/doc/index.html b/doc/index.html index 827c04a71..93c0e7d9e 100644 --- a/doc/index.html +++ b/doc/index.html | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | <ul> | 27 | <ul> |
28 | <li><a href="/handbook/gnunet.html">GNUnet Reference Manual</li> | 28 | <li><a href="/handbook/gnunet.html">GNUnet Reference Manual</li> |
29 | <li><a href="/gnunet-tutorial/tutorial.html">GNUnet C Tutorial</li> | 29 | <li><a href="/tutorial/gnunet-tutorial.html">GNUnet C Tutorial</li> |
30 | <li><a href="/doxygen/">GNUnet Doxygen</li> | 30 | <li><a href="/doxygen/">GNUnet Doxygen</li> |
31 | <li><a href="https://rest.gnunet.org/">REST API</a></li> | 31 | <li><a href="https://rest.gnunet.org/">REST API</a></li> |
32 | <li><a href="https://bib.gnunet.org/">Bibliography</a></li> | 32 | <li><a href="https://bib.gnunet.org/">Bibliography</a></li> |
@@ -37,12 +37,13 @@ | |||
37 | 37 | ||
38 | <p>Please send general FSF & GNU inquiries to | 38 | <p>Please send general FSF & GNU inquiries to |
39 | <a href="mailto:gnu@gnu.org"><gnu@gnu.org></a>. | 39 | <a href="mailto:gnu@gnu.org"><gnu@gnu.org></a>. |
40 | There are also <a href="/contact/">other ways to contact</a> | 40 | There are also <a href="https://gnunet.org/en/contact/">other |
41 | the FSF. Broken links and other corrections or suggestions can be sent | 41 | ways to contact</a> |
42 | us. Broken links and other corrections or suggestions can be sent | ||
42 | to <a href="mailto:gnunet-developers@gnu.org"><gnunet-developers@gnu.org></a>.</p> | 43 | to <a href="mailto:gnunet-developers@gnu.org"><gnunet-developers@gnu.org></a>.</p> |
43 | </div> | 44 | </div> |
44 | 45 | ||
45 | <p>Copyright © 2001 - 2019 GNUnet e.V.</p> | 46 | <p>Copyright © 2001 - 2020 GNUnet e.V.</p> |
46 | 47 | ||
47 | <p> | 48 | <p> |
48 | <a rel="license" href="http://creativecommons.org/licenses/by-nd/4.0/"> | 49 | <a rel="license" href="http://creativecommons.org/licenses/by-nd/4.0/"> |
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c index aa02bda93..e3573ac2c 100644 --- a/src/transport/test_communicator_basic.c +++ b/src/transport/test_communicator_basic.c | |||
@@ -221,7 +221,7 @@ make_payload (size_t payload_size) | |||
221 | GNUNET_assert (payload_size >= 8); // So that out timestamp fits | 221 | GNUNET_assert (payload_size >= 8); // So that out timestamp fits |
222 | ts = GNUNET_TIME_absolute_get (); | 222 | ts = GNUNET_TIME_absolute_get (); |
223 | ts_n = GNUNET_TIME_absolute_hton (ts); | 223 | ts_n = GNUNET_TIME_absolute_hton (ts); |
224 | memset (payload, 0, payload_size); | 224 | memset (payload, 'a', payload_size); |
225 | memcpy (payload, &ts_n, sizeof (struct GNUNET_TIME_AbsoluteNBO)); | 225 | memcpy (payload, &ts_n, sizeof (struct GNUNET_TIME_AbsoluteNBO)); |
226 | return payload; | 226 | return payload; |
227 | } | 227 | } |
@@ -367,8 +367,9 @@ add_queue_cb (void *cls, | |||
367 | "Queue established, starting test...\n"); | 367 | "Queue established, starting test...\n"); |
368 | start_short = GNUNET_TIME_absolute_get (); | 368 | start_short = GNUNET_TIME_absolute_get (); |
369 | my_tc = tc_h; | 369 | my_tc = tc_h; |
370 | if (0 != mtu) | 370 | if (0 != mtu) /* Message header overhead */ |
371 | long_message_size = mtu - 4; /* Dummy message header overhead */ | 371 | long_message_size = mtu - sizeof(struct GNUNET_TRANSPORT_SendMessageTo) |
372 | - sizeof(struct GNUNET_MessageHeader); | ||
372 | else | 373 | else |
373 | long_message_size = LONG_MESSAGE_SIZE; | 374 | long_message_size = LONG_MESSAGE_SIZE; |
374 | phase = TP_BURST_SHORT; | 375 | phase = TP_BURST_SHORT; |