summaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authort3sserakt <t3ss@posteo.de>2021-09-14 14:19:31 +0200
committert3sserakt <t3ss@posteo.de>2021-09-14 14:19:31 +0200
commit9bdaa1f9b21b324963fe0f41311ae6d9c0948946 (patch)
tree79704a93b827d97497cc1665302fb3f1768f1b74 /src/transport
parentc01e846f9af440e6ee57531715e6fc6c383ad374 (diff)
- fixed wrong dependencies to tng version of libs, added missing block after sending
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/Makefile.am12
-rw-r--r--src/transport/test_transport_plugin_cmd_simple_send.c8
-rw-r--r--src/transport/test_transport_plugin_cmd_simple_send_v2.c44
3 files changed, 22 insertions, 42 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 8bd35b5a3..561ac5e60 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -401,7 +401,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
libgnunettransporttesting2.la \
libgnunettransportapplication.la \
- libgnunettransport.la \
+ libgnunettransportcore.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -418,7 +418,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_v2_la_SOURCES = \
libgnunet_test_transport_plugin_cmd_simple_send_v2_la_LIBADD = \
libgnunettransporttesting2.la \
libgnunettransportapplication.la \
- libgnunettransport.la \
+ libgnunettransportcore.la \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -756,8 +756,8 @@ test_transport_simple_send_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/hello/libgnunethello.la \
- libgnunettransport.la \
- libgnunettransporttesting.la
+ libgnunettransportcore.la \
+ libgnunettransporttesting2.la
test_transport_simple_send_v2_SOURCES = \
test_transport_simple_send_v2.c
@@ -766,8 +766,8 @@ test_transport_simple_send_v2_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/hello/libgnunethello.la \
- libgnunettransport.la \
- libgnunettransporttesting.la
+ libgnunettransportcore.la \
+ libgnunettransporttesting2.la
test_transport_testing_startstop_SOURCES = \
test_transport_testing_startstop.c
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index 1dc44c945..35aa07ecd 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -55,6 +55,11 @@ char *cfgname;
*/
unsigned int are_all_peers_started;
+/**
+ * Flag indicating a received message.
+ */
+unsigned int message_received;
+
/**
* Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
@@ -80,6 +85,7 @@ handle_test (void *cls,
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"message received\n");
+ message_received = GNUNET_YES;
}
@@ -203,6 +209,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
(atoi (n) - 1) * atoi (local_m) + atoi (
m),
"start-peer"),
+ GNUNET_TESTING_cmd_block_until_external_trigger ("block-receive",
+ &message_received),
GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
"start-peer"),
GNUNET_TESTING_cmd_system_destroy ("system-destroy",
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 ce1245296..c79b5c7e2 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_v2.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_v2.c
@@ -57,6 +57,11 @@ char *cfgname;
*/
unsigned int are_all_peers_started;
+/**
+ * Flag indicating a received message.
+ */
+unsigned int message_received;
+
/**
* Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
@@ -80,35 +85,7 @@ static void
handle_test (void *cls,
const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
{
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "message received\n");
-}
-
-
-/**
- * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2
- * being received.
- *
- */
-static int
-check_test2 (void *cls,
- const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
- return GNUNET_OK;
-}
-
-
-/**
- * Function called to handle a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2
- * being received.
- *
- */
-static void
-handle_test2 (void *cls,
- const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "message received\n");
+ message_received = GNUNET_YES;
}
@@ -120,9 +97,6 @@ static void
all_peers_started ()
{
are_all_peers_started = GNUNET_YES;
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "setting are_all_peers_started: %d\n",
- are_all_peers_started);
}
@@ -181,10 +155,6 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
struct GNUNET_TRANSPORT_TESTING_TestMessage,
NULL),
- GNUNET_MQ_hd_var_size (test2,
- GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2,
- struct GNUNET_TRANSPORT_TESTING_TestMessage,
- NULL),
GNUNET_MQ_handler_end ()
};
@@ -208,6 +178,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
GNUNET_TRANSPORT_cmd_send_simple_v2 ("send-simple",
"start-peer",
num),
+ GNUNET_TESTING_cmd_block_until_external_trigger ("block-receive",
+ &message_received),
GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
"start-peer"),
GNUNET_TESTING_cmd_system_destroy ("system-destroy",