[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16846 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16846 - gnunet/src/mesh |
Date: |
Wed, 14 Sep 2011 17:27:35 +0200 |
Author: bartpolot
Date: 2011-09-14 17:27:34 +0200 (Wed, 14 Sep 2011)
New Revision: 16846
Modified:
gnunet/src/mesh/gnunet-service-mesh.c
gnunet/src/mesh/test_mesh_local_1.c
gnunet/src/mesh/test_mesh_local_2.c
Log:
Fixed compiler warning in tests
Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c 2011-09-14 15:17:22 UTC (rev
16845)
+++ gnunet/src/mesh/gnunet-service-mesh.c 2011-09-14 15:27:34 UTC (rev
16846)
@@ -2689,7 +2689,7 @@
/**
* Functions to handle messages from clients
*/
-static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = {
+static struct GNUNET_SERVER_MessageHandler client_handlers[] = {
{&handle_local_new_client, NULL, GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT, 0},
{&handle_local_tunnel_create, NULL,
GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE,
@@ -2857,7 +2857,7 @@
const struct GNUNET_CONFIGURATION_Handle *c)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: starting to run\n");
- GNUNET_SERVER_add_handlers (server, plugin_handlers);
+ GNUNET_SERVER_add_handlers (server, client_handlers);
GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL);
server_handle = server;
core_handle = GNUNET_CORE_connect (c, /* Main configuration */
@@ -2897,7 +2897,7 @@
clients = NULL;
clients_tail = NULL;
- announce_applications_task = 0;
+ announce_applications_task = GNUNET_SCHEDULER_NO_TASK;
/* Scheduled the task to clean up when shutdown is called */
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
Modified: gnunet/src/mesh/test_mesh_local_1.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_1.c 2011-09-14 15:17:22 UTC (rev 16845)
+++ gnunet/src/mesh/test_mesh_local_1.c 2011-09-14 15:27:34 UTC (rev 16846)
@@ -36,8 +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 unsigned int one = 1;
+static unsigned int two = 2;
static int result;
static GNUNET_SCHEDULER_TaskIdentifier abort_task;
Modified: gnunet/src/mesh/test_mesh_local_2.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_2.c 2011-09-14 15:17:22 UTC (rev 16845)
+++ gnunet/src/mesh/test_mesh_local_2.c 2011-09-14 15:27:34 UTC (rev 16846)
@@ -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 unsigned int one = 1;
+static unsigned 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)
@@ -158,7 +160,7 @@
inbound_end (void *cls, 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)
@@ -177,7 +179,8 @@
* @param peer peer identity the tunnel stopped working with
*/
static void
-peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer)
+peer_conected (void *cls, 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);
@@ -192,8 +195,7 @@
* @param atsi performance data for the connection
*/
static void
-peer_disconnected (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+peer_disconnected (void *cls, const struct GNUNET_PeerIdentity *peer)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer disconnected\n");
}
@@ -226,7 +228,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 */
@@ -247,7 +249,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 */
@@ -263,7 +265,7 @@
}
t = GNUNET_MESH_tunnel_create (mesh_peer_2, NULL, &peer_conected,
- &peer_disconnected, (void *) 2);
+ &peer_disconnected, (void *) &two);
GNUNET_MESH_peer_request_connect_by_type (t, 1);
test_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16846 - gnunet/src/mesh,
gnunet <=