1 files changed, 237 insertions, 150 deletions
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')
 endif
 libgnunettransportapplication = library('gnunettransportapplication',
-        libgnunettransportapplication_src,
+                                        libgnunettransportapplication_src,
-        soversion: '0',
+                                        soversion: '0',
-        version: '0.0.0',
+                                        version: '0.0.0',
-        dependencies: libgnunetutil_dep,
+                                        dependencies: libgnunetutil_dep,
-        include_directories: [incdir, configuration_inc],
+                                        include_directories: [incdir, configuration_inc],
-        install: true,
+                                        install: true,
-        install_dir: get_option('libdir'))
+                                        install_dir: get_option('libdir'))
 pkg.generate(libgnunettransportapplication, url: 'https://www.gnunet.org',
             description : 'Provides application APIs for accessing the transport service')
 libgnunettransportapplication_dep = declare_dependency(link_with : libgnunettransportapplication)
 libgnunettransportcore = library('gnunettransportcore',
-        libgnunettransportcore_src,
+                                 libgnunettransportcore_src,
-        soversion: '0',
+                                 soversion: '0',
-        version: '0.0.0',
+                                 version: '0.0.0',
-        dependencies: libgnunetutil_dep,
+                                 dependencies: libgnunetutil_dep,
-        include_directories: [incdir, configuration_inc],
+                                 include_directories: [incdir, configuration_inc],
-        install: true,
+                                 install: true,
-        install_dir: get_option('libdir'))
+                                 install_dir: get_option('libdir'))
 pkg.generate(libgnunettransportcore, url: 'https://www.gnunet.org',
             description : 'Provides core API for accessing the transport service')
 libgnunettransportcore_dep = declare_dependency(link_with : libgnunettransportcore)
 libgnunettransportcommunicator = library('gnunettransportcommunicator',
-        libgnunettransportcommunicator_src,
+                                         libgnunettransportcommunicator_src,
-        soversion: '0',
+                                         soversion: '0',
-        version: '0.0.0',
+                                         version: '0.0.0',
-        dependencies: libgnunetutil_dep,
+                                         dependencies: libgnunetutil_dep,
-        include_directories: [incdir, configuration_inc],
+                                         include_directories: [incdir, configuration_inc],
-        install: true,
+                                         install: true,
-        install_dir: get_option('libdir'))
+                                         install_dir: get_option('libdir'))
 pkg.generate(libgnunettransportcommunicator, url: 'https://www.gnunet.org',
             description : 'Provides communicator API for accessing the transport service')
 libgnunettransportcommunicator_dep = declare_dependency(link_with : libgnunettransportcommunicator)
 libgnunettransportmonitor = library('gnunettransportmonitor',
-        libgnunettransportmonitor_src,
+                                    libgnunettransportmonitor_src,
-        soversion: '0',
+                                    soversion: '0',
-        version: '0.0.0',
+                                    version: '0.0.0',
-        dependencies: libgnunetutil_dep,
+                                    dependencies: libgnunetutil_dep,
-        include_directories: [incdir, configuration_inc],
+                                    include_directories: [incdir, configuration_inc],
-        install: true,
+                                    install: true,
-        install_dir: get_option('libdir'))
+                                    install_dir: get_option('libdir'))
 pkg.generate(libgnunettransportmonitor, url: 'https://www.gnunet.org',
             description : 'Provides monitor API for accessing the transport service')
 libgnunettransportmonitor_dep = declare_dependency(link_with : libgnunettransportmonitor)
 libgnunettransporttesting2 = library('gnunettransporttesting2',
-        [
+                                     [
-          'transport_api_traits.c',
+                                       'transport_api_traits.c',
-          'transport_api_cmd_connecting_peers.c',
+                                       'transport_api_cmd_connecting_peers.c',
-          'transport_api_cmd_backchannel_check.c',
+                                       'transport_api_cmd_backchannel_check.c',
-          'transport_api_cmd_start_peer.c',
+                                       'transport_api_cmd_start_peer.c',
-          'transport_api_cmd_stop_peer.c',
+                                       'transport_api_cmd_stop_peer.c',
-          'transport_api_cmd_send_simple.c',
+                                       'transport_api_cmd_send_simple.c',
-          'transport_api_cmd_send_simple_performance.c',
+                                       'transport_api_cmd_send_simple_performance.c',
-          'transport-testing2.c',
+                                       'transport-testing2.c',
-          'transport-testing-filenames2.c',
+                                       'transport-testing-filenames2.c',
-          'transport-testing-loggers2.c',
+                                       'transport-testing-loggers2.c',
-          'transport-testing-main2.c',
+                                       'transport-testing-main2.c',
-          'transport-testing-send2.c',
+                                       'transport-testing-send2.c',
-          'transport-testing-communicator.c',
+                                       'transport-testing-communicator.c',
-          ],
+                                     ],
-        soversion: '0',
+                                     soversion: '0',
-        version: '0.0.0',
+                                     version: '0.0.0',
-        dependencies: [libgnunetutil_dep,
+                                     dependencies: [libgnunetutil_dep,
-                       libgnunettransportcore_dep,
+                                                    libgnunettransportcore_dep,
-                       libgnunettransportapplication_dep,
+                                                    libgnunettransportapplication_dep,
-                       libgnunetpeerstore_dep,
+                                                    libgnunetpeerstore_dep,
-                       libgnunettesting_dep,
+                                                    libgnunettesting_dep,
-                       libgnunethello_dep],
+                                                    libgnunethello_dep],
-        include_directories: [incdir, configuration_inc],
+                                     include_directories: [incdir, configuration_inc],
-        install: true,
+                                     install: true,
-        install_dir: get_option('libdir'))
+                                     install_dir: get_option('libdir'))
 libgnunettransporttesting2_dep = declare_dependency(link_with : libgnunettransporttesting2)
 executable ('gnunet-service-transport',
@@ -153,109 +153,196 @@ executable ('gnunet-communicator-tcp',
            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 libgnunettesttransport_cmd_simplesend = library('gnunet_test_transport_plugin_cmd_simple_send',
-    ['test_transport_plugin_cmd_simple_send.c'],
+                                                ['test_transport_plugin_cmd_simple_send.c'],
-        dependencies: [
+                                                dependencies: [
-          libgnunetutil_dep,
+                                                  libgnunetutil_dep,
-          libgnunettransportapplication_dep,
+                                                  libgnunettransportapplication_dep,
-          libgnunettransporttesting2_dep,
+                                                  libgnunettransporttesting2_dep,
-          libgnunettransportcore_dep,
+                                                  libgnunettransportcore_dep,
-          libgnunettesting_dep,
+                                                  libgnunettesting_dep,
-          libgnunetpeerstore_dep,
+                                                  libgnunetpeerstore_dep,
-          libgnunetstatistics_dep,
+                                                  libgnunetstatistics_dep,
-          libgnunethello_dep,
+                                                  libgnunethello_dep,
-          libgnunetarm_dep,
+                                                  libgnunetarm_dep,
-          libgnunetutil_dep
+                                                  libgnunetutil_dep
-          ],
+                                                ],
-        include_directories: [incdir, configuration_inc],
+                                                include_directories: [incdir, configuration_inc],
-        install: true,
+                                                install: true,
-        install_dir: get_option('libdir')/'gnunet')
+                                                install_dir: get_option('libdir')/'gnunet')
 libgnunettesttransport_cmd_simplesendbc = library('gnunet_test_transport_plugin_cmd_simple_send_broadcast',
-    ['test_transport_plugin_cmd_simple_send_broadcast.c'],
+                                                  ['test_transport_plugin_cmd_simple_send_broadcast.c'],
-        dependencies: [
+                                                  dependencies: [
-          libgnunetutil_dep,
+                                                    libgnunetutil_dep,
-          libgnunettransportapplication_dep,
+                                                    libgnunettransportapplication_dep,
-          libgnunettransporttesting2_dep,
+                                                    libgnunettransporttesting2_dep,
-          libgnunettransportcore_dep,
+                                                    libgnunettransportcore_dep,
-          libgnunettesting_dep,
+                                                    libgnunettesting_dep,
-          libgnunetpeerstore_dep,
+                                                    libgnunetpeerstore_dep,
-          libgnunetstatistics_dep,
+                                                    libgnunetstatistics_dep,
-          libgnunethello_dep,
+                                                    libgnunethello_dep,
-          libgnunetarm_dep,
+                                                    libgnunetarm_dep,
-          libgnunetutil_dep
+                                                    libgnunetutil_dep
-          ],
+                                                  ],
-        include_directories: [incdir, configuration_inc],
+                                                  include_directories: [incdir, configuration_inc],
-        install: true,
+                                                  install: true,
-        install_dir: get_option('libdir')/'gnunet')
+                                                  install_dir: get_option('libdir')/'gnunet')
 libgnunettesttransport_cmd_simplesenddv = library('gnunet_test_transport_plugin_cmd_simple_send_dv',
-    ['test_transport_plugin_cmd_simple_send_dv.c'],
+                                                  ['test_transport_plugin_cmd_simple_send_dv.c'],
-        dependencies: [
+                                                  dependencies: [
-          libgnunetutil_dep,
+                                                    libgnunetutil_dep,
-          libgnunettransportapplication_dep,
+                                                    libgnunettransportapplication_dep,
-          libgnunettransporttesting2_dep,
+                                                    libgnunettransporttesting2_dep,
-          libgnunettransportcore_dep,
+                                                    libgnunettransportcore_dep,
-          libgnunettesting_dep,
+                                                    libgnunettesting_dep,
-          libgnunetpeerstore_dep,
+                                                    libgnunetpeerstore_dep,
-          libgnunetstatistics_dep,
+                                                    libgnunetstatistics_dep,
-          libgnunethello_dep,
+                                                    libgnunethello_dep,
-          libgnunetarm_dep,
+                                                    libgnunetarm_dep,
-          libgnunetutil_dep
+                                                    libgnunetutil_dep
-          ],
+                                                  ],
-        include_directories: [incdir, configuration_inc],
+                                                  include_directories: [incdir, configuration_inc],
-        install: true,
+                                                  install: true,
-        install_dir: get_option('libdir')/'gnunet')
+                                                  install_dir: get_option('libdir')/'gnunet')
 libgnunettesttransport_cmd_simplesendperf = library('gnunet_test_transport_plugin_cmd_simple_send_performance',
-    ['test_transport_plugin_cmd_simple_send_performance.c'],
+                                                    ['test_transport_plugin_cmd_simple_send_performance.c'],
-        dependencies: [
+                                                    dependencies: [
-          libgnunetutil_dep,
+                                                      libgnunetutil_dep,
-          libgnunettransportapplication_dep,
+                                                      libgnunettransportapplication_dep,
-          libgnunettransporttesting2_dep,
+                                                      libgnunettransporttesting2_dep,
-          libgnunettransportcore_dep,
+                                                      libgnunettransportcore_dep,
-          libgnunettesting_dep,
+                                                      libgnunettesting_dep,
-          libgnunetpeerstore_dep,
+                                                      libgnunetpeerstore_dep,
-          libgnunetstatistics_dep,
+                                                      libgnunetstatistics_dep,
-          libgnunethello_dep,
+                                                      libgnunethello_dep,
-          libgnunetarm_dep,
+                                                      libgnunetarm_dep,
-          libgnunetutil_dep
+                                                      libgnunetutil_dep
-          ],
+                                                    ],
-        include_directories: [incdir, configuration_inc],
+                                                    include_directories: [incdir, configuration_inc],
-        install: true,
+                                                    install: true,
-        install_dir: get_option('libdir')/'gnunet')
+                                                    install_dir: get_option('libdir')/'gnunet')
 libgnunettesttransport_cmd_udpback = library('gnunet_test_transport_plugin_cmd_udp_backchannel',
-    ['test_transport_plugin_cmd_udp_backchannel.c'],
+                                             ['test_transport_plugin_cmd_udp_backchannel.c'],
-        dependencies: [
+                                             dependencies: [
-          libgnunetutil_dep,
+                                               libgnunetutil_dep,
-          libgnunettransporttesting2_dep,
+                                               libgnunettransporttesting2_dep,
-          libgnunettransportapplication_dep,
+                                               libgnunettransportapplication_dep,
-          libgnunettransportcore_dep,
+                                               libgnunettransportcore_dep,
-          libgnunettesting_dep,
+                                               libgnunettesting_dep,
-          libgnunetpeerstore_dep,
+                                               libgnunetpeerstore_dep,
-          libgnunetstatistics_dep,
+                                               libgnunetstatistics_dep,
-          libgnunethello_dep,
+                                               libgnunethello_dep,
-          libgnunetarm_dep,
+                                               libgnunetarm_dep,
-          libgnunetutil_dep
+                                               libgnunetutil_dep
-          ],
+                                             ],
-        include_directories: [incdir, configuration_inc],
+                                             include_directories: [incdir, configuration_inc],
-        install: true,
+                                             install: true,
-        install_dir: get_option('libdir')/'gnunet')
+                                             install_dir: get_option('libdir')/'gnunet')
 libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_nat_upnp',
-    ['test_transport_plugin_cmd_nat_upnp.c'],
+                                             ['test_transport_plugin_cmd_nat_upnp.c'],
-        dependencies: [
+                                             dependencies: [
-          libgnunetutil_dep,
+                                               libgnunetutil_dep,
-          libgnunettransportapplication_dep,
+                                               libgnunettransportapplication_dep,
-          libgnunettransporttesting2_dep,
+                                               libgnunettransporttesting2_dep,
-          libgnunettransportcore_dep,
+                                               libgnunettransportcore_dep,
-          libgnunettesting_dep,
+                                               libgnunettesting_dep,
-          libgnunetpeerstore_dep,
+                                               libgnunetpeerstore_dep,
-          libgnunetstatistics_dep,
+                                               libgnunetstatistics_dep,
-          libgnunethello_dep,
+                                               libgnunethello_dep,
-          libgnunetarm_dep,
+                                               libgnunetarm_dep,
-          libgnunetutil_dep
+                                               libgnunetutil_dep
-          ],
+                                             ],
-        include_directories: [incdir, configuration_inc],
+                                             include_directories: [incdir, configuration_inc],
-        install: true,
+                                             install: true,
-        install_dir: get_option('libdir')/'gnunet')
+                                             install_dir: get_option('libdir')/'gnunet')
+foreach p : ['unix', 'tcp', 'udp']
+  configure_file(input : 'test_communicator_'+p+'_basic_peer1.conf',
+                 output : 'test_communicator_'+p+'_basic_peer1.conf',
+                 copy: true)
+  configure_file(input : 'test_communicator_'+p+'_basic_peer2.conf',
+                 output : 'test_communicator_'+p+'_basic_peer2.conf',
+                 copy: true)
+endforeach
+testcommunicator_basic_unix = executable('test_communicator_basic-unix',
+                                         ['test_communicator_basic.c'],
+                                         dependencies: [
+                                           libgnunetutil_dep,
+                                           libgnunettransportapplication_dep,
+                                           libgnunettransporttesting2_dep,
+                                           libgnunettransportcore_dep,
+                                           libgnunettesting_dep,
+                                           libgnunetpeerstore_dep,
+                                           libgnunetstatistics_dep,
+                                           libgnunethello_dep,
+                                           libgnunetarm_dep,
+                                           libgnunetutil_dep
+                                         ],
+                                         include_directories: [incdir, configuration_inc],
+                                         install: false)
+testcommunicator_basic_tcp = executable('test_communicator_basic-tcp',
+                                        ['test_communicator_basic.c'],
+                                        dependencies: [
+                                          libgnunetutil_dep,
+                                          libgnunettransportapplication_dep,
+                                          libgnunettransporttesting2_dep,
+                                          libgnunettransportcore_dep,
+                                          libgnunettesting_dep,
+                                          libgnunetpeerstore_dep,
+                                          libgnunetstatistics_dep,
+                                          libgnunethello_dep,
+                                          libgnunetarm_dep,
+                                          libgnunetutil_dep
+                                        ],
+                                        include_directories: [incdir, configuration_inc],
+                                        install: false)
+testcommunicator_basic_udp = executable('test_communicator_basic-udp',
+                                        ['test_communicator_basic.c'],
+                                        dependencies: [
+                                          libgnunetutil_dep,
+                                          libgnunettransportapplication_dep,
+                                          libgnunettransporttesting2_dep,
+                                          libgnunettransportcore_dep,
+                                          libgnunettesting_dep,
+                                          libgnunetpeerstore_dep,
+                                          libgnunetstatistics_dep,
+                                          libgnunethello_dep,
+                                          libgnunetarm_dep,
+                                          libgnunetutil_dep
+                                        ],
+                                        include_directories: [incdir, configuration_inc],
+                                        install: false)
+test('test_communicator_basic-unix', testcommunicator_basic_unix,
+     workdir: meson.current_build_dir(),
+     suite: ['transport', 'communicator'])
+test('test_communicator_basic-tcp', testcommunicator_basic_tcp,
+     workdir: meson.current_build_dir(),
+     suite: ['transport', 'communicator'])
+test('test_communicator_basic-udp', testcommunicator_basic_udp,
+     workdir: meson.current_build_dir(),
+     suite: ['transport', 'communicator'])
+#if quic_dep.found()
+#  test('test_communicator_basic-quic', testcommunicator_basic_quic,
+#       workdir: meson.current_build_dir(),
+#       suite: ['transport', 'communicator'])
+#endif
+#test('test_communicator_rekey-tcp', testcommunicator_rekey_tcp,
+#     workdir: meson.current_build_dir(),
+#     suite: ['transport', 'communicator'])
+#test('test_communicator_rekey-udp', testcommunicator_rekey_udp,
+#     workdir: meson.current_build_dir(),
+#     suite: ['transport', 'communicator'])
+#test('test_communicator_backchannel-udp', testcommunicator_backchannel_udp,
+#     workdir: meson.current_build_dir(),
+#     suite: ['transport', 'communicator'])
+#test('test_communicator_bidirect-tcp', testcommunicator_bidirect_tcp,
+#     workdir: meson.current_build_dir(),
+#     suite: ['transport', 'communicator'])

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')
27	endif	27	endif
28		28
29	libgnunettransportapplication = library('gnunettransportapplication',	29	libgnunettransportapplication = 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'))
37	pkg.generate(libgnunettransportapplication, url: 'https://www.gnunet.org',	37	pkg.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')
39	libgnunettransportapplication_dep = declare_dependency(link_with : libgnunettransportapplication)	39	libgnunettransportapplication_dep = declare_dependency(link_with : libgnunettransportapplication)
40		40
41	libgnunettransportcore = library('gnunettransportcore',	41	libgnunettransportcore = 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'))
49	pkg.generate(libgnunettransportcore, url: 'https://www.gnunet.org',	49	pkg.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')
51	libgnunettransportcore_dep = declare_dependency(link_with : libgnunettransportcore)	51	libgnunettransportcore_dep = declare_dependency(link_with : libgnunettransportcore)
52		52
53	libgnunettransportcommunicator = library('gnunettransportcommunicator',	53	libgnunettransportcommunicator = 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'))
61	pkg.generate(libgnunettransportcommunicator, url: 'https://www.gnunet.org',	61	pkg.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')
63	libgnunettransportcommunicator_dep = declare_dependency(link_with : libgnunettransportcommunicator)	63	libgnunettransportcommunicator_dep = declare_dependency(link_with : libgnunettransportcommunicator)
64		64
65	libgnunettransportmonitor = library('gnunettransportmonitor',	65	libgnunettransportmonitor = 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'))
73	pkg.generate(libgnunettransportmonitor, url: 'https://www.gnunet.org',	73	pkg.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')
75	libgnunettransportmonitor_dep = declare_dependency(link_with : libgnunettransportmonitor)	75	libgnunettransportmonitor_dep = declare_dependency(link_with : libgnunettransportmonitor)
76		76
77	libgnunettransporttesting2 = library('gnunettransporttesting2',	77	libgnunettransporttesting2 = 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'))
104	libgnunettransporttesting2_dep = declare_dependency(link_with : libgnunettransporttesting2)	104	libgnunettransporttesting2_dep = declare_dependency(link_with : libgnunettransporttesting2)
105		105
106	executable ('gnunet-service-transport',	106	executable ('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
155	libgnunettesttransport_cmd_simplesend = library('gnunet_test_transport_plugin_cmd_simple_send',	155	libgnunettesttransport_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
173	libgnunettesttransport_cmd_simplesendbc = library('gnunet_test_transport_plugin_cmd_simple_send_broadcast',	173	libgnunettesttransport_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
191	libgnunettesttransport_cmd_simplesenddv = library('gnunet_test_transport_plugin_cmd_simple_send_dv',	191	libgnunettesttransport_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
209	libgnunettesttransport_cmd_simplesendperf = library('gnunet_test_transport_plugin_cmd_simple_send_performance',	209	libgnunettesttransport_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
227	libgnunettesttransport_cmd_udpback = library('gnunet_test_transport_plugin_cmd_udp_backchannel',	227	libgnunettesttransport_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
245	libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_nat_upnp',	245	libgnunettesttransport_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')
		262	foreach 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)
		269	endforeach
		270
		271	testcommunicator_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)
		287	testcommunicator_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)
		303	testcommunicator_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
		323	test('test_communicator_basic-unix', testcommunicator_basic_unix,
		324	workdir: meson.current_build_dir(),
		325	suite: ['transport', 'communicator'])
		326	test('test_communicator_basic-tcp', testcommunicator_basic_tcp,
		327	workdir: meson.current_build_dir(),
		328	suite: ['transport', 'communicator'])
		329	test('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'])