aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2023-11-29 16:43:31 +0100
committerMartin Schanzenbach <schanzen@gnunet.org>2023-11-29 16:43:31 +0100
commit6a4207ac3987df455499102e9d094f9eb2347cf3 (patch)
tree112ccf246a1cd026b8e707eb932045d4b49fe808
parent0df5ce8d4215b83c908de5631b12a3939ce1ca9e (diff)
downloadgnunet-6a4207ac3987df455499102e9d094f9eb2347cf3.tar.gz
gnunet-6a4207ac3987df455499102e9d094f9eb2347cf3.zip
meson: Fix build with recent testing changes.
Diffstat
-rw-r--r--meson.build6
-rw-r--r--src/service/core/meson.build1
-rw-r--r--src/service/testing/meson.build2
-rw-r--r--src/service/transport/meson.build387
-rw-r--r--src/service/transport/test_communicator_basic.c18
5 files changed, 251 insertions, 163 deletions
diff --git a/meson.build b/meson.build
index 9db38740d..f604bd67f 100644
--- a/meson.build
+++ b/meson.build
@@ -424,8 +424,10 @@ subdir('data')
424 424
425meson.add_dist_script('meson-dist-script') 425meson.add_dist_script('meson-dist-script')
426 426
427add_test_setup('default', env: ['GNUNET_PREFIX='/get_option('libdir')], exclude_suites: ['perf'], is_default: true) 427gnunet_prefix = get_option('prefix')/get_option('libdir')
428add_test_setup('full', env: ['GNUNET_PREFIX='/get_option('libdir')], is_default: false) 428
429add_test_setup('default', env: ['GNUNET_PREFIX='+gnunet_prefix], exclude_suites: ['perf'], is_default: true)
430add_test_setup('full', env: ['GNUNET_PREFIX='+gnunet_prefix], is_default: false)
429 431
430summary({'host': host_machine.system(), 432summary({'host': host_machine.system(),
431 'prefix': get_option('prefix'), 433 'prefix': get_option('prefix'),
diff --git a/src/service/core/meson.build b/src/service/core/meson.build
index 483aa0a11..6f7ff7404 100644
--- a/src/service/core/meson.build
+++ b/src/service/core/meson.build
@@ -35,6 +35,7 @@ libgnunetcoretesting = library('gnunetcoretesting',
35 ['core_api_cmd_connecting_peers.c'], 35 ['core_api_cmd_connecting_peers.c'],
36 dependencies: [ 36 dependencies: [
37 libgnunetutil_dep, 37 libgnunetutil_dep,
38 libgnunettransporttesting2_dep,
38 libgnunettesting_dep, 39 libgnunettesting_dep,
39 libgnunetarm_dep, 40 libgnunetarm_dep,
40 libgnunettransportapplication_dep, 41 libgnunettransportapplication_dep,
diff --git a/src/service/testing/meson.build b/src/service/testing/meson.build
index 5605a2afb..ea8956c1b 100644
--- a/src/service/testing/meson.build
+++ b/src/service/testing/meson.build
@@ -1,6 +1,4 @@
1libgnunettesting_src = [ 1libgnunettesting_src = [
2 'testing_api_cmd_stop_peer.c',
3 'testing_api_cmd_start_peer.c',
4 'testing_api_cmd_exec_bash_script.c', 2 'testing_api_cmd_exec_bash_script.c',
5 'testing_api_cmd_barrier.c', 3 'testing_api_cmd_barrier.c',
6 'testing_api_cmd_barrier_reached.c', 4 'testing_api_cmd_barrier_reached.c',
diff --git a/src/service/transport/meson.build b/src/service/transport/meson.build
index 3cacc53f6..c4e94aa13 100644
--- a/src/service/transport/meson.build
+++ b/src/service/transport/meson.build
@@ -27,80 +27,80 @@ if get_option('monolith')
27endif 27endif
28 28
29libgnunettransportapplication = library('gnunettransportapplication', 29libgnunettransportapplication = library('gnunettransportapplication',
30 libgnunettransportapplication_src, 30 libgnunettransportapplication_src,
31 soversion: '0', 31 soversion: '0',
32 version: '0.0.0', 32 version: '0.0.0',
33 dependencies: libgnunetutil_dep, 33 dependencies: libgnunetutil_dep,
34 include_directories: [incdir, configuration_inc], 34 include_directories: [incdir, configuration_inc],
35 install: true, 35 install: true,
36 install_dir: get_option('libdir')) 36 install_dir: get_option('libdir'))
37pkg.generate(libgnunettransportapplication, url: 'https://www.gnunet.org', 37pkg.generate(libgnunettransportapplication, url: 'https://www.gnunet.org',
38 description : 'Provides application APIs for accessing the transport service') 38 description : 'Provides application APIs for accessing the transport service')
39libgnunettransportapplication_dep = declare_dependency(link_with : libgnunettransportapplication) 39libgnunettransportapplication_dep = declare_dependency(link_with : libgnunettransportapplication)
40 40
41libgnunettransportcore = library('gnunettransportcore', 41libgnunettransportcore = library('gnunettransportcore',
42 libgnunettransportcore_src, 42 libgnunettransportcore_src,
43 soversion: '0', 43 soversion: '0',
44 version: '0.0.0', 44 version: '0.0.0',
45 dependencies: libgnunetutil_dep, 45 dependencies: libgnunetutil_dep,
46 include_directories: [incdir, configuration_inc], 46 include_directories: [incdir, configuration_inc],
47 install: true, 47 install: true,
48 install_dir: get_option('libdir')) 48 install_dir: get_option('libdir'))
49pkg.generate(libgnunettransportcore, url: 'https://www.gnunet.org', 49pkg.generate(libgnunettransportcore, url: 'https://www.gnunet.org',
50 description : 'Provides core API for accessing the transport service') 50 description : 'Provides core API for accessing the transport service')
51libgnunettransportcore_dep = declare_dependency(link_with : libgnunettransportcore) 51libgnunettransportcore_dep = declare_dependency(link_with : libgnunettransportcore)
52 52
53libgnunettransportcommunicator = library('gnunettransportcommunicator', 53libgnunettransportcommunicator = library('gnunettransportcommunicator',
54 libgnunettransportcommunicator_src, 54 libgnunettransportcommunicator_src,
55 soversion: '0', 55 soversion: '0',
56 version: '0.0.0', 56 version: '0.0.0',
57 dependencies: libgnunetutil_dep, 57 dependencies: libgnunetutil_dep,
58 include_directories: [incdir, configuration_inc], 58 include_directories: [incdir, configuration_inc],
59 install: true, 59 install: true,
60 install_dir: get_option('libdir')) 60 install_dir: get_option('libdir'))
61pkg.generate(libgnunettransportcommunicator, url: 'https://www.gnunet.org', 61pkg.generate(libgnunettransportcommunicator, url: 'https://www.gnunet.org',
62 description : 'Provides communicator API for accessing the transport service') 62 description : 'Provides communicator API for accessing the transport service')
63libgnunettransportcommunicator_dep = declare_dependency(link_with : libgnunettransportcommunicator) 63libgnunettransportcommunicator_dep = declare_dependency(link_with : libgnunettransportcommunicator)
64 64
65libgnunettransportmonitor = library('gnunettransportmonitor', 65libgnunettransportmonitor = library('gnunettransportmonitor',
66 libgnunettransportmonitor_src, 66 libgnunettransportmonitor_src,
67 soversion: '0', 67 soversion: '0',
68 version: '0.0.0', 68 version: '0.0.0',
69 dependencies: libgnunetutil_dep, 69 dependencies: libgnunetutil_dep,
70 include_directories: [incdir, configuration_inc], 70 include_directories: [incdir, configuration_inc],
71 install: true, 71 install: true,
72 install_dir: get_option('libdir')) 72 install_dir: get_option('libdir'))
73pkg.generate(libgnunettransportmonitor, url: 'https://www.gnunet.org', 73pkg.generate(libgnunettransportmonitor, url: 'https://www.gnunet.org',
74 description : 'Provides monitor API for accessing the transport service') 74 description : 'Provides monitor API for accessing the transport service')
75libgnunettransportmonitor_dep = declare_dependency(link_with : libgnunettransportmonitor) 75libgnunettransportmonitor_dep = declare_dependency(link_with : libgnunettransportmonitor)
76 76
77libgnunettransporttesting2 = library('gnunettransporttesting2', 77libgnunettransporttesting2 = library('gnunettransporttesting2',
78 [ 78 [
79 'transport_api_traits.c', 79 'transport_api_traits.c',
80 'transport_api_cmd_connecting_peers.c', 80 'transport_api_cmd_connecting_peers.c',
81 'transport_api_cmd_backchannel_check.c', 81 'transport_api_cmd_backchannel_check.c',
82 'transport_api_cmd_start_peer.c', 82 'transport_api_cmd_start_peer.c',
83 'transport_api_cmd_stop_peer.c', 83 'transport_api_cmd_stop_peer.c',
84 'transport_api_cmd_send_simple.c', 84 'transport_api_cmd_send_simple.c',
85 'transport_api_cmd_send_simple_performance.c', 85 'transport_api_cmd_send_simple_performance.c',
86 'transport-testing2.c', 86 'transport-testing2.c',
87 'transport-testing-filenames2.c', 87 'transport-testing-filenames2.c',
88 'transport-testing-loggers2.c', 88 'transport-testing-loggers2.c',
89 'transport-testing-main2.c', 89 'transport-testing-main2.c',
90 'transport-testing-send2.c', 90 'transport-testing-send2.c',
91 'transport-testing-communicator.c', 91 'transport-testing-communicator.c',
92 ], 92 ],
93 soversion: '0', 93 soversion: '0',
94 version: '0.0.0', 94 version: '0.0.0',
95 dependencies: [libgnunetutil_dep, 95 dependencies: [libgnunetutil_dep,
96 libgnunettransportcore_dep, 96 libgnunettransportcore_dep,
97 libgnunettransportapplication_dep, 97 libgnunettransportapplication_dep,
98 libgnunetpeerstore_dep, 98 libgnunetpeerstore_dep,
99 libgnunettesting_dep, 99 libgnunettesting_dep,
100 libgnunethello_dep], 100 libgnunethello_dep],
101 include_directories: [incdir, configuration_inc], 101 include_directories: [incdir, configuration_inc],
102 install: true, 102 install: true,
103 install_dir: get_option('libdir')) 103 install_dir: get_option('libdir'))
104libgnunettransporttesting2_dep = declare_dependency(link_with : libgnunettransporttesting2) 104libgnunettransporttesting2_dep = declare_dependency(link_with : libgnunettransporttesting2)
105 105
106executable ('gnunet-service-transport', 106executable ('gnunet-service-transport',
@@ -153,109 +153,196 @@ executable ('gnunet-communicator-tcp',
153 install_dir: get_option('libdir') / 'gnunet' / 'libexec') 153 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
154 154
155libgnunettesttransport_cmd_simplesend = library('gnunet_test_transport_plugin_cmd_simple_send', 155libgnunettesttransport_cmd_simplesend = library('gnunet_test_transport_plugin_cmd_simple_send',
156 ['test_transport_plugin_cmd_simple_send.c'], 156 ['test_transport_plugin_cmd_simple_send.c'],
157 dependencies: [ 157 dependencies: [
158 libgnunetutil_dep, 158 libgnunetutil_dep,
159 libgnunettransportapplication_dep, 159 libgnunettransportapplication_dep,
160 libgnunettransporttesting2_dep, 160 libgnunettransporttesting2_dep,
161 libgnunettransportcore_dep, 161 libgnunettransportcore_dep,
162 libgnunettesting_dep, 162 libgnunettesting_dep,
163 libgnunetpeerstore_dep, 163 libgnunetpeerstore_dep,
164 libgnunetstatistics_dep, 164 libgnunetstatistics_dep,
165 libgnunethello_dep, 165 libgnunethello_dep,
166 libgnunetarm_dep, 166 libgnunetarm_dep,
167 libgnunetutil_dep 167 libgnunetutil_dep
168 ], 168 ],
169 include_directories: [incdir, configuration_inc], 169 include_directories: [incdir, configuration_inc],
170 install: true, 170 install: true,
171 install_dir: get_option('libdir')/'gnunet') 171 install_dir: get_option('libdir')/'gnunet')
172 172
173libgnunettesttransport_cmd_simplesendbc = library('gnunet_test_transport_plugin_cmd_simple_send_broadcast', 173libgnunettesttransport_cmd_simplesendbc = library('gnunet_test_transport_plugin_cmd_simple_send_broadcast',
174 ['test_transport_plugin_cmd_simple_send_broadcast.c'], 174 ['test_transport_plugin_cmd_simple_send_broadcast.c'],
175 dependencies: [ 175 dependencies: [
176 libgnunetutil_dep, 176 libgnunetutil_dep,
177 libgnunettransportapplication_dep, 177 libgnunettransportapplication_dep,
178 libgnunettransporttesting2_dep, 178 libgnunettransporttesting2_dep,
179 libgnunettransportcore_dep, 179 libgnunettransportcore_dep,
180 libgnunettesting_dep, 180 libgnunettesting_dep,
181 libgnunetpeerstore_dep, 181 libgnunetpeerstore_dep,
182 libgnunetstatistics_dep, 182 libgnunetstatistics_dep,
183 libgnunethello_dep, 183 libgnunethello_dep,
184 libgnunetarm_dep, 184 libgnunetarm_dep,
185 libgnunetutil_dep 185 libgnunetutil_dep
186 ], 186 ],
187 include_directories: [incdir, configuration_inc], 187 include_directories: [incdir, configuration_inc],
188 install: true, 188 install: true,
189 install_dir: get_option('libdir')/'gnunet') 189 install_dir: get_option('libdir')/'gnunet')
190 190
191libgnunettesttransport_cmd_simplesenddv = library('gnunet_test_transport_plugin_cmd_simple_send_dv', 191libgnunettesttransport_cmd_simplesenddv = library('gnunet_test_transport_plugin_cmd_simple_send_dv',
192 ['test_transport_plugin_cmd_simple_send_dv.c'], 192 ['test_transport_plugin_cmd_simple_send_dv.c'],
193 dependencies: [ 193 dependencies: [
194 libgnunetutil_dep, 194 libgnunetutil_dep,
195 libgnunettransportapplication_dep, 195 libgnunettransportapplication_dep,
196 libgnunettransporttesting2_dep, 196 libgnunettransporttesting2_dep,
197 libgnunettransportcore_dep, 197 libgnunettransportcore_dep,
198 libgnunettesting_dep, 198 libgnunettesting_dep,
199 libgnunetpeerstore_dep, 199 libgnunetpeerstore_dep,
200 libgnunetstatistics_dep, 200 libgnunetstatistics_dep,
201 libgnunethello_dep, 201 libgnunethello_dep,
202 libgnunetarm_dep, 202 libgnunetarm_dep,
203 libgnunetutil_dep 203 libgnunetutil_dep
204 ], 204 ],
205 include_directories: [incdir, configuration_inc], 205 include_directories: [incdir, configuration_inc],
206 install: true, 206 install: true,
207 install_dir: get_option('libdir')/'gnunet') 207 install_dir: get_option('libdir')/'gnunet')
208 208
209libgnunettesttransport_cmd_simplesendperf = library('gnunet_test_transport_plugin_cmd_simple_send_performance', 209libgnunettesttransport_cmd_simplesendperf = library('gnunet_test_transport_plugin_cmd_simple_send_performance',
210 ['test_transport_plugin_cmd_simple_send_performance.c'], 210 ['test_transport_plugin_cmd_simple_send_performance.c'],
211 dependencies: [ 211 dependencies: [
212 libgnunetutil_dep, 212 libgnunetutil_dep,
213 libgnunettransportapplication_dep, 213 libgnunettransportapplication_dep,
214 libgnunettransporttesting2_dep, 214 libgnunettransporttesting2_dep,
215 libgnunettransportcore_dep, 215 libgnunettransportcore_dep,
216 libgnunettesting_dep, 216 libgnunettesting_dep,
217 libgnunetpeerstore_dep, 217 libgnunetpeerstore_dep,
218 libgnunetstatistics_dep, 218 libgnunetstatistics_dep,
219 libgnunethello_dep, 219 libgnunethello_dep,
220 libgnunetarm_dep, 220 libgnunetarm_dep,
221 libgnunetutil_dep 221 libgnunetutil_dep
222 ], 222 ],
223 include_directories: [incdir, configuration_inc], 223 include_directories: [incdir, configuration_inc],
224 install: true, 224 install: true,
225 install_dir: get_option('libdir')/'gnunet') 225 install_dir: get_option('libdir')/'gnunet')
226 226
227libgnunettesttransport_cmd_udpback = library('gnunet_test_transport_plugin_cmd_udp_backchannel', 227libgnunettesttransport_cmd_udpback = library('gnunet_test_transport_plugin_cmd_udp_backchannel',
228 ['test_transport_plugin_cmd_udp_backchannel.c'], 228 ['test_transport_plugin_cmd_udp_backchannel.c'],
229 dependencies: [ 229 dependencies: [
230 libgnunetutil_dep, 230 libgnunetutil_dep,
231 libgnunettransporttesting2_dep, 231 libgnunettransporttesting2_dep,
232 libgnunettransportapplication_dep, 232 libgnunettransportapplication_dep,
233 libgnunettransportcore_dep, 233 libgnunettransportcore_dep,
234 libgnunettesting_dep, 234 libgnunettesting_dep,
235 libgnunetpeerstore_dep, 235 libgnunetpeerstore_dep,
236 libgnunetstatistics_dep, 236 libgnunetstatistics_dep,
237 libgnunethello_dep, 237 libgnunethello_dep,
238 libgnunetarm_dep, 238 libgnunetarm_dep,
239 libgnunetutil_dep 239 libgnunetutil_dep
240 ], 240 ],
241 include_directories: [incdir, configuration_inc], 241 include_directories: [incdir, configuration_inc],
242 install: true, 242 install: true,
243 install_dir: get_option('libdir')/'gnunet') 243 install_dir: get_option('libdir')/'gnunet')
244 244
245libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_nat_upnp', 245libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_nat_upnp',
246 ['test_transport_plugin_cmd_nat_upnp.c'], 246 ['test_transport_plugin_cmd_nat_upnp.c'],
247 dependencies: [ 247 dependencies: [
248 libgnunetutil_dep, 248 libgnunetutil_dep,
249 libgnunettransportapplication_dep, 249 libgnunettransportapplication_dep,
250 libgnunettransporttesting2_dep, 250 libgnunettransporttesting2_dep,
251 libgnunettransportcore_dep, 251 libgnunettransportcore_dep,
252 libgnunettesting_dep, 252 libgnunettesting_dep,
253 libgnunetpeerstore_dep, 253 libgnunetpeerstore_dep,
254 libgnunetstatistics_dep, 254 libgnunetstatistics_dep,
255 libgnunethello_dep, 255 libgnunethello_dep,
256 libgnunetarm_dep, 256 libgnunetarm_dep,
257 libgnunetutil_dep 257 libgnunetutil_dep
258 ], 258 ],
259 include_directories: [incdir, configuration_inc], 259 include_directories: [incdir, configuration_inc],
260 install: true, 260 install: true,
261 install_dir: get_option('libdir')/'gnunet') 261 install_dir: get_option('libdir')/'gnunet')
262foreach p : ['unix', 'tcp', 'udp']
263 configure_file(input : 'test_communicator_'+p+'_basic_peer1.conf',
264 output : 'test_communicator_'+p+'_basic_peer1.conf',
265 copy: true)
266 configure_file(input : 'test_communicator_'+p+'_basic_peer2.conf',
267 output : 'test_communicator_'+p+'_basic_peer2.conf',
268 copy: true)
269endforeach
270
271testcommunicator_basic_unix = executable('test_communicator_basic-unix',
272 ['test_communicator_basic.c'],
273 dependencies: [
274 libgnunetutil_dep,
275 libgnunettransportapplication_dep,
276 libgnunettransporttesting2_dep,
277 libgnunettransportcore_dep,
278 libgnunettesting_dep,
279 libgnunetpeerstore_dep,
280 libgnunetstatistics_dep,
281 libgnunethello_dep,
282 libgnunetarm_dep,
283 libgnunetutil_dep
284 ],
285 include_directories: [incdir, configuration_inc],
286 install: false)
287testcommunicator_basic_tcp = executable('test_communicator_basic-tcp',
288 ['test_communicator_basic.c'],
289 dependencies: [
290 libgnunetutil_dep,
291 libgnunettransportapplication_dep,
292 libgnunettransporttesting2_dep,
293 libgnunettransportcore_dep,
294 libgnunettesting_dep,
295 libgnunetpeerstore_dep,
296 libgnunetstatistics_dep,
297 libgnunethello_dep,
298 libgnunetarm_dep,
299 libgnunetutil_dep
300 ],
301 include_directories: [incdir, configuration_inc],
302 install: false)
303testcommunicator_basic_udp = executable('test_communicator_basic-udp',
304 ['test_communicator_basic.c'],
305 dependencies: [
306 libgnunetutil_dep,
307 libgnunettransportapplication_dep,
308 libgnunettransporttesting2_dep,
309 libgnunettransportcore_dep,
310 libgnunettesting_dep,
311 libgnunetpeerstore_dep,
312 libgnunetstatistics_dep,
313 libgnunethello_dep,
314 libgnunetarm_dep,
315 libgnunetutil_dep
316 ],
317 include_directories: [incdir, configuration_inc],
318 install: false)
319
320
321
322
323test('test_communicator_basic-unix', testcommunicator_basic_unix,
324 workdir: meson.current_build_dir(),
325 suite: ['transport', 'communicator'])
326test('test_communicator_basic-tcp', testcommunicator_basic_tcp,
327 workdir: meson.current_build_dir(),
328 suite: ['transport', 'communicator'])
329test('test_communicator_basic-udp', testcommunicator_basic_udp,
330 workdir: meson.current_build_dir(),
331 suite: ['transport', 'communicator'])
332#if quic_dep.found()
333# test('test_communicator_basic-quic', testcommunicator_basic_quic,
334# workdir: meson.current_build_dir(),
335# suite: ['transport', 'communicator'])
336#endif
337#test('test_communicator_rekey-tcp', testcommunicator_rekey_tcp,
338# workdir: meson.current_build_dir(),
339# suite: ['transport', 'communicator'])
340#test('test_communicator_rekey-udp', testcommunicator_rekey_udp,
341# workdir: meson.current_build_dir(),
342# suite: ['transport', 'communicator'])
343#test('test_communicator_backchannel-udp', testcommunicator_backchannel_udp,
344# workdir: meson.current_build_dir(),
345# suite: ['transport', 'communicator'])
346#test('test_communicator_bidirect-tcp', testcommunicator_bidirect_tcp,
347# workdir: meson.current_build_dir(),
348# suite: ['transport', 'communicator'])
diff --git a/src/service/transport/test_communicator_basic.c b/src/service/transport/test_communicator_basic.c
index fdbad0957..52a4cf2c4 100644
--- a/src/service/transport/test_communicator_basic.c
+++ b/src/service/transport/test_communicator_basic.c
@@ -27,7 +27,6 @@
27#include "platform.h" 27#include "platform.h"
28#include "gnunet_util_lib.h" 28#include "gnunet_util_lib.h"
29#include "transport-testing-communicator.h" 29#include "transport-testing-communicator.h"
30#include "gnunet_ats_transport_service.h"
31#include "gnunet_signatures.h" 30#include "gnunet_signatures.h"
32#include "gnunet_testing_lib.h" 31#include "gnunet_testing_lib.h"
33#include "transport.h" 32#include "transport.h"
@@ -103,14 +102,14 @@ static unsigned int iterations_left[NUM_PEERS];
103 102
104#define TIMEOUT_MULTIPLIER 1 103#define TIMEOUT_MULTIPLIER 1
105 104
106#define DELAY \ 105#define DEFAULT_DELAY \
107 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,200) 106 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,200)
108 107
109#define SHORT_BURST_WINDOW \ 108#define SHORT_BURST_WINDOW \
110 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,2) 109 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,2)
111 110
112#define LONG_BURST_WINDOW \ 111#define LONG_BURST_WINDOW \
113 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,2) 112 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,2)
114 113
115enum TestPhase 114enum TestPhase
116{ 115{
@@ -374,7 +373,7 @@ process_statistics (void *cls,
374 int is_persistent) 373 int is_persistent)
375{ 374{
376 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 375 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
377 "Statistic: Name %s and value %lu\n", 376 "Statistic: Name %s and value %" PRIu64 "\n",
378 name, 377 name,
379 value); 378 value);
380 if ((0 == strcmp ("rekey", test_name)) && (0 == strcmp ( 379 if ((0 == strcmp ("rekey", test_name)) && (0 == strcmp (
@@ -846,7 +845,8 @@ update_avg_latency (const char *payload, unsigned int peer_nr)
846 + latency.rel_value_us) 845 + latency.rel_value_us)
847 / num_received; 846 / num_received;
848 LOG (GNUNET_ERROR_TYPE_DEBUG, 847 LOG (GNUNET_ERROR_TYPE_DEBUG,
849 "Latency of received packet by peer %u: %s with avg latency %lu\n", 848 "Latency of received packet by peer %u: %s with avg latency %" PRIu64
849 "\n",
850 peer_nr, 850 peer_nr,
851 GNUNET_STRINGS_relative_time_to_string (latency, 851 GNUNET_STRINGS_relative_time_to_string (latency,
852 GNUNET_YES), 852 GNUNET_YES),
@@ -1191,7 +1191,7 @@ main (int argc,
1191 TEST_SECTION, 1191 TEST_SECTION,
1192 "DELAY_SHORT", 1192 "DELAY_SHORT",
1193 &delay_short_value)) 1193 &delay_short_value))
1194 delay_short = DELAY; 1194 delay_short = DEFAULT_DELAY;
1195 else 1195 else
1196 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 1196 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,
1197 delay_short_value); 1197 delay_short_value);
@@ -1200,7 +1200,7 @@ main (int argc,
1200 TEST_SECTION, 1200 TEST_SECTION,
1201 "DELAY_SHORT", 1201 "DELAY_SHORT",
1202 &delay_long_value)) 1202 &delay_long_value))
1203 delay_long = DELAY; 1203 delay_long = DEFAULT_DELAY;
1204 else 1204 else
1205 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 1205 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,
1206 delay_long_value); 1206 delay_long_value);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 12:56:07 +0000