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

[gnunet]

Author: bartpolot
Date: 2012-07-25 19:57:46 +0200 (Wed, 25 Jul 2012)
New Revision: 22918

Modified:
   gnunet/src/mesh/mesh_api.c
   gnunet/src/mesh/test_mesh_api.c
   gnunet/src/mesh/test_mesh_local_1.c
   gnunet/src/mesh/test_mesh_local_2.c
   gnunet/src/mesh/test_mesh_regex.c
   gnunet/src/mesh/test_mesh_small.c
Log:
- initialize pointer

Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2012-07-25 17:34:21 UTC (rev 22917)
+++ gnunet/src/mesh/mesh_api.c  2012-07-25 17:57:46 UTC (rev 22918)
@@ -1196,6 +1196,7 @@
     return 0;
   }
   tsize = 0;
+  next = h->th_head;
   while ((NULL != (th = next)) && (size >= th->size))
   {
     t = th->tunnel;

Modified: gnunet/src/mesh/test_mesh_api.c
===================================================================
--- gnunet/src/mesh/test_mesh_api.c     2012-07-25 17:34:21 UTC (rev 22917)
+++ gnunet/src/mesh/test_mesh_api.c     2012-07-25 17:57:46 UTC (rev 22918)
@@ -101,7 +101,7 @@
   static const GNUNET_MESH_ApplicationType app[] =
     { 1, 2, 3, 4, 5, 6, 7, 8, 0 };
 
-  mesh = GNUNET_MESH_connect (cfg, 10, NULL, NULL, NULL, handlers, app);
+  mesh = GNUNET_MESH_connect (cfg, NULL, NULL, NULL, handlers, app);
   if (NULL == mesh)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh 
:(\n");

Modified: gnunet/src/mesh/test_mesh_local_1.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_1.c 2012-07-25 17:34:21 UTC (rev 22917)
+++ gnunet/src/mesh/test_mesh_local_1.c 2012-07-25 17:57:46 UTC (rev 22918)
@@ -250,7 +250,6 @@
                                     (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
                                     NULL);
   mesh_peer_1 = GNUNET_MESH_connect (cfg,       /* configuration */
-                                     10,        /* queue size */
                                      (void *) &one,     /* cls */
                                      &inbound_tunnel,   /* inbound new hndlr */
                                      &inbound_end,      /* inbound end hndlr */
@@ -258,7 +257,6 @@
                                      app1);     /* apps offered */
 
   mesh_peer_2 = GNUNET_MESH_connect (cfg,       /* configuration */
-                                     10,        /* queue size */
                                      (void *) &two,     /* cls */
                                      &inbound_tunnel,   /* inbound new hndlr */
                                      &inbound_end,      /* inbound end hndlr */

Modified: gnunet/src/mesh/test_mesh_local_2.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_2.c 2012-07-25 17:34:21 UTC (rev 22917)
+++ gnunet/src/mesh/test_mesh_local_2.c 2012-07-25 17:57:46 UTC (rev 22918)
@@ -226,7 +226,6 @@
 
   test_task = GNUNET_SCHEDULER_NO_TASK;
   mesh_peer_1 = GNUNET_MESH_connect (cfg,       /* configuration */
-                                     10,        /* queue size */
                                      (void *) &one,     /* cls */
                                      &inbound_tunnel,   /* inbound new hndlr */
                                      &inbound_end,      /* inbound end hndlr */
@@ -250,7 +249,6 @@
                                     (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
                                     NULL);
   mesh_peer_2 = GNUNET_MESH_connect (cfg,       /* configuration */
-                                     10,        /* queue size */
                                      (void *) &two,     /* cls */
                                      &inbound_tunnel,   /* inbound new hndlr */
                                      &inbound_end,      /* inbound end hndlr */

Modified: gnunet/src/mesh/test_mesh_regex.c
===================================================================
--- gnunet/src/mesh/test_mesh_regex.c   2012-07-25 17:34:21 UTC (rev 22917)
+++ gnunet/src/mesh/test_mesh_regex.c   2012-07-25 17:57:46 UTC (rev 22918)
@@ -288,7 +288,7 @@
               GNUNET_i2s (peer));
   regex_peers++;
  
-  GNUNET_MESH_notify_transmit_ready(t[i], 0, 0,
+  GNUNET_MESH_notify_transmit_ready(t[i], GNUNET_NO,
                                     GNUNET_TIME_UNIT_FOREVER_REL,
                                     peer,
                                     sizeof(struct GNUNET_MessageHeader),
@@ -427,7 +427,7 @@
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Connect to mesh\n");
-  h1 = GNUNET_MESH_connect (d->cfg, 5, (void *) 1L,
+  h1 = GNUNET_MESH_connect (d->cfg, (void *) 1L,
                             NULL,
                             NULL,
                             handlers,
@@ -437,7 +437,7 @@
   {
     ok[i] = GNUNET_NO;
     d = GNUNET_TESTING_daemon_get (pg, 10 + i);
-    h2[i] = GNUNET_MESH_connect (d->cfg, 5, (void *) (long) (i + 2),
+    h2[i] = GNUNET_MESH_connect (d->cfg, (void *) (long) (i + 2),
                                  &incoming_tunnel,
                                  &tunnel_cleaner,
                                  handlers,

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2012-07-25 17:34:21 UTC (rev 22917)
+++ gnunet/src/mesh/test_mesh_small.c   2012-07-25 17:57:46 UTC (rev 22918)
@@ -284,7 +284,7 @@
   struct GNUNET_MESH_TransmitHandle *th;
   if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
     return;
-  th = GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO, 0,
+  th = GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO,
                                     GNUNET_TIME_UNIT_FOREVER_REL, &d2->id,
                                     sizeof (struct GNUNET_MessageHeader),
                                     &tmt_rdy, (void *) 1L);
@@ -384,7 +384,7 @@
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               " received ack %u\n", data_ack);
-      GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO, 0,
+      GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
                                         GNUNET_TIME_UNIT_FOREVER_REL, sender,
                                         sizeof (struct GNUNET_MessageHeader),
                                         &tmt_rdy, (void *) 1L);
@@ -414,7 +414,7 @@
     GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
     if (SPEED != test || 1002 == ok)
     {
-      GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO, 0,
+      GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
                                         GNUNET_TIME_UNIT_FOREVER_REL, sender,
                                         sizeof (struct GNUNET_MessageHeader),
                                         &tmt_rdy, (void *) 1L);
@@ -606,7 +606,7 @@
     data_received = 0;
     data_sent = 0;
     start_time = GNUNET_TIME_absolute_get();
-    GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO, 0,
+    GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO,
                                        GNUNET_TIME_UNIT_FOREVER_REL, dest,
                                        sizeof (struct GNUNET_MessageHeader),
                                        &tmt_rdy, (void *) 1L);
@@ -678,13 +678,13 @@
                 GNUNET_i2s (&d3->id));
   }
 #endif
-  h1 = GNUNET_MESH_connect (d1->cfg, 5, (void *) 1L, NULL, &tunnel_cleaner,
+  h1 = GNUNET_MESH_connect (d1->cfg, (void *) 1L, NULL, &tunnel_cleaner,
                             handlers, &app);
-  h2 = GNUNET_MESH_connect (d2->cfg, 5, (void *) 2L, &incoming_tunnel,
+  h2 = GNUNET_MESH_connect (d2->cfg, (void *) 2L, &incoming_tunnel,
                             &tunnel_cleaner, handlers, &app);
   if (test == MULTICAST)
   {
-    h3 = GNUNET_MESH_connect (d3->cfg, 5, (void *) 3L, &incoming_tunnel,
+    h3 = GNUNET_MESH_connect (d3->cfg, (void *) 3L, &incoming_tunnel,
                               &tunnel_cleaner, handlers, &app);
   }
   t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 1L);