X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Fmesh_api.c;h=6bdc2569508af09c37876b2aabb46e988428d5cf;hb=5d74fb965c6d619c323789da837e05a4b9c5def4;hp=5860e5d4d7e535621f91aea830d5e8a18a194d65;hpb=faa17141d0805c6b768255d0c31b011e1fa2665b;p=oweals%2Fgnunet.git diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c index 5860e5d4d..6bdc25695 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" @@ -91,12 +93,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 +131,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 +161,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 +191,6 @@ struct GNUNET_MESH_Handle */ int in_receive; - /** - * Number of packets queued - */ - unsigned int npackets; - /** * Configuration given by the client, in case of reconnection */ @@ -232,9 +238,13 @@ struct GNUNET_MESH_Tunnel { /** - * DLL + * DLL next */ struct GNUNET_MESH_Tunnel *next; + + /** + * DLL prev + */ struct GNUNET_MESH_Tunnel *prev; /** @@ -288,22 +298,101 @@ 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 PID. + */ + uint32_t pid; + + /** + * Maximum allowed PID. + */ + uint32_t max_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) || + (t->max_pid > t->pid || PID_OVERFLOW (t->pid, t->max_pid))) + return th->size; + } + return 0; +} + + /** * Get the tunnel handler for the tunnel specified by id from the given handle * @param h Mesh handle @@ -354,6 +443,7 @@ create_tunnel (struct GNUNET_MESH_Handle *h, MESH_TunnelNumber tid) { t->tid = tid; } + t->max_pid = 1; return t; } @@ -413,7 +503,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 */ @@ -424,7 +514,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; @@ -514,6 +604,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 */ @@ -525,12 +616,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; } @@ -551,7 +643,7 @@ add_to_queue (struct GNUNET_MESH_Handle *h, struct GNUNET_MESH_TransmitHandle *p; p = h->th_head; - while ((NULL != p) && (th->priority <= p->priority)) + while ((NULL != p)) p = p->next; if (NULL == p) p = h->th_tail; @@ -581,6 +673,28 @@ send_packet (struct GNUNET_MESH_Handle *h, struct GNUNET_MESH_Tunnel *tunnel); +/** + * 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; + + 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 = t->pid + 1; + + send_packet (h, &msg.header, t); + return; +} + + + /** * Reconnect callback: tries to reconnect again after a failer previous * reconnecttion @@ -654,8 +768,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) { @@ -711,14 +826,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++) @@ -731,6 +845,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; } @@ -765,6 +883,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); @@ -991,15 +1110,15 @@ 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"); + send_ack (h, t); } } } @@ -1007,6 +1126,50 @@ 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"); + 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 (ack > t->max_pid || PID_OVERFLOW (t->max_pid, ack)) + t->max_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); + } +} + + /** * Function to process all messages received from the service * @@ -1020,12 +1183,12 @@ 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_WARNING, "Received NULL msg on %p\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, "received a message type %s from MESH\n", + GNUNET_MESH_DEBUG_M2S (ntohs (msg->type))); switch (ntohs (msg->type)) { /* Notify of a new incoming tunnel */ @@ -1048,15 +1211,26 @@ 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; default: + /* We shouldn't get any other packages, log and ignore */ LOG (GNUNET_ERROR_TYPE_WARNING, - "MESH: unsolicited message form service (type %d)\n", + "unsolicited message form service (type %hu)\n", 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"); + } } @@ -1079,24 +1253,36 @@ 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; 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; + while ((NULL != (th = next)) && (size >= th->size)) { - 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 (t->max_pid < t->pid && GNUNET_NO == PID_OVERFLOW (t->pid, t->max_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; @@ -1105,15 +1291,16 @@ 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); + // FIXME pid? memset (&to.oid, 0, sizeof (struct GNUNET_PeerIdentity)); memset (&to.sender, 0, sizeof (struct GNUNET_PeerIdentity)); memcpy (cbuf, &to, sizeof (to)); @@ -1128,16 +1315,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->pid); mc.ttl = 0; memset (&mc.oid, 0, sizeof (struct GNUNET_PeerIdentity)); memcpy (cbuf, &mc, sizeof (mc)); @@ -1152,59 +1339,64 @@ 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->pid); memset (&uc.oid, 0, sizeof (struct GNUNET_PeerIdentity)); GNUNET_PEER_resolve (th->target, &uc.destination); memcpy (cbuf, &uc, sizeof (uc)); } } + t->pid++; } else { struct GNUNET_MessageHeader *mh = (struct GNUNET_MessageHeader *) &th[1]; - LOG (GNUNET_ERROR_TYPE_DEBUG, " mesh traffic, type %u\n", - ntohs (mh->type)); + + 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; 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 + { + 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; } @@ -1228,7 +1420,6 @@ send_packet (struct GNUNET_MESH_Handle *h, 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; @@ -1251,9 +1442,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 @@ -1269,8 +1457,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, @@ -1280,8 +1467,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); @@ -1344,8 +1531,7 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle) /* Make sure it is an allowed packet (everything else should have been * already canceled). */ - GNUNET_break (UINT32_MAX == th->priority); - GNUNET_break (NULL == th->notify); + GNUNET_break (GNUNET_NO == th_is_payload (th)); msg = (struct GNUNET_MessageHeader *) &th[1]; switch (ntohs(msg->type)) { @@ -1384,6 +1570,10 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle) /** * Announce to ther peer the availability of services described by the regex, * in order to be reachable to other peers via connect_by_string. + * + * Note that the first 8 characters are considered to be part of a prefix, + * (for instance 'gnunet://'). If you put a variable part in there (*, +. ()), + * all matching strings will be stored in the DHT. * * @param h handle to mesh. * @param regex string with the regular expression describing local services. @@ -1393,8 +1583,23 @@ GNUNET_MESH_announce_regex (struct GNUNET_MESH_Handle *h, const char *regex) { struct GNUNET_MessageHeader *msg; - - msg = GNUNET_malloc + size_t len; + size_t msgsize; + + len = strlen (regex); + msgsize = sizeof(struct GNUNET_MessageHeader) + len; + GNUNET_assert (UINT16_MAX > msgsize); + + { + char buffer[msgsize]; + + msg = (struct GNUNET_MessageHeader *) buffer; + msg->size = htons (msgsize); + msg->type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ANNOUNCE_REGEX); + memcpy (&msg[1], regex, len); + + send_packet(h, msg, NULL); + } } /** @@ -1457,7 +1662,7 @@ GNUNET_MESH_tunnel_destroy (struct GNUNET_MESH_Tunnel *tunnel) { aux = th->next; /* FIXME call the handler? */ - if (NULL != th->notify) + if (GNUNET_YES == th_is_payload (th)) th->notify (th->notify_cls, 0, NULL); GNUNET_CONTAINER_DLL_remove (h->th_head, h->th_tail, th); GNUNET_free (th); @@ -1471,6 +1676,76 @@ GNUNET_MESH_tunnel_destroy (struct GNUNET_MESH_Tunnel *tunnel) send_packet (h, &msg.header, NULL); } +/** + * Request that the tunnel data rate is limited to the speed of the slowest + * receiver. + * + * @param tunnel Tunnel affected. + */ +void +GNUNET_MESH_tunnel_speed_min (struct GNUNET_MESH_Tunnel *tunnel) +{ + struct GNUNET_MESH_TunnelMessage msg; + struct GNUNET_MESH_Handle *h; + + h = tunnel->mesh; + tunnel->speed_min = GNUNET_YES; + + msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_MIN); + msg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage)); + msg.tunnel_id = htonl (tunnel->tid); + + send_packet (h, &msg.header, NULL); +} + + +/** + * Request that the tunnel data rate is limited to the speed of the fastest + * receiver. This is the default behavior. + * + * @param tunnel Tunnel affected. + */ +void +GNUNET_MESH_tunnel_speed_max (struct GNUNET_MESH_Tunnel *tunnel) +{ + struct GNUNET_MESH_TunnelMessage msg; + struct GNUNET_MESH_Handle *h; + + h = tunnel->mesh; + tunnel->speed_min = GNUNET_NO; + + msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_MAX); + msg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage)); + msg.tunnel_id = htonl (tunnel->tid); + + send_packet (h, &msg.header, NULL); +} + +/** + * Turn on/off the buffering status of the tunnel. + * + * @param tunnel Tunnel affected. + * @param buffer GNUNET_YES to turn buffering on (default), + * GNUNET_NO otherwise. + */ +void +GNUNET_MESH_tunnel_buffer (struct GNUNET_MESH_Tunnel *tunnel, int buffer) +{ + struct GNUNET_MESH_TunnelMessage msg; + struct GNUNET_MESH_Handle *h; + + h = tunnel->mesh; + tunnel->buffering = buffer; + + if (GNUNET_YES == buffer) + msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_BUFFER); + else + msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_NOBUFFER); + msg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage)); + msg.tunnel_id = htonl (tunnel->tid); + + send_packet (h, &msg.header, NULL); +} /** * Request that a peer should be added to the tunnel. The existing @@ -1585,6 +1860,8 @@ GNUNET_MESH_peer_request_connect_by_type (struct GNUNET_MESH_Tunnel *tunnel, /** * Request that the mesh should try to connect to a peer matching the * description given in the service string. + * + * FIXME: allow multiple? how to deal with reconnect? * * @param tunnel handle to existing tunnel * @param description string describing the destination node requirements @@ -1593,20 +1870,24 @@ void GNUNET_MESH_peer_request_connect_by_string (struct GNUNET_MESH_Tunnel *tunnel, const char *description) { - struct GNUNET_MESH_ConnectPeerByString *msg; + struct GNUNET_MESH_ConnectPeerByString *m; size_t len; size_t msgsize; - len = strlen(description); + len = strlen (description); msgsize = sizeof(struct GNUNET_MESH_ConnectPeerByString) + len; GNUNET_assert (UINT16_MAX > msgsize); - msg = GNUNET_malloc (msgsize); - msg->header.size = htons (msgsize); - msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD_BY_STRING); - msg->tunnel_id = htonl (tunnel->tid); - memcpy(&msg[1], description, len); + { + char buffer[msgsize]; - send_packet (tunnel->mesh, &msg->header, tunnel); + m = (struct GNUNET_MESH_ConnectPeerByString *) buffer; + m->header.size = htons (msgsize); + m->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD_BY_STRING); + m->tunnel_id = htonl (tunnel->tid); + memcpy(&m[1], description, len); + + send_packet (tunnel->mesh, &m->header, tunnel); + } } @@ -1661,15 +1942,14 @@ GNUNET_MESH_peer_unblacklist (struct GNUNET_MESH_Tunnel *tunnel, /** * Ask the mesh to call "notify" once it is ready to transmit the - * given number of bytes to the specified "target". If we are not yet - * connected to the specified peer, a call to this function will cause - * us to try to establish a connection. + * given number of bytes to the specified tunnel or target. + * Only one call can be active at any time, to issue another request, + * wait for the callback or cancel the current request. * * @param tunnel tunnel to use for transmission * @param cork is corking allowed for this transmission? - * @param priority how important is the message? * @param maxdelay how long can the message wait? - * @param target destination for the message, + * @param target destination for the message * NULL for multicast to all tunnel targets * @param notify_size how many bytes of buffer space does notify want? * @param notify function to call when buffer space is available; @@ -1683,7 +1963,6 @@ GNUNET_MESH_peer_unblacklist (struct GNUNET_MESH_Tunnel *tunnel, */ struct GNUNET_MESH_TransmitHandle * GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Tunnel *tunnel, int cork, - uint32_t priority, struct GNUNET_TIME_Relative maxdelay, const struct GNUNET_PeerIdentity *target, size_t notify_size, @@ -1691,8 +1970,6 @@ GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Tunnel *tunnel, int cork, void *notify_cls) { struct GNUNET_MESH_TransmitHandle *th; - struct GNUNET_MESH_TransmitHandle *least_priority_th; - uint32_t least_priority; size_t overhead; GNUNET_assert (NULL != tunnel); @@ -1701,43 +1978,11 @@ GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Tunnel *tunnel, int cork, LOG (GNUNET_ERROR_TYPE_DEBUG, " target %s\n", GNUNET_i2s (target)); else LOG (GNUNET_ERROR_TYPE_DEBUG, " target multicast\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, " payload size %u\n", notify_size); GNUNET_assert (NULL != notify); - if (tunnel->mesh->npackets >= tunnel->mesh->max_queue_size && - tunnel->npackets > 0) - { - /* queue full */ - if (0 == priority) - return NULL; - th = tunnel->mesh->th_tail; - least_priority = priority; - least_priority_th = NULL; - while (NULL != th) - { - if (th->priority < least_priority && th->tunnel->npackets > 1) - { - least_priority_th = th; - least_priority = th->priority; - } - th = th->prev; - } - if (NULL == least_priority_th) - return NULL; - /* Can't be a control message */ - GNUNET_assert (NULL != least_priority_th->notify); - least_priority_th->notify (notify_cls, 0, NULL); - least_priority_th->tunnel->npackets--; - tunnel->mesh->npackets--; - GNUNET_CONTAINER_DLL_remove (tunnel->mesh->th_head, tunnel->mesh->th_tail, - least_priority_th); - if (GNUNET_SCHEDULER_NO_TASK != least_priority_th->timeout_task) - GNUNET_SCHEDULER_cancel (least_priority_th->timeout_task); - GNUNET_free (least_priority_th); - } - tunnel->npackets++; - tunnel->mesh->npackets++; + GNUNET_assert (0 == tunnel->packet_size); // Only one data packet allowed th = GNUNET_malloc (sizeof (struct GNUNET_MESH_TransmitHandle)); th->tunnel = tunnel; - th->priority = priority; th->timeout = GNUNET_TIME_relative_to_absolute (maxdelay); th->target = GNUNET_PEER_intern (target); if (tunnel->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV) @@ -1746,12 +1991,17 @@ GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Tunnel *tunnel, int cork, overhead = sizeof (struct GNUNET_MESH_Multicast); else overhead = sizeof (struct GNUNET_MESH_Unicast); - th->size = notify_size + overhead; + tunnel->packet_size = th->size = notify_size + overhead; + LOG (GNUNET_ERROR_TYPE_DEBUG, " total size %u\n", th->size); th->notify = notify; th->notify_cls = notify_cls; add_to_queue (tunnel->mesh, th); if (NULL != tunnel->mesh->th) return th; + if (GNUNET_NO == PID_OVERFLOW(tunnel->pid, tunnel->max_pid) && + tunnel->max_pid <= tunnel->pid) + return th; + LOG (GNUNET_ERROR_TYPE_DEBUG, " call notify tmt rdy\n"); tunnel->mesh->th = GNUNET_CLIENT_notify_transmit_ready (tunnel->mesh->client, th->size, GNUNET_TIME_UNIT_FOREVER_REL, @@ -1771,12 +2021,13 @@ GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle *th) { struct GNUNET_MESH_Handle *mesh; + th->tunnel->packet_size = 0; mesh = th->tunnel->mesh; if (th->timeout_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (th->timeout_task); GNUNET_CONTAINER_DLL_remove (mesh->th_head, mesh->th_tail, th); 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 */ GNUNET_CLIENT_notify_transmit_ready_cancel (mesh->th);