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 = \
   $(HTTP_SERVER_PLUGIN_LA) \
   $(HTTPS_SERVER_PLUGIN_LA) \
   $(WLAN_PLUGIN_LA) \
-  $(BT_PLUGIN_LA) 
-#  libgnunet_plugin_cmd_simple_send.la
-
-#libgnunet_plugin_cmd_simple_send_la_SOURCES = \
-# plugin_cmd_simple_send.c
-#libgnunet_plugin_cmd_simple_send_la_LIBADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  libgnunettransporttesting2.la \
-#  $(LTLIBINTL)
-#libgnunet_plugin_cmd_simple_send_la_LDFLAGS = \
-#  $(GN_PLUGIN_LDFLAGS)
+  $(BT_PLUGIN_LA) \
+  libgnunet_test_transport_plugin_cmd_simple_send.la
+
+libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
+ test_transport_plugin_cmd_simple_send.c
+libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunettransporttesting2.la \
+  $(LTLIBINTL)
+libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
 
 if HAVE_EXPERIMENTAL
 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 @@
  */
 #include "platform.h"
 #include "gnunet_testing_ng_lib.h"
-#include "gnunet_testbed_ng_service.h"
 #include "gnunet_util_lib.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
@@ -49,7 +48,7 @@ run (void *cls)
     GNUNET_TESTING_cmd_netjail_start_testing_system ("netjail-start-testbed-1",
                                                      "2",
                                                      "1",
-                                                     "libgnunet_plugin_cmd_simple_send",
+                                                     "libgnunet_test_transport_plugin_cmd_simple_send",
                                                      &rv),
     GNUNET_TESTING_cmd_stop_testing_system ("stop-testbed",
                                             "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 @@
 /*
-     This file is part of GNUnet
-     Copyright (C) 2013, 2014 GNUnet e.V.
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
 
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
 
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
 
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
  */
@@ -27,8 +27,6 @@
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
-// #include "gnunet_transport_service.h"
-#include "gnunet_testbed_ng_service.h"
 #include "transport-testing2.h"
 #include "transport-testing-cmds.h"
 
@@ -166,7 +164,7 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
  * @return the exported block API
  */
 void *
-libgnunet_plugin_cmd_simple_send_init (void *cls)
+libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls)
 {
   struct GNUNET_TESTING_PluginFunctions *api;
 
@@ -180,11 +178,11 @@ libgnunet_plugin_cmd_simple_send_init (void *cls)
 /**
  * Exit point from the plugin.
  *
- * @param cls the return value from #libgnunet_plugin_block_test_init
+ * @param cls the return value from #libgnunet_test_transport_plugin_block_test_init
  * @return NULL
  */
 void *
-libgnunet_plugin_cmd_simple_send_done (void *cls)
+libgnunet_test_transport_plugin_cmd_simple_send_done (void *cls)
 {
   struct GNUNET_TESTING_PluginFunctions *api = cls;