diff options
| -rw-r--r-- | src/mesh/gnunet-service-mesh.c | 13 | ||||
| -rw-r--r-- | src/mesh/mesh.h | 19 |
2 files changed, 3 insertions, 29 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 0619dfdd69..9e0119b243 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -566,13 +566,6 @@ handle_local_new_client (void *cls, { struct Client *c; unsigned int payload_size; -// FIXME: is this needed? should we delete the GNUNET_MESH_Connect struct? -// struct GNUNET_MESH_Connect *connect_msg; -// -// connect_msg = (struct GNUNET_MESH_Connect *) message; - - /* FIXME: is this a good idea? */ - GNUNET_assert(GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT == message->type); /* Check data sanity */ payload_size = message->size - sizeof(struct GNUNET_MessageHeader); @@ -629,9 +622,7 @@ handle_local_tunnel_create (void *cls, } /* Message sanity check */ - /* FIXME: two different checks, to know why it fails? */ - if(sizeof(struct GNUNET_MESH_TunnelMessage) != message->size || - GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE != message->type) { + if(sizeof(struct GNUNET_MESH_TunnelMessage) != ntohs(message->size)) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -639,7 +630,7 @@ handle_local_tunnel_create (void *cls, tunnel_msg = (struct GNUNET_MESH_TunnelMessage *) message; /* Sanity check for tunnel numbering */ - if(0 == (tunnel_msg->tunnel_id & 0x80000000)) { + if(0 == (ntohl(tunnel_msg->tunnel_id) & 0x80000000)) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h index 3ef0ec397a..a7ce515da4 100644 --- a/src/mesh/mesh.h +++ b/src/mesh/mesh.h @@ -39,7 +39,7 @@ * * API CALL (GNUNET_MESH_*) MESSAGE USED * ------------------------ ------------ - * connect GNUNET_MESH_Connect + * connect None (Header + [types]) * disconnect None (network level disconnect) * * tunnel_create GNUNET_MESH_TunnelMessage @@ -71,23 +71,6 @@ */ typedef uint32_t MESH_TunnelID; - -/** - * Message for connecting to the msh service. Specifies the messages the client - * is interested in. - */ -struct GNUNET_MESH_Connect { - /** - * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT - * Size: sizeof(struct GNUNET_MESH_Connect) + - * messages_subscribed * sizeof (message_type) - */ - struct GNUNET_MessageHeader header; - - /* GNUNET_MESH_ApplicationType messages_subscribed[] */ -}; - - /** * Message for a client to create and destroy tunnels. */ |