diff options
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/Makefile.am | 27 | ||||
-rw-r--r-- | src/transport/test_transport_api_cmd_simple_send.c | 3 | ||||
-rw-r--r-- | src/transport/test_transport_plugin_cmd_simple_send.c (renamed from src/transport/plugin_cmd_simple_send.c) | 32 |
3 files changed, 29 insertions, 33 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 0782a631b..0696188c5 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -398,20 +398,19 @@ plugin_LTLIBRARIES = \ | |||
398 | $(HTTP_SERVER_PLUGIN_LA) \ | 398 | $(HTTP_SERVER_PLUGIN_LA) \ |
399 | $(HTTPS_SERVER_PLUGIN_LA) \ | 399 | $(HTTPS_SERVER_PLUGIN_LA) \ |
400 | $(WLAN_PLUGIN_LA) \ | 400 | $(WLAN_PLUGIN_LA) \ |
401 | $(BT_PLUGIN_LA) | 401 | $(BT_PLUGIN_LA) \ |
402 | # libgnunet_plugin_cmd_simple_send.la | 402 | libgnunet_test_transport_plugin_cmd_simple_send.la |
403 | 403 | ||
404 | #libgnunet_plugin_cmd_simple_send_la_SOURCES = \ | 404 | libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \ |
405 | # plugin_cmd_simple_send.c | 405 | test_transport_plugin_cmd_simple_send.c |
406 | #libgnunet_plugin_cmd_simple_send_la_LIBADD = \ | 406 | libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \ |
407 | # $(top_builddir)/src/util/libgnunetutil.la \ | 407 | $(top_builddir)/src/util/libgnunetutil.la \ |
408 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 408 | $(top_builddir)/src/testing/libgnunettesting.la \ |
409 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 409 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
410 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 410 | libgnunettransporttesting2.la \ |
411 | # libgnunettransporttesting2.la \ | 411 | $(LTLIBINTL) |
412 | # $(LTLIBINTL) | 412 | libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \ |
413 | #libgnunet_plugin_cmd_simple_send_la_LDFLAGS = \ | 413 | $(GN_PLUGIN_LDFLAGS) |
414 | # $(GN_PLUGIN_LDFLAGS) | ||
415 | 414 | ||
416 | if HAVE_EXPERIMENTAL | 415 | if HAVE_EXPERIMENTAL |
417 | plugin_LTLIBRARIES += libgnunet_plugin_transport_udp.la | 416 | plugin_LTLIBRARIES += libgnunet_plugin_transport_udp.la |
diff --git a/src/transport/test_transport_api_cmd_simple_send.c b/src/transport/test_transport_api_cmd_simple_send.c index 1cc16f307..13497366e 100644 --- a/src/transport/test_transport_api_cmd_simple_send.c +++ b/src/transport/test_transport_api_cmd_simple_send.c | |||
@@ -25,7 +25,6 @@ | |||
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_testing_ng_lib.h" | 27 | #include "gnunet_testing_ng_lib.h" |
28 | #include "gnunet_testbed_ng_service.h" | ||
29 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
30 | 29 | ||
31 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) | 30 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) |
@@ -49,7 +48,7 @@ run (void *cls) | |||
49 | GNUNET_TESTING_cmd_netjail_start_testing_system ("netjail-start-testbed-1", | 48 | GNUNET_TESTING_cmd_netjail_start_testing_system ("netjail-start-testbed-1", |
50 | "2", | 49 | "2", |
51 | "1", | 50 | "1", |
52 | "libgnunet_plugin_cmd_simple_send", | 51 | "libgnunet_test_transport_plugin_cmd_simple_send", |
53 | &rv), | 52 | &rv), |
54 | GNUNET_TESTING_cmd_stop_testing_system ("stop-testbed", | 53 | GNUNET_TESTING_cmd_stop_testing_system ("stop-testbed", |
55 | "netjail-start-testbed-1", | 54 | "netjail-start-testbed-1", |
diff --git a/src/transport/plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c index 468f4e48a..c4f7fcfe3 100644 --- a/src/transport/plugin_cmd_simple_send.c +++ b/src/transport/test_transport_plugin_cmd_simple_send.c | |||
@@ -1,19 +1,19 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | Copyright (C) 2013, 2014 GNUnet e.V. | 3 | Copyright (C) 2021 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software: you can redistribute it and/or modify it | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | under the terms of the GNU Affero General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
7 | by the Free Software Foundation, either version 3 of the License, | 7 | by the Free Software Foundation, either version 3 of the License, |
8 | or (at your option) any later version. | 8 | or (at your option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
@@ -27,8 +27,6 @@ | |||
27 | #include "gnunet_testing_ng_lib.h" | 27 | #include "gnunet_testing_ng_lib.h" |
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | #include "gnunet_transport_application_service.h" | 29 | #include "gnunet_transport_application_service.h" |
30 | // #include "gnunet_transport_service.h" | ||
31 | #include "gnunet_testbed_ng_service.h" | ||
32 | #include "transport-testing2.h" | 30 | #include "transport-testing2.h" |
33 | #include "transport-testing-cmds.h" | 31 | #include "transport-testing-cmds.h" |
34 | 32 | ||
@@ -166,7 +164,7 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip, | |||
166 | * @return the exported block API | 164 | * @return the exported block API |
167 | */ | 165 | */ |
168 | void * | 166 | void * |
169 | libgnunet_plugin_cmd_simple_send_init (void *cls) | 167 | libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls) |
170 | { | 168 | { |
171 | struct GNUNET_TESTING_PluginFunctions *api; | 169 | struct GNUNET_TESTING_PluginFunctions *api; |
172 | 170 | ||
@@ -180,11 +178,11 @@ libgnunet_plugin_cmd_simple_send_init (void *cls) | |||
180 | /** | 178 | /** |
181 | * Exit point from the plugin. | 179 | * Exit point from the plugin. |
182 | * | 180 | * |
183 | * @param cls the return value from #libgnunet_plugin_block_test_init | 181 | * @param cls the return value from #libgnunet_test_transport_plugin_block_test_init |
184 | * @return NULL | 182 | * @return NULL |
185 | */ | 183 | */ |
186 | void * | 184 | void * |
187 | libgnunet_plugin_cmd_simple_send_done (void *cls) | 185 | libgnunet_test_transport_plugin_cmd_simple_send_done (void *cls) |
188 | { | 186 | { |
189 | struct GNUNET_TESTING_PluginFunctions *api = cls; | 187 | struct GNUNET_TESTING_PluginFunctions *api = cls; |
190 | 188 | ||