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

[gnunet]

Author: bartpolot
Date: 2011-09-13 19:43:33 +0200 (Tue, 13 Sep 2011)
New Revision: 16818

Modified:
   gnunet/src/mesh/test_mesh_local_1.c
Log:
Fixed compiler warnings

Modified: gnunet/src/mesh/test_mesh_local_1.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_1.c 2011-09-13 14:07:25 UTC (rev 16817)
+++ gnunet/src/mesh/test_mesh_local_1.c 2011-09-13 17:43:33 UTC (rev 16818)
@@ -36,6 +36,8 @@
 static struct GNUNET_MESH_Handle *mesh_peer_1;
 static struct GNUNET_MESH_Handle *mesh_peer_2;
 static struct GNUNET_MESH_Tunnel *t;
+static int one = 1;
+static int two = 2;
 
 static int result;
 static GNUNET_SCHEDULER_TaskIdentifier abort_task;
@@ -132,7 +134,7 @@
                 const struct GNUNET_PeerIdentity *initiator,
                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
-  unsigned int id = (unsigned int) cls;
+  unsigned int id = *(unsigned int *) cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: received incoming tunnel\n");
   if (id != 1)
@@ -159,7 +161,7 @@
              const struct GNUNET_MESH_Tunnel * tunnel,
              void *tunnel_ctx)
 {
-  unsigned int id = (unsigned int) cls;
+  unsigned int id = *(unsigned int *) cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: incoming tunnel closed\n");
   if (id != 1)
@@ -179,7 +181,8 @@
  */
 static void peer_conected (
     void *cls,
-    const struct GNUNET_PeerIdentity * peer)
+    const struct GNUNET_PeerIdentity * peer,
+    const struct GNUNET_TRANSPORT_ATS_Information * atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n");
   GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL);
@@ -195,8 +198,7 @@
  */
 static void peer_disconnected (
     void *cls,
-    const struct GNUNET_PeerIdentity * peer,
-    const struct GNUNET_TRANSPORT_ATS_Information * atsi)
+    const struct GNUNET_PeerIdentity * peer)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer disconnected\n");
 }
@@ -240,7 +242,7 @@
   test_task = GNUNET_SCHEDULER_NO_TASK;
   mesh_peer_1 = GNUNET_MESH_connect (cfg,       /* configuration */
                                      10,        /* queue size */
-                                     (void *) 1,        /* cls */
+                                     (void *) &one,     /* cls */
                                      &inbound_tunnel,   /* inbound new hndlr */
                                      &inbound_end,      /* inbound end hndlr */
                                      handlers1, /* traffic handlers */
@@ -248,7 +250,7 @@
 
   mesh_peer_2 = GNUNET_MESH_connect (cfg,       /* configuration */
                                      10,        /* queue size */
-                                     (void *) 2,        /* cls */
+                                     (void *) &two,     /* cls */
                                      &inbound_tunnel,   /* inbound new hndlr */
                                      &inbound_end,      /* inbound end hndlr */
                                      handlers2, /* traffic handlers */
@@ -267,7 +269,7 @@
                                  NULL,
                                  &peer_conected,
                                  &peer_disconnected,
-                                 (void *) 2);
+                                 (void *) &two);
   GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &do_find, NULL);
 }