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

[gnunet]

Author: bartpolot
Date: 2012-08-21 18:12:29 +0200 (Tue, 21 Aug 2012)
New Revision: 23350

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/test_mesh_local_traffic.c
Log:
- more info on error

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-08-21 16:02:23 UTC (rev 
23349)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-08-21 16:12:29 UTC (rev 
23350)
@@ -6893,6 +6893,12 @@
   t = tunnel_get_by_local_id (c, tid);
   if (NULL == t)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tunnel %X unknown.\n", tid);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  for client %u.\n", c->id);
+    if (t->owner == c)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  (client is owner)\n");
+    else
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  (client is leaf)\n");
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
@@ -6999,6 +7005,12 @@
   if (NULL == t)
   {
     GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tunnel %X unknown.\n", tid);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  for client %u.\n", c->id);
+    if (t->owner == c)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  (client is owner)\n");
+    else
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  (client is leaf)\n");    
GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
@@ -7078,6 +7090,12 @@
   if (NULL == t)
   {
     GNUNET_break (0); // FIXME fc
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Tunnel %X unknown.\n", tid);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  for client %u.\n", c->id);
+    if (t->owner == c)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  (client is owner)\n");
+    else
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  (client is leaf)\n");
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
@@ -7099,7 +7117,8 @@
     tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK);
   }
 
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);  
+
   return;
 }
 

Modified: gnunet/src/mesh/test_mesh_local_traffic.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_traffic.c   2012-08-21 16:02:23 UTC (rev 
23349)
+++ gnunet/src/mesh/test_mesh_local_traffic.c   2012-08-21 16:12:29 UTC (rev 
23350)
@@ -32,7 +32,7 @@
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
-#define TARGET 1000
+#define TARGET 100000
 
 /**
  * DIFFERENT TESTS TO RUN
@@ -512,7 +512,7 @@
     FPRINTF (stderr, "\nTest time %llu ms\n",
              (unsigned long long) total_time.rel_value);
     FPRINTF (stderr, "Test payload bandwidth: %f kb/s\n",
-             4 * 1000.0 / total_time.rel_value); // 4bytes * ms
+             total_traffic * 4.0 / total_time.rel_value); // 4bytes * kb/ms
     FPRINTF (stderr, "Test throughput: %f packets/s\n\n",
              total_traffic * 1000.0 / total_time.rel_value); // 1000 packets * 
ms
     GAUGER ("MESH",