[GNUnet-SVN] r30922 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-11-28 03:01:35 +0100 (Thu, 28 Nov 2013)
New Revision: 30922

Modified:
   gnunet/src/mesh/Makefile.am
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/test_mesh_small.c
Log:
- remove deprecated tests


Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2013-11-28 01:48:26 UTC (rev 30921)
+++ gnunet/src/mesh/Makefile.am 2013-11-28 02:01:35 UTC (rev 30922)
@@ -111,9 +111,7 @@
   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

Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-28 01:48:26 UTC 
(rev 30921)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-28 02:01:35 UTC 
(rev 30922)
@@ -747,8 +747,6 @@
  *
  * @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)

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2013-11-28 01:48:26 UTC (rev 30921)
+++ gnunet/src/mesh/test_mesh_small.c   2013-11-28 02:01:35 UTC (rev 30922)
@@ -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 @@
 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 @@
   {
     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 @@
   }
   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,13 +785,8 @@
     */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n");
     ok_goal = TOTAL_PACKETS + 4;
-    if (strstr (argv[0], "_nobuf") != NULL)
+    if (strstr (argv[0], "_reliable") != NULL)
     {
-      test = SPEED_NOBUF;
-      test_name = "speed nobuf";
-    }
-    else if (strstr (argv[0], "_reliable") != NULL)
-    {
       test = SPEED_REL;
       test_name = "speed reliable";
       config_file = "test_mesh_drop.conf";