diff options
author | Bart Polot <bart@net.in.tum.de> | 2011-04-11 18:33:12 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2011-04-11 18:33:12 +0000 |
commit | 07880e1e1b81c800680175aac200ccaa5efbb94e (patch) | |
tree | 425b92a25066481855eae59401995427503427c4 /src/mesh | |
parent | 61c63cf390a7d467f43eb66d1dbee448d8679526 (diff) | |
download | gnunet-07880e1e1b81c800680175aac200ccaa5efbb94e.tar.gz gnunet-07880e1e1b81c800680175aac200ccaa5efbb94e.zip |
Unnecessary message eliminated, network byte conversion added
Diffstat (limited to 'src/mesh')
-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 0619dfdd6..9e0119b24 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, | |||
566 | { | 566 | { |
567 | struct Client *c; | 567 | struct Client *c; |
568 | unsigned int payload_size; | 568 | unsigned int payload_size; |
569 | // FIXME: is this needed? should we delete the GNUNET_MESH_Connect struct? | ||
570 | // struct GNUNET_MESH_Connect *connect_msg; | ||
571 | // | ||
572 | // connect_msg = (struct GNUNET_MESH_Connect *) message; | ||
573 | |||
574 | /* FIXME: is this a good idea? */ | ||
575 | GNUNET_assert(GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT == message->type); | ||
576 | 569 | ||
577 | /* Check data sanity */ | 570 | /* Check data sanity */ |
578 | payload_size = message->size - sizeof(struct GNUNET_MessageHeader); | 571 | payload_size = message->size - sizeof(struct GNUNET_MessageHeader); |
@@ -629,9 +622,7 @@ handle_local_tunnel_create (void *cls, | |||
629 | } | 622 | } |
630 | 623 | ||
631 | /* Message sanity check */ | 624 | /* Message sanity check */ |
632 | /* FIXME: two different checks, to know why it fails? */ | 625 | if(sizeof(struct GNUNET_MESH_TunnelMessage) != ntohs(message->size)) { |
633 | if(sizeof(struct GNUNET_MESH_TunnelMessage) != message->size || | ||
634 | GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE != message->type) { | ||
635 | GNUNET_break(0); | 626 | GNUNET_break(0); |
636 | GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); | 627 | GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); |
637 | return; | 628 | return; |
@@ -639,7 +630,7 @@ handle_local_tunnel_create (void *cls, | |||
639 | 630 | ||
640 | tunnel_msg = (struct GNUNET_MESH_TunnelMessage *) message; | 631 | tunnel_msg = (struct GNUNET_MESH_TunnelMessage *) message; |
641 | /* Sanity check for tunnel numbering */ | 632 | /* Sanity check for tunnel numbering */ |
642 | if(0 == (tunnel_msg->tunnel_id & 0x80000000)) { | 633 | if(0 == (ntohl(tunnel_msg->tunnel_id) & 0x80000000)) { |
643 | GNUNET_break(0); | 634 | GNUNET_break(0); |
644 | GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); | 635 | GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); |
645 | return; | 636 | return; |
diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h index 3ef0ec397..a7ce515da 100644 --- a/src/mesh/mesh.h +++ b/src/mesh/mesh.h | |||
@@ -39,7 +39,7 @@ | |||
39 | * | 39 | * |
40 | * API CALL (GNUNET_MESH_*) MESSAGE USED | 40 | * API CALL (GNUNET_MESH_*) MESSAGE USED |
41 | * ------------------------ ------------ | 41 | * ------------------------ ------------ |
42 | * connect GNUNET_MESH_Connect | 42 | * connect None (Header + [types]) |
43 | * disconnect None (network level disconnect) | 43 | * disconnect None (network level disconnect) |
44 | * | 44 | * |
45 | * tunnel_create GNUNET_MESH_TunnelMessage | 45 | * tunnel_create GNUNET_MESH_TunnelMessage |
@@ -71,23 +71,6 @@ | |||
71 | */ | 71 | */ |
72 | typedef uint32_t MESH_TunnelID; | 72 | typedef uint32_t MESH_TunnelID; |
73 | 73 | ||
74 | |||
75 | /** | ||
76 | * Message for connecting to the msh service. Specifies the messages the client | ||
77 | * is interested in. | ||
78 | */ | ||
79 | struct GNUNET_MESH_Connect { | ||
80 | /** | ||
81 | * Type: GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT | ||
82 | * Size: sizeof(struct GNUNET_MESH_Connect) + | ||
83 | * messages_subscribed * sizeof (message_type) | ||
84 | */ | ||
85 | struct GNUNET_MessageHeader header; | ||
86 | |||
87 | /* GNUNET_MESH_ApplicationType messages_subscribed[] */ | ||
88 | }; | ||
89 | |||
90 | |||
91 | /** | 74 | /** |
92 | * Message for a client to create and destroy tunnels. | 75 | * Message for a client to create and destroy tunnels. |
93 | */ | 76 | */ |