#define LOG(kind,...) GNUNET_log_from (kind, "mesh-api",__VA_ARGS__)
+#define DEBUG_ACK GNUNET_YES
/******************************************************************************/
/************************ DATA STRUCTURES ****************************/
* 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
};
* 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;
};
{
t->tid = tid;
}
- t->max_send_pid = 0;
+ t->max_send_pid = INITIAL_WINDOW_SIZE - 1;
t->last_recv_pid = (uint32_t) -1;
+ t->buffering = GNUNET_YES;
return t;
}
/**
- * 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
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))
- 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 =
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->last_recv_pid + 1);
+ 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->last_recv_pid + 1);
+ msg.max_pid = htonl (t->max_recv_pid);
+
+#if DEBUG_ACK
+ t->mesh->acks_sent++;
+#endif
send_packet (h, &msg.header, t);
return;
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;
}
continue;
}
t->next_send_pid = 0;
- t->max_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));
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);
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 (GMC_is_pid_bigger(pid, t->last_recv_pid + 1))
+ if (GNUNET_YES ==
+ GMC_is_pid_bigger(pid, t->max_recv_pid))
{
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_WARNING, " unauthorized message!\n");
+ 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];
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"callback completed successfully\n");
- send_ack (h, 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));
}
ack = ntohl (msg->max_pid);
LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X, ack %u!\n", t->tid, ack);
- if (ack > t->max_send_pid || PID_OVERFLOW (t->max_send_pid, ack))
+ if (GNUNET_YES == GMC_is_pid_bigger(ack, t->max_send_pid))
t->max_send_pid = ack;
else
return;
}
+/**
+ * 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
*
if (msg == NULL)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Received NULL msg on %p\n", h);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Mesh service disconnected, reconnecting\n", h);
reconnect (h);
return;
}
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,
- "unsolicited message form service (type %hu)\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");
if (GNUNET_YES == h->in_receive)
to.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
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));
uc.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_UNICAST);
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));
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_applications++) ;
+ for (h->n_handlers = 0;
+ handlers && handlers[h->n_handlers].type;
+ h->n_handlers++) ;
send_connect (h);
LOG (GNUNET_ERROR_TYPE_DEBUG, "GNUNET_MESH_connect() END\n");
return h;
LOG (GNUNET_ERROR_TYPE_DEBUG, "MESH DISCONNECT\n");
+#if DEBUG_ACK
+ LOG (GNUNET_ERROR_TYPE_INFO, "Sent %d ACKs\n", handle->acks_sent);
+ LOG (GNUNET_ERROR_TYPE_INFO, "Recv %d ACKs\n\n", handle->acks_recv);
+#endif
+
t = handle->tunnels_head;
while (NULL != t)
{
{
case GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT:
case GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY:
+ case GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS:
+ case GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL:
break;
default:
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "unexpected msg %u\n",
+ LOG (GNUNET_ERROR_TYPE_ERROR, "unexpected msg %u\n",
ntohs(msg->type));
}
* (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.
+ * @param h Handle to mesh.
+ * @param regex String with the regular expression describing local services.
+ * @param compression_characters How many characters can be assigned to one
+ * edge of the graph. The bigger the variability
+ * of the data, the smaller this parameter should
+ * be (down to 1).
+ * For maximum compression, use strlen (regex)
+ * or 0 (special value). Use with care!
*/
void
GNUNET_MESH_announce_regex (struct GNUNET_MESH_Handle *h,
- const char *regex)
+ const char *regex,
+ unsigned int compression_characters)
{
- struct GNUNET_MessageHeader *msg;
+ struct GNUNET_MESH_RegexAnnounce *msg;
+ size_t payload;
size_t len;
size_t msgsize;
+ size_t offset;
+ char buffer[UINT16_MAX];
len = strlen (regex);
- msgsize = sizeof(struct GNUNET_MessageHeader) + len;
- GNUNET_assert (UINT16_MAX > msgsize);
-
+ payload = UINT16_MAX - sizeof(struct GNUNET_MESH_RegexAnnounce);
+ msg = (struct GNUNET_MESH_RegexAnnounce *) buffer;
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ANNOUNCE_REGEX);
+ msg->compression_characters = htons (compression_characters);
+ offset = 0;
+ do
{
- char buffer[msgsize];
+ msgsize = (len - offset > payload) ? payload : len - offset;
+ memcpy (&msg[1], ®ex[offset], msgsize);
+ offset += msgsize;
+ msgsize += sizeof(struct GNUNET_MESH_RegexAnnounce);
- msg = (struct GNUNET_MessageHeader *) buffer;
- msg->size = htons (msgsize);
- msg->type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ANNOUNCE_REGEX);
- memcpy (&msg[1], regex, len);
+ msg->header.size = htons (msgsize);
+ msg->last = htons (offset >= len);
- send_packet(h, msg, NULL);
- }
+ send_packet (h, &msg->header, NULL);
+ } while (len > offset);
}
/**
h = tunnel->mesh;
tunnel->buffering = buffer;
+ tunnel->max_send_pid = tunnel->next_send_pid;
if (GNUNET_YES == buffer)
msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_BUFFER);
send_packet (h, &msg.header, NULL);
}
+
/**
* Request that a peer should be added to the tunnel. The existing
* connect handler will be called ONCE with either success or failure.
* This function should NOT be called again with the same peer before the
* connect handler is called.
+ * FIXME: I think the above documentation is false. I think it should
+ * read: "The connect handler will be called once the peer was actually
+ * successfully added to the multicast group. This function should
+ * not be called twice for the same peer (unless, of course,
+ * the peer was removed using GNUNET_MESH_peer_Request_connect_del in
+ * the meantime).
*
* @param tunnel handle to existing tunnel
* @param peer peer to add
msg.tunnel_id = htonl (tunnel->tid);
msg.peer = *peer;
send_packet (tunnel->mesh, &msg.header, tunnel);
-
- return;
}
}
+/**
+ * Request information about the running mesh peer.
+ * The callback will be called for every tunnel known to the service,
+ * listing all active peers that blong to the tunnel.
+ *
+ * If called again on the same handle, it will overwrite the previous
+ * callback and cls. To retrieve the cls, monitor_cancel must be
+ * called first.
+ *
+ * WARNING: unstable API, likely to change in the future!
+ *
+ * @param h Handle to the mesh peer.
+ * @param callback Function to call with the requested data.
+ * @param callback_cls Closure for @c callback.
+ */
+void
+GNUNET_MESH_get_tunnels (struct GNUNET_MESH_Handle *h,
+ GNUNET_MESH_TunnelsCB callback,
+ void *callback_cls)
+{
+ struct GNUNET_MessageHeader msg;
+
+ msg.size = htons (sizeof (msg));
+ msg.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS);
+ send_packet (h, &msg, NULL);
+ h->tunnels_cb = callback;
+ h->tunnels_cls = callback_cls;
+
+ return;
+}
+
+
+/**
+ * Cancel a monitor request. The monitor callback will not be called.
+ *
+ * @param h Mesh handle.
+ *
+ * @return Closure given to GNUNET_MESH_monitor, if any.
+ */
+void *
+GNUNET_MESH_get_tunnels_cancel (struct GNUNET_MESH_Handle *h)
+{
+ void *cls;
+
+ cls = h->tunnels_cls;
+ h->tunnels_cb = NULL;
+ h->tunnels_cls = NULL;
+ return cls;
+}
+
+
+/**
+ * Request information about a specific tunnel of the running mesh peer.
+ *
+ * WARNING: unstable API, likely to change in the future!
+ *
+ * @param h Handle to the mesh peer.
+ * @param initiator ID of the owner of the tunnel.
+ * @param tunnel_number Tunnel number.
+ * @param callback Function to call with the requested data.
+ * @param callback_cls Closure for @c callback.
+ */
+void
+GNUNET_MESH_show_tunnel (struct GNUNET_MESH_Handle *h,
+ struct GNUNET_PeerIdentity *initiator,
+ unsigned int tunnel_number,
+ GNUNET_MESH_TunnelCB callback,
+ void *callback_cls)
+{
+ struct GNUNET_MESH_LocalMonitor msg;
+
+ msg.header.size = htons (sizeof (msg));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL);
+ msg.npeers = htonl (0);
+ msg.owner = *initiator;
+ msg.tunnel_id = htonl (tunnel_number);
+ msg.reserved = 0;
+ send_packet (h, &msg.header, NULL);
+ h->tunnel_cb = callback;
+ h->tunnel_cls = callback_cls;
+
+ return;
+}
+
+
/**
* Transition API for tunnel ctx management
*/
projects / oweals / gnunet.git / blobdiff