From 49616100333d2bf143fa855ab96e6e73eb62c543 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Thu, 28 Nov 2013 02:01:35 +0000 Subject: [PATCH] - remove deprecated tests --- src/mesh/Makefile.am | 2 -- src/mesh/gnunet-service-mesh_connection.c | 2 -- src/mesh/test_mesh_small.c | 18 ++---------------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index bc6d6e692..a81ac4589 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -111,9 +111,7 @@ check_PROGRAMS = \ test_mesh_small_signal \ test_mesh_small_speed \ test_mesh_small_speed_ack \ - test_mesh_small_speed_nobuf \ test_mesh_small_speed_backwards \ - test_mesh_small_speed_nobuf_backwards \ test_mesh_small_speed_reliable \ test_mesh_small_speed_reliable_backwards endif diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c index 48c3fe80e..67ac070ab 100644 --- a/src/mesh/gnunet-service-mesh_connection.c +++ b/src/mesh/gnunet-service-mesh_connection.c @@ -747,8 +747,6 @@ send_broken (struct MeshConnection *c, * * @param c Connection to keep alive.. * @param fwd Is this a FWD keepalive? (owner -> dest). - * - * FIXME register in GMC_send_prebuilt_message() */ static void connection_keepalive (struct MeshConnection *c, int fwd) diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c index cfebcaac8..855156bd9 100644 --- a/src/mesh/test_mesh_small.c +++ b/src/mesh/test_mesh_small.c @@ -51,7 +51,6 @@ #define FORWARD 1 #define SPEED 3 #define SPEED_ACK 4 -#define SPEED_NOBUF 6 #define SPEED_REL 8 #define P2P_SIGNAL 10 @@ -625,7 +624,6 @@ channel_cleaner (void *cls, const struct GNUNET_MESH_Channel *channel, static void do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - int nobuf; int rel; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\n"); @@ -637,13 +635,6 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_SCHEDULER_cancel (disconnect_task); } - if (SPEED_NOBUF == test) - { - test = SPEED; - nobuf = GNUNET_YES; - } - else - nobuf = GNUNET_NO; if (SPEED_REL == test) { @@ -652,7 +643,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } else rel = GNUNET_NO; - ch = GNUNET_MESH_channel_create (h1, NULL, p_id[1], 1, nobuf, rel); + ch = GNUNET_MESH_channel_create (h1, NULL, p_id[1], 1, GNUNET_NO, rel); disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME, &disconnect_mesh_peers, @@ -794,12 +785,7 @@ main (int argc, char *argv[]) */ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n"); ok_goal = TOTAL_PACKETS + 4; - if (strstr (argv[0], "_nobuf") != NULL) - { - test = SPEED_NOBUF; - test_name = "speed nobuf"; - } - else if (strstr (argv[0], "_reliable") != NULL) + if (strstr (argv[0], "_reliable") != NULL) { test = SPEED_REL; test_name = "speed reliable"; -- 2.25.1