diff options
Diffstat (limited to 'src/mesh/mesh_api.c')
| -rw-r--r-- | src/mesh/mesh_api.c | 998 |
1 files changed, 851 insertions, 147 deletions
diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c index de931db..be2ec27 100644 --- a/src/mesh/mesh_api.c +++ b/src/mesh/mesh_api.c @@ -21,12 +21,14 @@ * @author Bartlomiej Polot * * STRUCTURE: - * - CONSTANTS * - DATA STRUCTURES + * - DECLARATIONS * - AUXILIARY FUNCTIONS * - RECEIVE HANDLERS * - SEND FUNCTIONS * - API CALL DEFINITIONS + * + * TODO: add regex to reconnect */ #include "platform.h" #include "gnunet_common.h" @@ -39,6 +41,7 @@ #define LOG(kind,...) GNUNET_log_from (kind, "mesh-api",__VA_ARGS__) +#define DEBUG_ACK GNUNET_YES /******************************************************************************/ /************************ DATA STRUCTURES ****************************/ @@ -92,12 +95,6 @@ struct GNUNET_MESH_TransmitHandle GNUNET_SCHEDULER_TaskIdentifier timeout_task; /** - * Priority of the message. The queue is sorted by priority, - * control messages have the maximum priority (UINT32_MAX). - */ - uint32_t priority; - - /** * Target of the message, 0 for multicast. This field * is only valid if 'notify' is non-NULL. */ @@ -135,9 +132,13 @@ struct GNUNET_MESH_Handle const GNUNET_MESH_ApplicationType *applications; /** - * Double linked list of the tunnels this client is connected to. + * Double linked list of the tunnels this client is connected to, head. */ struct GNUNET_MESH_Tunnel *tunnels_head; + + /** + * Double linked list of the tunnels this client is connected to, tail. + */ struct GNUNET_MESH_Tunnel *tunnels_tail; /** @@ -161,18 +162,29 @@ struct GNUNET_MESH_Handle void *cls; /** - * Messages to send to the service + * Messages to send to the service, head. */ struct GNUNET_MESH_TransmitHandle *th_head; + + /** + * Messages to send to the service, tail. + */ struct GNUNET_MESH_TransmitHandle *th_tail; /** * tid of the next tunnel to create (to avoid reusing IDs often) */ MESH_TunnelNumber next_tid; + + /** + * Number of handlers in the handlers array. + */ unsigned int n_handlers; + + /** + * Number of applications in the applications array. + */ unsigned int n_applications; - unsigned int max_queue_size; /** * Have we started the task to receive messages from the service @@ -180,11 +192,6 @@ struct GNUNET_MESH_Handle */ int in_receive; - /** - * Number of packets queued - */ - unsigned int npackets; - /** * Configuration given by the client, in case of reconnection */ @@ -199,6 +206,41 @@ struct GNUNET_MESH_Handle * Task for trying to reconnect. */ GNUNET_SCHEDULER_TaskIdentifier reconnect_task; + + /** + * Monitor callback + */ + GNUNET_MESH_TunnelsCB tunnels_cb; + + /** + * Monitor callback closure. + */ + void *tunnels_cls; + + /** + * Tunnel callback. + */ + GNUNET_MESH_TunnelCB tunnel_cb; + + /** + * Tunnel callback closure. + */ + void *tunnel_cls; + + /** + * All the peer in the tunnel so far. + */ + struct GNUNET_PeerIdentity *peers; + + /** + * How many peers we have in this tunnel so far. + */ + unsigned int tunnel_npeers; + +#if DEBUG_ACK + unsigned int acks_sent; + unsigned int acks_recv; +#endif }; @@ -232,9 +274,13 @@ struct GNUNET_MESH_Tunnel { /** - * DLL + * DLL next */ struct GNUNET_MESH_Tunnel *next; + + /** + * DLL prev + */ struct GNUNET_MESH_Tunnel *prev; /** @@ -288,23 +334,118 @@ struct GNUNET_MESH_Tunnel unsigned int npeers; /** - * Number of packets queued in this tunnel + * Size of packet queued in this tunnel */ - unsigned int npackets; + unsigned int packet_size; /** * Number of applications requested this tunnel */ unsigned int napps; + /** + * Is the tunnel throttled to the slowest peer? + */ + int speed_min; + + /** + * Is the tunnel allowed to buffer? + */ + int buffering; + + /** + * Next packet ID to send. + */ + uint32_t next_send_pid; + + /** + * Maximum allowed PID to send (ACK recevied). + */ + uint32_t max_send_pid; + + /** + * Last pid received from the service. + */ + uint32_t last_recv_pid; + + /** + * Which ACK value have we last sent to the service? + */ + uint32_t max_recv_pid; }; /******************************************************************************/ +/*********************** DECLARATIONS *************************/ +/******************************************************************************/ + +/** + * Function called to send a message to the service. + * "buf" will be NULL and "size" zero if the socket was closed for writing in + * the meantime. + * + * @param cls closure, the mesh handle + * @param size number of bytes available in buf + * @param buf where the callee should write the connect message + * @return number of bytes written to buf + */ +static size_t +send_callback (void *cls, size_t size, void *buf); + + +/******************************************************************************/ /*********************** AUXILIARY FUNCTIONS *************************/ /******************************************************************************/ /** + * Check if transmission is a payload packet. + * + * @param th Transmission handle. + * + * @return GNUNET_YES if it is a payload packet, + * GNUNET_NO if it is a mesh management packet. + */ +static int +th_is_payload (struct GNUNET_MESH_TransmitHandle *th) +{ + return (th->notify != NULL) ? GNUNET_YES : GNUNET_NO; +} + + +/** + * Check whether there is any message ready in the queue and find the size. + * + * @param h Mesh handle. + * + * @return The size of the first ready message in the queue, + * 0 if there is none. + */ +static size_t +message_ready_size (struct GNUNET_MESH_Handle *h) +{ + struct GNUNET_MESH_TransmitHandle *th; + struct GNUNET_MESH_Tunnel *t; + + for (th = h->th_head; NULL != th; th = th->next) + { + t = th->tunnel; + if (GNUNET_NO == th_is_payload (th)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, " message internal\n"); + return th->size; + } + if (GNUNET_NO == GMC_is_pid_bigger(t->next_send_pid, t->max_send_pid)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, " message payload ok (%u <= %u)\n", + t->next_send_pid, t->max_send_pid); + return th->size; + } + } + return 0; +} + + +/** * Get the tunnel handler for the tunnel specified by id from the given handle * @param h Mesh handle * @param tid ID of the wanted tunnel @@ -354,6 +495,9 @@ create_tunnel (struct GNUNET_MESH_Handle *h, MESH_TunnelNumber tid) { t->tid = tid; } + t->max_send_pid = INITIAL_WINDOW_SIZE - 1; + t->last_recv_pid = (uint32_t) -1; + t->buffering = GNUNET_YES; return t; } @@ -379,6 +523,8 @@ destroy_tunnel (struct GNUNET_MESH_Tunnel *t, int call_cleaner) struct GNUNET_MESH_TransmitHandle *next; unsigned int i; + LOG (GNUNET_ERROR_TYPE_DEBUG, "destroy_tunnel %X\n", t->tid); + if (NULL == t) { GNUNET_break (0); @@ -411,7 +557,7 @@ destroy_tunnel (struct GNUNET_MESH_Tunnel *t, int call_cleaner) continue; /* Clients should have aborted their requests already. * Management traffic should be ok, as clients can't cancel that */ - GNUNET_break (NULL == th->notify); + GNUNET_break (GNUNET_NO == th_is_payload(th)); GNUNET_CONTAINER_DLL_remove (h->th_head, h->th_tail, th); /* clean up request */ @@ -422,7 +568,7 @@ destroy_tunnel (struct GNUNET_MESH_Tunnel *t, int call_cleaner) /* if there are no more pending requests with mesh service, cancel active request */ /* Note: this should be unnecessary... */ - if ( (NULL == h->th_head) && (NULL != h->th)) + if ((0 == message_ready_size (h)) && (NULL != h->th)) { GNUNET_CLIENT_notify_transmit_ready_cancel (h->th); h->th = NULL; @@ -512,6 +658,7 @@ remove_peer_from_tunnel (struct GNUNET_MESH_Peer *p) /** * Notify client that the transmission has timed out + * * @param cls closure * @param tc task context */ @@ -523,12 +670,13 @@ timeout_transmission (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) mesh = th->tunnel->mesh; GNUNET_CONTAINER_DLL_remove (mesh->th_head, mesh->th_tail, th); - if (th->notify != NULL) + th->tunnel->packet_size = 0; + if (GNUNET_YES == th_is_payload (th)) th->notify (th->notify_cls, 0, NULL); GNUNET_free (th); - if ((NULL == mesh->th_head) && (NULL != mesh->th)) + if ((0 == message_ready_size (mesh)) && (NULL != mesh->th)) { - /* queue empty, no point in asking for transmission */ + /* nothing ready to transmit, no point in asking for transmission */ GNUNET_CLIENT_notify_transmit_ready_cancel (mesh->th); mesh->th = NULL; } @@ -536,7 +684,7 @@ timeout_transmission (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** - * Add a transmit handle to the transmission queue by priority and set the + * Add a transmit handle to the transmission queue and set the * timeout if needed. * * @param h mesh handle with the queue head and tail @@ -546,16 +694,7 @@ static void add_to_queue (struct GNUNET_MESH_Handle *h, struct GNUNET_MESH_TransmitHandle *th) { - struct GNUNET_MESH_TransmitHandle *p; - - p = h->th_head; - while ((NULL != p) && (th->priority <= p->priority)) - p = p->next; - if (NULL == p) - p = h->th_tail; - else - p = p->prev; - GNUNET_CONTAINER_DLL_insert_after (h->th_head, h->th_tail, p, th); + GNUNET_CONTAINER_DLL_insert_tail (h->th_head, h->th_tail, th); if (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value == th->timeout.abs_value) return; th->timeout_task = @@ -580,6 +719,48 @@ send_packet (struct GNUNET_MESH_Handle *h, /** + * Send an ack on the tunnel to confirm the processing of a message. + * + * @param h Mesh handle. + * @param t Tunnel on which to send the ACK. + */ +static void +send_ack (struct GNUNET_MESH_Handle *h, struct GNUNET_MESH_Tunnel *t) +{ + struct GNUNET_MESH_LocalAck msg; + uint32_t delta; + + delta = t->max_recv_pid - t->last_recv_pid; + if (delta > ACK_THRESHOLD) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Not sending ACK on tunnel %X: ACK: %u, PID: %u, buffer %u\n", + t->tid, t->max_recv_pid, t->last_recv_pid, delta); + return; + } + if (GNUNET_YES == t->buffering) + t->max_recv_pid = t->last_recv_pid + INITIAL_WINDOW_SIZE; + else + t->max_recv_pid = t->last_recv_pid + 1; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Sending ACK on tunnel %X: %u\n", + t->tid, t->max_recv_pid); + msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK); + msg.header.size = htons (sizeof (msg)); + msg.tunnel_id = htonl (t->tid); + msg.max_pid = htonl (t->max_recv_pid); + +#if DEBUG_ACK + t->mesh->acks_sent++; +#endif + + send_packet (h, &msg.header, t); + return; +} + + + +/** * Reconnect callback: tries to reconnect again after a failer previous * reconnecttion * @param cls closure (mesh handle) @@ -620,11 +801,16 @@ send_connect (struct GNUNET_MESH_Handle *h) for (napps = 0; napps < h->n_applications; napps++) { apps[napps] = htonl (h->applications[napps]); - LOG (GNUNET_ERROR_TYPE_DEBUG, " app %u\n", h->applications[napps]); + LOG (GNUNET_ERROR_TYPE_DEBUG, " app %u\n", + h->applications[napps]); } types = (uint16_t *) & apps[napps]; for (ntypes = 0; ntypes < h->n_handlers; ntypes++) + { types[ntypes] = htons (h->message_handlers[ntypes].type); + LOG (GNUNET_ERROR_TYPE_DEBUG, " type %u\n", + h->message_handlers[ntypes].type); + } msg->applications = htons (napps); msg->types = htons (ntypes); LOG (GNUNET_ERROR_TYPE_DEBUG, @@ -652,8 +838,9 @@ do_reconnect (struct GNUNET_MESH_Handle *h) LOG (GNUNET_ERROR_TYPE_DEBUG, "*****************************\n"); LOG (GNUNET_ERROR_TYPE_DEBUG, "******* RECONNECT *******\n"); LOG (GNUNET_ERROR_TYPE_DEBUG, "*****************************\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, "******** on %p *******\n", h); + LOG (GNUNET_ERROR_TYPE_DEBUG, "*****************************\n"); - h->in_receive = GNUNET_NO; /* disconnect */ if (NULL != h->th) { @@ -675,8 +862,10 @@ do_reconnect (struct GNUNET_MESH_Handle *h) GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS, GNUNET_TIME_relative_multiply (h->reconnect_time, 2)); - LOG (GNUNET_ERROR_TYPE_DEBUG, " Next retry in %sms\n", - GNUNET_TIME_relative_to_string (h->reconnect_time)); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Next retry in %s\n", + GNUNET_STRINGS_relative_time_to_string (h->reconnect_time, + GNUNET_NO)); GNUNET_break (0); return GNUNET_NO; } @@ -699,6 +888,9 @@ do_reconnect (struct GNUNET_MESH_Handle *h) */ continue; } + t->next_send_pid = 0; + t->max_send_pid = INITIAL_WINDOW_SIZE - 1; + t->last_recv_pid = (uint32_t) -1; tmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE); tmsg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage)); tmsg.tunnel_id = htonl (t->tid); @@ -709,14 +901,13 @@ do_reconnect (struct GNUNET_MESH_Handle *h) pmsg.tunnel_id = htonl (t->tid); /* Reconnect all peers */ - for (i = 0; i < t->npeers; i++) + /* If the tunnel was "by type", dont connect individual peers */ + for (i = 0; i < t->npeers && 0 == t->napps; i++) { GNUNET_PEER_resolve (t->peers[i]->id, &pmsg.peer); if (NULL != t->disconnect_handler && t->peers[i]->connected) t->disconnect_handler (t->cls, &pmsg.peer); - /* If the tunnel was "by type", dont connect individual peers */ - if (0 == t->napps) - send_packet (t->mesh, &pmsg.header, t); + send_packet (t->mesh, &pmsg.header, t); } /* Reconnect all types, if any */ for (i = 0; i < t->napps; i++) @@ -729,6 +920,10 @@ do_reconnect (struct GNUNET_MESH_Handle *h) msg.type = htonl (t->apps[i]); send_packet (t->mesh, &msg.header, t); } + if (GNUNET_NO == t->buffering) + GNUNET_MESH_tunnel_buffer (t, GNUNET_NO); + if (GNUNET_YES == t->speed_min) + GNUNET_MESH_tunnel_speed_min (t); } return GNUNET_YES; } @@ -763,6 +958,7 @@ static void reconnect (struct GNUNET_MESH_Handle *h) { LOG (GNUNET_ERROR_TYPE_DEBUG, "Requested RECONNECT\n"); + h->in_receive = GNUNET_NO; if (GNUNET_SCHEDULER_NO_TASK == h->reconnect_task) h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->reconnect_time, &reconnect_cbk, h); @@ -787,6 +983,7 @@ process_tunnel_created (struct GNUNET_MESH_Handle *h, MESH_TunnelNumber tid; tid = ntohl (msg->tunnel_id); + LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating incoming tunnel %X\n", tid); if (tid < GNUNET_MESH_LOCAL_TUNNEL_ID_SERV) { GNUNET_break (0); @@ -807,10 +1004,17 @@ process_tunnel_created (struct GNUNET_MESH_Handle *h, GNUNET_PEER_change_rc (t->owner, 1); t->mesh = h; t->tid = tid; + if ((msg->opt & MESH_TUNNEL_OPT_NOBUFFER) != 0) + t->buffering = GNUNET_NO; + else + t->buffering = GNUNET_YES; + if ((msg->opt & MESH_TUNNEL_OPT_SPEED_MIN) != 0) + t->speed_min = GNUNET_YES; atsi.type = 0; atsi.value = 0; + LOG (GNUNET_ERROR_TYPE_DEBUG, " created tunnel %p\n", t); t->ctx = h->new_tunnel (h->cls, t, &msg->peer, &atsi); - LOG (GNUNET_ERROR_TYPE_DEBUG, "new incoming tunnel %X\n", t->tid); + LOG (GNUNET_ERROR_TYPE_DEBUG, "User notified\n"); } else { @@ -936,6 +1140,7 @@ process_incoming_data (struct GNUNET_MESH_Handle *h, struct GNUNET_MESH_ToOrigin *to_orig; struct GNUNET_MESH_Tunnel *t; unsigned int i; + uint32_t pid; uint16_t type; LOG (GNUNET_ERROR_TYPE_DEBUG, "Got a data message!\n"); @@ -948,7 +1153,8 @@ process_incoming_data (struct GNUNET_MESH_Handle *h, t = retrieve_tunnel (h, ntohl (ucast->tid)); payload = (struct GNUNET_MessageHeader *) &ucast[1]; peer = &ucast->oid; - LOG (GNUNET_ERROR_TYPE_DEBUG, " ucast on tunnel %s [%x]\n", + pid = ntohl (ucast->pid); + LOG (GNUNET_ERROR_TYPE_DEBUG, " ucast on tunnel %s [%X]\n", GNUNET_i2s (peer), ntohl (ucast->tid)); break; case GNUNET_MESSAGE_TYPE_MESH_MULTICAST: @@ -956,7 +1162,8 @@ process_incoming_data (struct GNUNET_MESH_Handle *h, t = retrieve_tunnel (h, ntohl (mcast->tid)); payload = (struct GNUNET_MessageHeader *) &mcast[1]; peer = &mcast->oid; - LOG (GNUNET_ERROR_TYPE_DEBUG, " mcast on tunnel %s [%x]\n", + pid = ntohl (mcast->pid); + LOG (GNUNET_ERROR_TYPE_DEBUG, " mcast on tunnel %s [%X]\n", GNUNET_i2s (peer), ntohl (mcast->tid)); break; case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN: @@ -964,19 +1171,34 @@ process_incoming_data (struct GNUNET_MESH_Handle *h, t = retrieve_tunnel (h, ntohl (to_orig->tid)); payload = (struct GNUNET_MessageHeader *) &to_orig[1]; peer = &to_orig->sender; - LOG (GNUNET_ERROR_TYPE_DEBUG, " torig on tunnel %s [%x]\n", + pid = ntohl (to_orig->pid); + LOG (GNUNET_ERROR_TYPE_DEBUG, " torig on tunnel %s [%X]\n", GNUNET_i2s (peer), ntohl (to_orig->tid)); break; default: GNUNET_break (0); return GNUNET_YES; } + LOG (GNUNET_ERROR_TYPE_DEBUG, " pid %u\n", pid); if (NULL == t) { - /* Tunnel was ignored, probably service didn't get it yet */ + /* Tunnel was ignored/destroyed, probably service didn't get it yet */ + LOG (GNUNET_ERROR_TYPE_DEBUG, " ignored!\n"); return GNUNET_YES; } + if (GNUNET_YES == + GMC_is_pid_bigger(pid, t->max_recv_pid)) + { + GNUNET_break (0); + LOG (GNUNET_ERROR_TYPE_WARNING, + " unauthorized message! (%u, max %u)\n", + pid, t->max_recv_pid); + // FIXME fc what now? accept? reject? + return GNUNET_YES; + } + t->last_recv_pid = pid; type = ntohs (payload->type); + send_ack (h, t); for (i = 0; i < h->n_handlers; i++) { handler = &h->message_handlers[i]; @@ -989,15 +1211,14 @@ process_incoming_data (struct GNUNET_MESH_Handle *h, if (GNUNET_OK != handler->callback (h->cls, t, &t->ctx, peer, payload, &atsi)) { - LOG (GNUNET_ERROR_TYPE_DEBUG, "MESH: callback caused disconnection\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, "callback caused disconnection\n"); GNUNET_MESH_disconnect (h); return GNUNET_NO; } else { LOG (GNUNET_ERROR_TYPE_DEBUG, - "MESH: callback completed successfully\n"); - + "callback completed successfully\n"); } } } @@ -1006,6 +1227,160 @@ process_incoming_data (struct GNUNET_MESH_Handle *h, /** + * Process a local ACK message, enabling the client to send + * more data to the service. + * + * @param h Mesh handle. + * @param message Message itself. + */ +static void +process_ack (struct GNUNET_MESH_Handle *h, + const struct GNUNET_MessageHeader *message) +{ + struct GNUNET_MESH_LocalAck *msg; + struct GNUNET_MESH_Tunnel *t; + uint32_t ack; + + LOG (GNUNET_ERROR_TYPE_DEBUG, "Got an ACK!\n"); + h->acks_recv++; + msg = (struct GNUNET_MESH_LocalAck *) message; + + t = retrieve_tunnel (h, ntohl (msg->tunnel_id)); + + if (NULL == t) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + "ACK on unknown tunnel %X\n", + ntohl (msg->tunnel_id)); + return; + } + ack = ntohl (msg->max_pid); + LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X, ack %u!\n", t->tid, ack); + if (GNUNET_YES == GMC_is_pid_bigger(ack, t->max_send_pid)) + t->max_send_pid = ack; + else + return; + if (NULL == h->th && 0 < t->packet_size) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, " tmt rdy was NULL, requesting!\n", t->tid, ack); + h->th = + GNUNET_CLIENT_notify_transmit_ready (h->client, t->packet_size, + GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_YES, &send_callback, h); + } +} + + +/** + * Process a local reply about info on all tunnels, pass info to the user. + * + * @param h Mesh handle. + * @param message Message itself. + */ +static void +process_get_tunnels (struct GNUNET_MESH_Handle *h, + const struct GNUNET_MessageHeader *message) +{ + struct GNUNET_MESH_LocalMonitor *msg; + uint32_t npeers; + + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Get Tunnels messasge received\n"); + + if (NULL == h->tunnels_cb) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, " ignored\n"); + return; + } + + msg = (struct GNUNET_MESH_LocalMonitor *) message; + npeers = ntohl (msg->npeers); + if (ntohs (message->size) != + (sizeof (struct GNUNET_MESH_LocalMonitor) + + npeers * sizeof (struct GNUNET_PeerIdentity))) + { + GNUNET_break_op (0); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Get tunnels message: size %hu - expected %u (%u peers)\n", + ntohs (message->size), + sizeof (struct GNUNET_MESH_LocalMonitor) + + npeers * sizeof (struct GNUNET_PeerIdentity), + npeers); + return; + } + h->tunnels_cb (h->tunnels_cls, + &msg->owner, + ntohl (msg->tunnel_id), + (struct GNUNET_PeerIdentity *) &msg[1], + npeers); +} + + + +/** + * Process a local monitor_tunnel reply, pass info to the user. + * + * @param h Mesh handle. + * @param message Message itself. + */ +static void +process_show_tunnel (struct GNUNET_MESH_Handle *h, + const struct GNUNET_MessageHeader *message) +{ + struct GNUNET_MESH_LocalMonitor *msg; + struct GNUNET_PeerIdentity *new_peers; + uint32_t *new_parents; + size_t esize; + uint32_t npeers; + unsigned int i; + + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Show Tunnel messasge received\n"); + + if (NULL == h->tunnel_cb) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, " ignored\n"); + return; + } + + /* Verify message sanity */ + msg = (struct GNUNET_MESH_LocalMonitor *) message; + npeers = ntohl (msg->npeers); + esize = sizeof (struct GNUNET_MESH_LocalMonitor); + esize += npeers * (sizeof (struct GNUNET_PeerIdentity) + sizeof (uint32_t)); + if (ntohs (message->size) != esize) + { + GNUNET_break_op (0); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Show tunnel message: size %hu - expected %u (%u peers)\n", + ntohs (message->size), + esize, + npeers); + + h->tunnel_cb (h->tunnel_cls, NULL, NULL); + h->tunnel_cb = NULL; + h->tunnel_cls = NULL; + h->tunnel_npeers = 0; + GNUNET_free_non_null (h->peers); + h->peers = NULL; + + return; + } + + new_peers = (struct GNUNET_PeerIdentity *) &msg[1]; + new_parents = (uint32_t *) &new_peers[npeers]; + + h->peers = GNUNET_realloc (h->peers, h->tunnel_npeers + npeers); + memcpy (&h->peers[h->tunnel_npeers], + new_peers, + npeers * sizeof (struct GNUNET_PeerIdentity)); + h->tunnel_npeers += npeers; + for (i = 0; i < npeers; i++) + h->tunnel_cb (h->tunnel_cls, + &new_peers[i], + &h->peers[new_parents[i]]); +} + + +/** * Function to process all messages received from the service * * @param cls closure @@ -1018,12 +1393,15 @@ msg_received (void *cls, const struct GNUNET_MessageHeader *msg) if (msg == NULL) { - LOG (GNUNET_ERROR_TYPE_DEBUG, "Received NULL msg\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Mesh service disconnected, reconnecting\n", h); reconnect (h); return; } - LOG (GNUNET_ERROR_TYPE_DEBUG, "received a message type %hu from MESH\n", - ntohs (msg->type)); + LOG (GNUNET_ERROR_TYPE_DEBUG, "\n", + GNUNET_MESH_DEBUG_M2S (ntohs (msg->type))); + LOG (GNUNET_ERROR_TYPE_DEBUG, "Received a message: %s\n", + GNUNET_MESH_DEBUG_M2S (ntohs (msg->type))); switch (ntohs (msg->type)) { /* Notify of a new incoming tunnel */ @@ -1046,15 +1424,32 @@ msg_received (void *cls, const struct GNUNET_MessageHeader *msg) if (GNUNET_NO == process_incoming_data (h, msg)) return; break; - /* We shouldn't get any other packages, log and ignore */ + case GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK: + process_ack (h, msg); + break; + case GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS: + process_get_tunnels (h, msg); + break; + case GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL: + process_show_tunnel (h, msg); + break; default: + /* We shouldn't get any other packages, log and ignore */ LOG (GNUNET_ERROR_TYPE_WARNING, - "MESH: unsolicited message form service (type %d)\n", - ntohs (msg->type)); + "unsolicited message form service (type %s)\n", + GNUNET_MESH_DEBUG_M2S (ntohs (msg->type))); } LOG (GNUNET_ERROR_TYPE_DEBUG, "message processed\n"); - GNUNET_CLIENT_receive (h->client, &msg_received, h, - GNUNET_TIME_UNIT_FOREVER_REL); + if (GNUNET_YES == h->in_receive) + { + GNUNET_CLIENT_receive (h->client, &msg_received, h, + GNUNET_TIME_UNIT_FOREVER_REL); + } + else + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "in receive off, not calling CLIENT_receive\n"); + } } @@ -1077,24 +1472,39 @@ send_callback (void *cls, size_t size, void *buf) { struct GNUNET_MESH_Handle *h = cls; struct GNUNET_MESH_TransmitHandle *th; + struct GNUNET_MESH_TransmitHandle *next; + struct GNUNET_MESH_Tunnel *t; char *cbuf = buf; size_t tsize; size_t psize; + size_t nsize; + LOG (GNUNET_ERROR_TYPE_DEBUG, "\n"); LOG (GNUNET_ERROR_TYPE_DEBUG, "Send packet() Buffer %u\n", size); - h->th = NULL; if ((0 == size) || (NULL == buf)) { - LOG (GNUNET_ERROR_TYPE_DEBUG, "Received NULL callback\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, "Received NULL send callback on %p\n", h); reconnect (h); + h->th = NULL; return 0; } tsize = 0; - while ((NULL != (th = h->th_head)) && (size >= th->size)) + next = h->th_head; + nsize = message_ready_size (h); + while ((NULL != (th = next)) && (0 < nsize) && (size >= nsize)) { - if (NULL != th->notify) + t = th->tunnel; + if (GNUNET_YES == th_is_payload (th)) { - if (th->tunnel->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV) + LOG (GNUNET_ERROR_TYPE_DEBUG, " payload\n"); + if (GNUNET_YES == GMC_is_pid_bigger(t->next_send_pid, t->max_send_pid)) + { + /* This tunnel is not ready to transmit yet, try next message */ + next = th->next; + continue; + } + t->packet_size = 0; + if (t->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV) { /* traffic to origin */ struct GNUNET_MESH_ToOrigin to; @@ -1103,15 +1513,17 @@ send_callback (void *cls, size_t size, void *buf) GNUNET_assert (size >= th->size); mh = (struct GNUNET_MessageHeader *) &cbuf[sizeof (to)]; psize = th->notify (th->notify_cls, size - sizeof (to), mh); - LOG (GNUNET_ERROR_TYPE_DEBUG, " to origin, type %u\n", - ntohs (mh->type)); + LOG (GNUNET_ERROR_TYPE_DEBUG, " to origin, type %s\n", + GNUNET_MESH_DEBUG_M2S (ntohs (mh->type))); if (psize > 0) { psize += sizeof (to); GNUNET_assert (size >= psize); to.header.size = htons (psize); to.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN); - to.tid = htonl (th->tunnel->tid); + to.tid = htonl (t->tid); + to.pid = htonl (t->next_send_pid); + to.ttl = 0; memset (&to.oid, 0, sizeof (struct GNUNET_PeerIdentity)); memset (&to.sender, 0, sizeof (struct GNUNET_PeerIdentity)); memcpy (cbuf, &to, sizeof (to)); @@ -1126,16 +1538,16 @@ send_callback (void *cls, size_t size, void *buf) GNUNET_assert (size >= th->size); mh = (struct GNUNET_MessageHeader *) &cbuf[sizeof (mc)]; psize = th->notify (th->notify_cls, size - sizeof (mc), mh); - LOG (GNUNET_ERROR_TYPE_DEBUG, " multicast, type %u\n", - ntohs (mh->type)); + LOG (GNUNET_ERROR_TYPE_DEBUG, " multicast, type %s\n", + GNUNET_MESH_DEBUG_M2S (ntohs (mh->type))); if (psize > 0) { psize += sizeof (mc); GNUNET_assert (size >= psize); mc.header.size = htons (psize); mc.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_MULTICAST); - mc.tid = htonl (th->tunnel->tid); - mc.mid = 0; + mc.tid = htonl (t->tid); + mc.pid = htonl (t->next_send_pid); mc.ttl = 0; memset (&mc.oid, 0, sizeof (struct GNUNET_PeerIdentity)); memcpy (cbuf, &mc, sizeof (mc)); @@ -1150,56 +1562,69 @@ send_callback (void *cls, size_t size, void *buf) GNUNET_assert (size >= th->size); mh = (struct GNUNET_MessageHeader *) &cbuf[sizeof (uc)]; psize = th->notify (th->notify_cls, size - sizeof (uc), mh); - LOG (GNUNET_ERROR_TYPE_DEBUG, " unicast, type %u\n", - ntohs (mh->type)); + LOG (GNUNET_ERROR_TYPE_DEBUG, " unicast, type %s\n", + GNUNET_MESH_DEBUG_M2S (ntohs (mh->type))); if (psize > 0) { psize += sizeof (uc); GNUNET_assert (size >= psize); uc.header.size = htons (psize); uc.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_UNICAST); - uc.tid = htonl (th->tunnel->tid); + uc.tid = htonl (t->tid); + uc.pid = htonl (t->next_send_pid); + uc.ttl = 0; memset (&uc.oid, 0, sizeof (struct GNUNET_PeerIdentity)); GNUNET_PEER_resolve (th->target, &uc.destination); memcpy (cbuf, &uc, sizeof (uc)); } } + t->next_send_pid++; } else { + struct GNUNET_MessageHeader *mh = (struct GNUNET_MessageHeader *) &th[1]; + + LOG (GNUNET_ERROR_TYPE_DEBUG, " mesh traffic, type %s\n", + GNUNET_MESH_DEBUG_M2S (ntohs (mh->type))); memcpy (cbuf, &th[1], th->size); psize = th->size; } if (th->timeout_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (th->timeout_task); - if (NULL != th->notify) - { - th->tunnel->mesh->npackets--; - th->tunnel->npackets--; - } GNUNET_CONTAINER_DLL_remove (h->th_head, h->th_tail, th); GNUNET_free (th); + next = h->th_head; + nsize = message_ready_size (h); cbuf += psize; size -= psize; tsize += psize; } LOG (GNUNET_ERROR_TYPE_DEBUG, " total size: %u\n", tsize); - if (NULL != (th = h->th_head)) + h->th = NULL; + size = message_ready_size (h); + if (0 != size) { - LOG (GNUNET_ERROR_TYPE_DEBUG, " next size: %u\n", th->size); - if (NULL == h->th) - h->th = - GNUNET_CLIENT_notify_transmit_ready (h->client, th->size, - GNUNET_TIME_UNIT_FOREVER_REL, - GNUNET_YES, &send_callback, h); + LOG (GNUNET_ERROR_TYPE_DEBUG, " next size: %u\n", size); + h->th = + GNUNET_CLIENT_notify_transmit_ready (h->client, size, + GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_YES, &send_callback, h); + } + else + { + if (NULL != h->th_head) + LOG (GNUNET_ERROR_TYPE_DEBUG, " can't transmit any more\n"); + else + LOG (GNUNET_ERROR_TYPE_DEBUG, " nothing left to transmit\n"); } - LOG (GNUNET_ERROR_TYPE_DEBUG, "Send packet() END\n"); if (GNUNET_NO == h->in_receive) { + LOG (GNUNET_ERROR_TYPE_DEBUG, " start receiving from service\n"); h->in_receive = GNUNET_YES; GNUNET_CLIENT_receive (h->client, &msg_received, h, GNUNET_TIME_UNIT_FOREVER_REL); } + LOG (GNUNET_ERROR_TYPE_DEBUG, "Send packet() END\n"); return tsize; } @@ -1221,16 +1646,19 @@ send_packet (struct GNUNET_MESH_Handle *h, struct GNUNET_MESH_TransmitHandle *th; size_t msize; + LOG (GNUNET_ERROR_TYPE_DEBUG, " Sending message to service: %s\n", + GNUNET_MESH_DEBUG_M2S(ntohs(msg->type))); msize = ntohs (msg->size); th = GNUNET_malloc (sizeof (struct GNUNET_MESH_TransmitHandle) + msize); - th->priority = UINT32_MAX; th->timeout = GNUNET_TIME_UNIT_FOREVER_ABS; th->size = msize; th->tunnel = tunnel; memcpy (&th[1], msg, msize); add_to_queue (h, th); + LOG (GNUNET_ERROR_TYPE_DEBUG, " queued\n"); if (NULL != h->th) return; + LOG (GNUNET_ERROR_TYPE_DEBUG, " calling ntfy tmt rdy for %u bytes\n", msize); h->th = GNUNET_CLIENT_notify_transmit_ready (h->client, msize, GNUNET_TIME_UNIT_FOREVER_REL, @@ -1246,9 +1674,6 @@ send_packet (struct GNUNET_MESH_Handle *h, * Connect to the mesh service. * * @param cfg configuration to use - * @param queue_size size of the data message queue, shared among all tunnels - * (each tunnel is guaranteed to accept at least one message, - * no matter what is the status of other tunnels) * @param cls closure for the various callbacks that follow * (including handlers in the handlers array) * @param new_tunnel function called when an *inbound* tunnel is created @@ -1264,8 +1689,7 @@ send_packet (struct GNUNET_MESH_Handle *h, * (in this case, init is never called) */ struct GNUNET_MESH_Handle * -GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, - unsigned int queue_size, void *cls, +GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls, GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel, GNUNET_MESH_TunnelEndHandler cleaner, const struct GNUNET_MESH_MessageHandler *handlers, @@ -1275,8 +1699,8 @@ GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, LOG (GNUNET_ERROR_TYPE_DEBUG, "GNUNET_MESH_connect()\n"); h = GNUNET_malloc (sizeof (struct GNUNET_MESH_Handle)); + LOG (GNUNET_ERROR_TYPE_DEBUG, " addr %p\n", h); h->cfg = cfg; - h->max_queue_size = queue_size; h->new_tunnel = new_tunnel; h->cleaner = cleaner; h->client = GNUNET_CLIENT_connect ("mesh", cfg); @@ -1295,8 +1719,12 @@ GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; /* count handlers and apps, calculate size */ - for (h->n_applications = 0; stypes[h->n_applications]; h->n_applications++) ; - for (h->n_handlers = 0; handlers[h->n_handlers].type; h->n_handlers++) ; + for (h->n_applications = 0; + stypes && stypes[h->n_applications]; + h->n_a |