fixed unset port forwarding variable bug in netjail script, fixed end cmd without shutdown bug, smaller fixes

3 files changed, 11 insertions, 9 deletions

diff --git a/src/transport/test_transport_plugin_cmd_simple_send_v2.c b/src/transport/test_transport_plugin_cmd_simple_send_v2.c
index acfe784d6..c308d9a29 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_v2.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_v2.c
@@ -85,6 +85,8 @@ static void
 handle_test (void *cls,
              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
 {
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Message received\n");
   message_received = GNUNET_YES;
 }
 
@@ -203,7 +205,7 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
  * @return the exported block API
  */
 void *
-libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls)
+libgnunet_test_transport_plugin_cmd_simple_send_v2_init (void *cls)
 {
   struct GNUNET_TESTING_PluginFunctions *api;
 
@@ -221,7 +223,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls)
  * @return NULL
  */
 void *
-libgnunet_test_transport_plugin_cmd_simple_send_done (void *cls)
+libgnunet_test_transport_plugin_cmd_simple_send_v2_done (void *cls)
 {
   struct GNUNET_TESTING_PluginFunctions *api = cls;
 
diff --git a/src/transport/test_transport_simple_send_v2.c b/src/transport/test_transport_simple_send_v2.c
index aeac1bfb6..feb65468a 100644
--- a/src/transport/test_transport_simple_send_v2.c
+++ b/src/transport/test_transport_simple_send_v2.c
@@ -47,6 +47,12 @@ static unsigned int rv = 0;
 static void
 run (void *cls)
 {
+  struct GNUNET_TESTING_Command cmd = GNUNET_TESTING_cmd_end ();
+
+  if (GNUNET_YES == cmd.shutdown_on_end)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "gaga %p\n",
+                cmd);
   struct GNUNET_TESTING_Command commands[] = {
     GNUNET_TESTING_cmd_netjail_start_v2 ("netjail-start",
                                          TOPOLOGY_CONFIG),
@@ -58,7 +64,7 @@ run (void *cls)
                                                TOPOLOGY_CONFIG),
     GNUNET_TESTING_cmd_netjail_stop_v2 ("netjail-stop",
                                         TOPOLOGY_CONFIG),
-    GNUNET_TESTING_cmd_end ()
+    cmd
   };
 
   GNUNET_TESTING_run (NULL,
diff --git a/src/transport/transport_api_cmd_backchannel_check.c b/src/transport/transport_api_cmd_backchannel_check.c
index da44e91ca..5cc13dbfa 100644
--- a/src/transport/transport_api_cmd_backchannel_check.c
+++ b/src/transport/transport_api_cmd_backchannel_check.c
@@ -195,12 +195,6 @@ read_from_log (void *cls)
                strcmp (
                  "Delivering backchannel message from 4TTC to F7B5 of type 1460 to udp",
                  cs->search_string[i]));
-          if (NULL != strstr (line,
-                              cs->search_string[i]))
-          {
-            LOG (GNUNET_ERROR_TYPE_DEBUG,
-                 "gaga\n");
-          }
           cs->finished = GNUNET_YES;
           fclose (cs->stream);
           return;