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

[gnunet]

Author: bartpolot
Date: 2011-04-11 20:33:12 +0200 (Mon, 11 Apr 2011)
New Revision: 14956

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/mesh.h
Log:
Unnecessary message eliminated, network byte conversion added


Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2011-04-11 12:44:39 UTC (rev 
14955)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2011-04-11 18:33:12 UTC (rev 
14956)
@@ -566,14 +566,7 @@
 {
     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);
     if (0 != payload_size % sizeof(GNUNET_MESH_ApplicationType)) {
@@ -629,9 +622,7 @@
     }
 
     /* 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 @@
 
     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;

Modified: gnunet/src/mesh/mesh.h
===================================================================
--- gnunet/src/mesh/mesh.h      2011-04-11 12:44:39 UTC (rev 14955)
+++ gnunet/src/mesh/mesh.h      2011-04-11 18:33:12 UTC (rev 14956)
@@ -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,24 +71,7 @@
  */
 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.
  */
 struct GNUNET_MESH_TunnelMessage {