- fix handling of duplicate incoming channel create with respect to queued retransmis...

[oweals/gnunet.git] / src / mesh / gnunet-service-mesh_local.c

diff --git a/src/mesh/gnunet-service-mesh_local.c b/src/mesh/gnunet-service-mesh_local.c
index f5a3210afb1c1e6369c69c8d16dda6134fbb0005..84adb7d0e6692405c84b430704be6d9b30733b17 100644 (file)
--- a/src/mesh/gnunet-service-mesh_local.c
+++ b/src/mesh/gnunet-service-mesh_local.c
@@ -411,7 +411,7 @@ handle_channel_destroy (void *cls, struct GNUNET_SERVER_Client *client,
   struct MeshChannel *ch;
   MESH_ChannelNumber chid;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "\n\nGot a DESTROY CHANNEL from client!\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Got a DESTROY CHANNEL from client!\n");
 
   /* Sanity check for client registration */
   if (NULL == (c = GML_client_get (client)))
@@ -471,7 +471,7 @@ handle_data (void *cls, struct GNUNET_SERVER_Client *client,
   size_t size;
   int fwd;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "\n\nGot data from a client!\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Got data from a client!\n");
 
   /* Sanity check for client registration */
   if (NULL == (c = GML_client_get (client)))
@@ -602,10 +602,10 @@ get_all_peers_iterator (void *cls,
   msg.header.size = htons (sizeof (msg));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_PEERS);
   msg.destination = *peer;
-  msg.paths = GMP_count_paths (p);
-  msg.tunnel = NULL != GMP_get_tunnel (p);
+  msg.paths = htons (GMP_count_paths (p));
+  msg.tunnel = htons (NULL != GMP_get_tunnel (p));
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "sending info about tunnel ->%s\n",
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "sending info about peer %s\n",
        GNUNET_i2s (peer));
 
   GNUNET_SERVER_notification_context_unicast (nc, client,
@@ -727,7 +727,7 @@ static void
 iter_connection (void *cls, struct MeshConnection *c)
 {
   struct GNUNET_MESH_LocalInfoTunnel *msg = cls;
-  struct GNUNET_HashCode *h = (struct GNUNET_HashCode *) &msg[1];
+  struct GNUNET_MeshHash *h = (struct GNUNET_MeshHash *) &msg[1];
 
   h[msg->connections] = *(GMC_get_id (c));
   msg->connections++;