- relsoved an coverity issue, worked on fixmes, code documentation and cleaned up up the barrier API

14 files changed, 67 insertions, 41 deletions

diff --git a/src/transport/test_transport_api2_tcp_node1.conf b/src/transport/test_transport_api2_tcp_node1.conf
index d396f43d7..37b6f08d1 100644
--- a/src/transport/test_transport_api2_tcp_node1.conf
+++ b/src/transport/test_transport_api2_tcp_node1.conf
@@ -8,6 +8,9 @@ PLUGINS = tcp
 #PREFIX = valgrind --leak-check=full --track-origins=yes --trace-children=yes --log-file=$GNUNET_TEST_HOME/vg_peer1-%p 
 UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock
 
+[PEER]
+PRIVATE_KEY = $GNUNET_RUNTIME_DIR/private.key
+
 [communicator-tcp]
 BINARY = gnunet-communicator-tcp
 BINDTO = 192.168.15.1:60002
diff --git a/src/transport/test_transport_nat_upnp.sh b/src/transport/test_transport_nat_upnp.sh
index f9dfca71f..df43ef320 100755
--- a/src/transport/test_transport_nat_upnp.sh
+++ b/src/transport/test_transport_nat_upnp.sh
@@ -9,3 +9,4 @@ if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
   fi
 fi
 exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_nat_upnp_topo.conf"
+#sudo valgrind --vgdb=yes --leak-check=full --track-origins=yes --trace-children=yes --trace-children-skip=/usr/bin/awk,/usr/bin/cut,/usr/bin/seq,/sbin/ip/sed/bash ./test_transport_start_with_config test_transport_nat_upnp_topo.conf
diff --git a/src/transport/test_transport_plugin_cmd_nat_upnp.c b/src/transport/test_transport_plugin_cmd_nat_upnp.c
index 91255a9fe..1b02fbfc2 100644
--- a/src/transport/test_transport_plugin_cmd_nat_upnp.c
+++ b/src/transport/test_transport_plugin_cmd_nat_upnp.c
@@ -146,7 +146,7 @@ handle_result (void *cls,
               "Local test exits with status %d\n",
               rv);
 
-  ts->finished_cb ();
+  ts->finished_cb (rv);
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -201,10 +201,17 @@ all_local_tests_prepared ()
  *
  * @param write_message Callback to send a message to the master loop.
  * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
+ * @param node_ip The IP address of the node.
  * @param m The number of the node in a network namespace.
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
+ * @param topology_data A file name for the file containing the topology configuration, or a string containing
+ *        the topology configuration.
+ * @param read_file If read_file is GNUNET_YES this string is the filename for the topology configuration,
+ *        if read_file is GNUNET_NO the string contains the topology configuration.
+ * @param finish_cb Callback function which writes a message from the helper process running on a netjail 
+ *                  node to the master process * signaling that the test case running on the netjail node finished.
+ * @return Returns the struct GNUNET_TESTING_Interpreter of the command loop running on this netjail node.
  */
 static struct GNUNET_TESTING_Interpreter *
 start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
@@ -321,9 +328,12 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                                      ts->cfgname,
                                      notify_connect,
                                      GNUNET_NO),
-    GNUNET_TESTING_cmd_barrier_create ("ready-to-connect",
-                                       0.0,
-                                       2),
+    GNUNET_TESTING_cmd_barrier_reached ("ready-to-connect-reached",
+                                        "ready-to-connect",
+                                        GNUNET_NO,
+                                        num,
+                                        GNUNET_NO,
+                                        write_message),
     connect_peers,
     GNUNET_TRANSPORT_cmd_send_simple ("send-simple",
                                       "start-peer",
@@ -331,9 +341,12 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                                       num,
                                       topology),
     block_receive,
-    GNUNET_TESTING_cmd_barrier_create ("test-case-finished",
-                                       0.0,
-                                       2),
+    GNUNET_TESTING_cmd_barrier_reached ("test-case-finished-reached",
+                                        "test-case-finished",
+                                        GNUNET_NO,
+                                        num,
+                                        GNUNET_NO,
+                                        write_message),
     GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
                                     "start-peer"),
     GNUNET_TESTING_cmd_system_destroy ("system-destroy",
@@ -368,8 +381,6 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_init (void *cls)
 
   api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions);
   api->start_testcase = &start_testcase;
-  api->all_peers_started = &all_peers_started;
-  api->all_local_tests_prepared = all_local_tests_prepared;
   api->get_waiting_for_barriers = get_waiting_for_barriers;
   return api;
 }
@@ -378,11 +389,11 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_init (void *cls)
 /**
  * Exit point from the plugin.
  *
- * @param cls the return value from #libgnunet_test_transport_plugin_block_test_init
+ * @param cls the return value from #libgnunet_test_transport_plugin_nat_upnp_init
  * @return NULL
  */
 void *
-libgnunet_test_transport_plugin_cmd_simple_send_done (void *cls)
+libgnunet_test_transport_plugin_cmd_nat_upnp_done (void *cls)
 {
   struct GNUNET_TESTING_PluginFunctions *api = cls;
 
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index 632c522c9..375796dff 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -130,7 +130,7 @@ handle_result (void *cls,
               "Local test exits with status %d\n",
               rv);
 
-  ts->finished_cb ();
+  ts->finished_cb (rv);
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -185,7 +185,7 @@ all_local_tests_prepared ()
  *
  * @param write_message Callback to send a message to the master loop.
  * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
+ * @param node_ip The IP address of the node.
  * @param m The number of the node in a network namespace.
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
index 2f84b8213..7381b1d7e 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
@@ -131,7 +131,7 @@ handle_result (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Local test exits with status %d\n",
               rv);
-  ts->finished_cb ();
+  ts->finished_cb (rv);
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -218,7 +218,7 @@ all_local_tests_prepared ()
  *
  * @param write_message Callback to send a message to the master loop.
  * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
+ * @param node_ip The IP address of the node.
  * @param m The number of the node in a network namespace.
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_dv.c b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
index 4da03d155..55ab4a48f 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_dv.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
@@ -183,7 +183,7 @@ handle_result (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Local test exits with status %d\n",
               rv);
-  ts->finished_cb ();
+  ts->finished_cb (rv);
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -241,7 +241,7 @@ all_local_tests_prepared ()
  *
  * @param write_message Callback to send a message to the master loop.
  * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
+ * @param node_ip The IP address of the node.
  * @param m The number of the node in a network namespace.
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
index 7a26a89d8..5e931fbe3 100644
--- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -128,7 +128,7 @@ handle_result (void *cls,
               "Local test exits with status %d\n",
               rv);
 
-  ts->finished_cb ();
+  ts->finished_cb (rv);
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -178,7 +178,7 @@ all_local_tests_prepared ()
  *
  * @param write_message Callback to send a message to the master loop.
  * @param router_ip Global address of the network namespace.
- * @param node_ip Local address of a node i a network namespace.
+ * @param node_ip The IP address of the node.
  * @param m The number of the node in a network namespace.
  * @param n The number of the network namespace.
  * @param local_m The number of nodes in a network namespace.
diff --git a/src/transport/test_transport_simple_send_dv_circle.sh b/src/transport/test_transport_simple_send_dv_circle.sh
index 353d14f65..bd5f00abe 100755
--- a/src/transport/test_transport_simple_send_dv_circle.sh
+++ b/src/transport/test_transport_simple_send_dv_circle.sh
@@ -9,4 +9,3 @@ if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
   fi
 fi
 exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_distance_vector_circle_topo.conf"
-# sudo valgrind --leak-check=full --track-origins=yes --trace-children=yes --trace-children-skip=/usr/bin/awk,/usr/bin/cut,/usr/bin/seq,/sbin/ip/sed/bash ./test_transport_start_with_config test_transport_distance_vector_circle_topo.conf
diff --git a/src/transport/test_transport_start_with_config.c b/src/transport/test_transport_start_with_config.c
index 0c3271436..c4b6c55ad 100644
--- a/src/transport/test_transport_start_with_config.c
+++ b/src/transport/test_transport_start_with_config.c
@@ -94,12 +94,12 @@ main (int argc,
     GNUNET_TESTING_cmd_netjail_start ("netjail-start",
                                       topology_data_script,
                                       &read_file),
-    GNUNET_TESTING_cmd_netjail_start_testing_system ("netjail-start-testbed",
+    GNUNET_TESTING_cmd_netjail_start_cmds_helper ("netjail-start-testbed",
                                                      topology,
                                                      &read_file,
                                                      topology_data_script,
                                                      TIMEOUT),
-    GNUNET_TESTING_cmd_stop_testing_system ("stop-testbed",
+    GNUNET_TESTING_cmd_stop_cmds_helper ("stop-testbed",
                                             "netjail-start-testbed",
                                             topology),
     GNUNET_TESTING_cmd_netjail_stop ("netjail-stop",
diff --git a/src/transport/transport-testing-cmds.h b/src/transport/transport-testing-cmds.h
index 1088f2e5b..46f6045dc 100644
--- a/src/transport/transport-testing-cmds.h
+++ b/src/transport/transport-testing-cmds.h
@@ -116,7 +116,9 @@ struct StartPeerState
    */
   struct GNUNET_MQ_MessageHandler *handlers;
 
-  //FIXME documentation
+  /**
+   * GNUnet configuration file used to start a peer.
+   */
   char *cfgname;
 
   /**
@@ -124,7 +126,9 @@ struct StartPeerState
    */
   struct GNUNET_CONFIGURATION_Handle *cfg;
 
-  //FIXME documentation
+  /**
+   * struct GNUNET_TESTING_Peer returned by GNUNET_TESTING_peer_configure.
+   */
   struct GNUNET_TESTING_Peer *peer;
 
   /**
@@ -167,13 +171,9 @@ struct StartPeerState
    */
   size_t hello_size;
 
-  /** All of the below: FIXME documentation */
-  char *m;
-
-  char *n;
-
-  char *local_m;
-
+  /**
+   * The label of the command which was started by calling GNUNET_TESTING_cmd_system_create.
+   */
   char *system_label;
 
   /**
@@ -181,10 +181,20 @@ struct StartPeerState
    */
   unsigned int no;
 
+  /**
+   * A map with struct GNUNET_MQ_Handle values for each peer this peer
+   * is connected to.
+   */
   struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
 
+  /**
+   * Test setup for this peer.
+   */
   const struct GNUNET_TESTING_System *tl_system;
 
+  /**
+   * Callback which is called on neighbour connect events.
+   */
   GNUNET_TRANSPORT_notify_connect_cb notify_connect;
 
   /**
@@ -227,14 +237,11 @@ struct TestState
 
 /**
  * Create command.
- * FIXME: Parameter list does not match documentation.
- * FIXME: m and n parameters need a rename.
  *
  * @param label name for command.
  * @param system_label Label of the cmd to setup a test environment.
- * @param m The number of the local node of the actual network namespace.
- * @param n The number of the actual namespace.
- * @param local_m Number of local nodes in each namespace.
+ * @param no Decimal number representing the last byte of the IP address of this peer.
+ * @param node_ip The IP address of this node.
  * @param handlers Handler for messages received by this peer.
  * @param cfgname Configuration file name for this peer.
  * @param notify_connect Method which will be called, when a peer connects.
diff --git a/src/transport/transport_api_cmd_backchannel_check.c b/src/transport/transport_api_cmd_backchannel_check.c
index 9f62281a4..d672e3ae8 100644
--- a/src/transport/transport_api_cmd_backchannel_check.c
+++ b/src/transport/transport_api_cmd_backchannel_check.c
@@ -351,12 +351,12 @@ add_search_string (struct CheckState *cs, const struct
           + cs->topology->nodes_x;
 
   // num = GNUNET_TESTING_calculate_num (pos_connection, cs->topology);
-  peer = GNUNET_TESTING_get_pub_key (num, cs->tl_system);
+  peer = GNUNET_TESTING_get_peer (num, cs->tl_system);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "peer: %s num %u\n",
        GNUNET_i2s (peer),
        num);
-  us = GNUNET_TESTING_get_pub_key (cs->num, cs->tl_system);
+  us = GNUNET_TESTING_get_peer (cs->num, cs->tl_system);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "us: %s cs->num %d\n",
        GNUNET_i2s (us),
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index 528e05b5f..d399e9d0a 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -112,7 +112,7 @@ connect_peers_run (void *cls,
           GNUNET_asprintf (&addr_and_port,
                            "%s:60002",
                            addr);
-        peer = GNUNET_TESTING_get_pub_key (num, tl_system);
+        peer = GNUNET_TESTING_get_peer (num, tl_system);
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "validating peer number %u with identity %s and address %s %u %s\n",
                     num,
@@ -160,7 +160,7 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
        pos_connection = pos_connection->next)
   {
     num = GNUNET_TESTING_calculate_num (pos_connection, cps->topology);
-    peer_connection = GNUNET_TESTING_get_pub_key (num, cps->tl_system);
+    peer_connection = GNUNET_TESTING_get_peer (num, cps->tl_system);
     if (0 == GNUNET_memcmp (peer,
                             peer_connection))
       cps->con_num_notified++;
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
index 0677b6227..516f8d0aa 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -64,6 +64,9 @@ hello_iter_cb (void *cb_cls,
   memcpy (sps->hello, record->value, sps->hello_size);
   sps->hello[sps->hello_size - 1] = '\0';
 
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Our hello %s\n",
+       sps->hello);
   GNUNET_PEERSTORE_iterate_cancel (sps->pic);
   sps->pic = NULL;
   GNUNET_TESTING_async_finish (&sps->ac);
diff --git a/src/transport/transport_api_cmd_stop_peer.c b/src/transport/transport_api_cmd_stop_peer.c
index 1fdd48fa6..a80742b5f 100644
--- a/src/transport/transport_api_cmd_stop_peer.c
+++ b/src/transport/transport_api_cmd_stop_peer.c
@@ -72,6 +72,8 @@ stop_peer_run (void *cls,
   }
   if (NULL != sps->th)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Disconnecting from TRANSPORT service\n");
     GNUNET_TRANSPORT_core_disconnect (sps->th);
   }
   if (NULL != sps->ah)