/**
* @file mesh/mesh_api.c
- * @brief mesh api: client implementation of mesh service
+ * @brief mesh api: client implementation of new mesh service
* @author Bartlomiej Polot
*
* STRUCTURE:
- * - CONSTANTS
* - DATA STRUCTURES
* - DECLARATIONS
* - AUXILIARY FUNCTIONS
* TODO: add regex to reconnect
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_client_lib.h"
#include "gnunet_util_lib.h"
-#include "gnunet_peer_lib.h"
#include "gnunet_mesh_service.h"
#include "mesh.h"
#include "mesh_protocol.h"
#define LOG(kind,...) GNUNET_log_from (kind, "mesh-api",__VA_ARGS__)
-
-
-/******************************************************************************/
-/************************ CONSTANTS ****************************/
-/******************************************************************************/
-
-#define HIGH_PID 0xFFFF0000
-#define LOW_PID 0x0000FFFF
-
-#define PID_OVERFLOW(pid, max) (pid > HIGH_PID && max < LOW_PID)
+#define DEBUG_ACK GNUNET_YES
/******************************************************************************/
/************************ DATA STRUCTURES ****************************/
*/
GNUNET_SCHEDULER_TaskIdentifier timeout_task;
- /**
- * Target of the message, 0 for multicast. This field
- * is only valid if 'notify' is non-NULL.
- */
- GNUNET_PEER_Id target;
-
/**
* Size of 'data' -- or the desired size of 'notify' if 'data' is NULL.
*/
*/
const struct GNUNET_MESH_MessageHandler *message_handlers;
- /**
- * Set of applications that should be claimed to be offered at this node.
- * Note that this is just informative, the appropiate handlers must be
- * registered independently and the mapping is up to the developer of the
- * client application.
- */
- const GNUNET_MESH_ApplicationType *applications;
+ /**
+ * Number of handlers in the handlers array.
+ */
+ unsigned int n_handlers;
+
+ /**
+ * Ports open.
+ */
+ const uint32_t *ports;
+
+ /**
+ * Number of ports.
+ */
+ unsigned int n_ports;
/**
* Double linked list of the tunnels this client is connected to, head.
*/
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;
-
/**
* Have we started the task to receive messages from the service
* yet? We do this after we send the 'MESH_LOCAL_CONNECT' message.
* Time to the next reconnect in case one reconnect fails
*/
struct GNUNET_TIME_Relative reconnect_time;
-
+
/**
* 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;
+
+#if DEBUG_ACK
+ unsigned int acks_sent;
+ unsigned int acks_recv;
+#endif
};
*/
struct GNUNET_MESH_Peer
{
- /**
- * ID of the peer in short form
- */
+ /**
+ * ID of the peer in short form
+ */
GNUNET_PEER_Id id;
/**
/**
* Flag indicating whether service has informed about its connection
+ * FIXME-BART: is this flag used? Seems dead right now...
*/
int connected;
*/
struct GNUNET_MESH_Tunnel *prev;
- /**
- * Callback to execute when peers connect to the tunnel
- */
- GNUNET_MESH_PeerConnectHandler connect_handler;
-
- /**
- * Callback to execute when peers disconnect from the tunnel
- */
- GNUNET_MESH_PeerDisconnectHandler disconnect_handler;
-
- /**
- * Closure for the connect/disconnect handlers
- */
- void *cls;
-
/**
* Handle to the mesh this tunnel belongs to
*/
MESH_TunnelNumber tid;
/**
- * Owner of the tunnel. 0 if the tunnel is the local client.
+ * Port number.
*/
- GNUNET_PEER_Id owner;
+ uint32_t port;
/**
- * All peers added to the tunnel
+ * Other end of the tunnel.
*/
- struct GNUNET_MESH_Peer **peers;
+ GNUNET_PEER_Id peer;
- /**
- * List of application types that have been requested for this tunnel
- */
- GNUNET_MESH_ApplicationType *apps;
+ struct GNUNET_PeerIdentity pid;
/**
* Any data the caller wants to put in here
*/
void *ctx;
- /**
- * Number of peers added to the tunnel
- */
- unsigned int npeers;
-
/**
* Size of packet queued in this tunnel
*/
unsigned int packet_size;
/**
- * Number of applications requested this tunnel
+ * Is the tunnel allowed to buffer?
*/
- unsigned int napps;
+ int nobuffer;
/**
- * Is the tunnel throttled to the slowest peer?
+ * Is the tunnel realiable?
*/
- int speed_min;
+ int reliable;
/**
- * Is the tunnel allowed to buffer?
+ * If reliable, is the tunnel out of order?
*/
- int buffering;
+ int ooorder;
/**
- * Next packet PID.
+ * Are we allowed to send to the service?
*/
- uint32_t pid;
+ int allow_send;
+
+};
- /**
- * Maximum allowed PID.
- */
- uint32_t max_pid;
+/**
+ * Implementation state for mesh's message queue.
+ */
+struct MeshMQState
+{
+ /**
+ * The current transmit handle, or NULL
+ * if no transmit is active.
+ */
+ struct GNUNET_MESH_TransmitHandle *th;
+ /**
+ * Tunnel to send the data over.
+ */
+ struct GNUNET_MESH_Tunnel *tunnel;
};
}
+/**
+ * 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_YES == t->allow_send)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# message payload ok\n");
+ return th->size;
+ }
+ }
+ return 0;
+}
+
+
/**
* Get the tunnel handler for the tunnel specified by id from the given handle
* @param h Mesh handle
{
t->tid = tid;
}
+ t->allow_send = GNUNET_NO;
+ t->nobuffer = GNUNET_NO;
return t;
}
destroy_tunnel (struct GNUNET_MESH_Tunnel *t, int call_cleaner)
{
struct GNUNET_MESH_Handle *h;
- struct GNUNET_PeerIdentity pi;
struct GNUNET_MESH_TransmitHandle *th;
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);
return;
}
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "destroy_tunnel %X\n",
+ t->tid);
h = t->mesh;
- /* disconnect all peers */
GNUNET_CONTAINER_DLL_remove (h->tunnels_head, h->tunnels_tail, t);
- for (i = 0; i < t->npeers; i++)
- {
- if ( (NULL != t->disconnect_handler) && t->peers[i]->connected)
- {
- GNUNET_PEER_resolve (t->peers[i]->id, &pi);
- t->disconnect_handler (t->cls, &pi);
- }
- GNUNET_PEER_change_rc (t->peers[i]->id, -1);
- GNUNET_free (t->peers[i]);
- }
/* signal tunnel destruction */
- if ( (NULL != h->cleaner) && (0 != t->owner) && (GNUNET_YES == call_cleaner) )
+ if ( (NULL != h->cleaner) && (0 != t->peer) && (GNUNET_YES == call_cleaner) )
h->cleaner (h->cls, t, t->ctx);
/* check that clients did not leave messages behind in the queue */
/* clean up request */
if (GNUNET_SCHEDULER_NO_TASK != th->timeout_task)
GNUNET_SCHEDULER_cancel (th->timeout_task);
- GNUNET_free (th);
+ GNUNET_free (th);
}
/* 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;
}
-
- if (t->npeers > 0)
- GNUNET_free (t->peers);
- if (0 != t->owner)
- GNUNET_PEER_change_rc (t->owner, -1);
- if (0 != t->napps && t->apps)
- GNUNET_free (t->apps);
+ if (0 != t->peer)
+ GNUNET_PEER_change_rc (t->peer, -1);
GNUNET_free (t);
return;
}
-/**
- * Get the peer descriptor for the peer with id from the given tunnel
- * @param t Tunnel handle
- * @param id Short form ID of the wanted peer
- * @return handle to the requested peer or NULL if not found
- */
-static struct GNUNET_MESH_Peer *
-retrieve_peer (struct GNUNET_MESH_Tunnel *t, GNUNET_PEER_Id id)
-{
- unsigned int i;
-
- for (i = 0; i < t->npeers; i++)
- if (t->peers[i]->id == id)
- return t->peers[i];
- return NULL;
-}
-
-
-/**
- * Add a peer into a tunnel
- * @param t Tunnel handle
- * @param pi Full ID of the new peer
- * @return handle to the newly created peer
- */
-static struct GNUNET_MESH_Peer *
-add_peer_to_tunnel (struct GNUNET_MESH_Tunnel *t,
- const struct GNUNET_PeerIdentity *pi)
-{
- struct GNUNET_MESH_Peer *p;
- GNUNET_PEER_Id id;
-
- if (0 != t->owner)
- {
- GNUNET_break (0);
- return NULL;
- }
- id = GNUNET_PEER_intern (pi);
-
- p = GNUNET_malloc (sizeof (struct GNUNET_MESH_Peer));
- p->id = id;
- p->t = t;
- GNUNET_array_append (t->peers, t->npeers, p);
- return p;
-}
-
-
-/**
- * Remove a peer from a tunnel
- * @param p Peer handle
- */
-static void
-remove_peer_from_tunnel (struct GNUNET_MESH_Peer *p)
-{
- unsigned int i;
-
- for (i = 0; i < p->t->npeers; i++)
- {
- if (p->t->peers[i] == p)
- break;
- }
- if (i == p->t->npeers)
- {
- GNUNET_break (0);
- return;
- }
- p->t->peers[i] = p->t->peers[p->t->npeers - 1];
- GNUNET_array_grow (p->t->peers, p->t->npeers, p->t->npeers - 1);
-}
-
-
/**
* Notify client that the transmission has timed out
+ *
* @param cls closure
* @param tc task context
*/
mesh = th->tunnel->mesh;
GNUNET_CONTAINER_DLL_remove (mesh->th_head, mesh->th_tail, th);
+ 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;
}
/**
- * 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);
- if (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value == th->timeout.abs_value)
+ GNUNET_CONTAINER_DLL_insert_tail (h->th_head, h->th_tail, th);
+ if (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us == th->timeout.abs_value_us)
return;
th->timeout_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
struct GNUNET_MESH_Tunnel *tunnel);
+/**
+ * Send an ack on the tunnel to confirm the processing of a message.
+ *
+ * @param t Tunnel on which to send the ACK.
+ */
+static void
+send_ack (struct GNUNET_MESH_Tunnel *t)
+{
+ struct GNUNET_MESH_LocalAck msg;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending ACK on tunnel %X\n", t->tid);
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK);
+ msg.header.size = htons (sizeof (msg));
+ msg.tunnel_id = htonl (t->tid);
+
+#if DEBUG_ACK
+ t->mesh->acks_sent++;
+#endif
+
+ send_packet (t->mesh, &msg.header, t);
+ return;
+}
+
+
+
/**
* Reconnect callback: tries to reconnect again after a failer previous
* reconnecttion
size_t size;
size = sizeof (struct GNUNET_MESH_ClientConnect);
- size += h->n_applications * sizeof (GNUNET_MESH_ApplicationType);
- size += h->n_handlers * sizeof (uint16_t);
+ size += h->n_ports * sizeof (uint32_t);
{
char buf[size] GNUNET_ALIGN;
struct GNUNET_MESH_ClientConnect *msg;
- GNUNET_MESH_ApplicationType *apps;
- uint16_t napps;
- uint16_t *types;
- uint16_t ntypes;
+ uint32_t *ports;
+ uint16_t i;
/* build connection packet */
msg = (struct GNUNET_MESH_ClientConnect *) buf;
msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT);
msg->header.size = htons (size);
- apps = (GNUNET_MESH_ApplicationType *) &msg[1];
- for (napps = 0; napps < h->n_applications; napps++)
+ ports = (uint32_t *) &msg[1];
+ for (i = 0; i < h->n_ports; i++)
{
- apps[napps] = htonl (h->applications[napps]);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " app %u\n", h->applications[napps]);
+ ports[i] = htonl (h->ports[i]);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " port %u\n",
+ h->ports[i]);
}
- types = (uint16_t *) & apps[napps];
- for (ntypes = 0; ntypes < h->n_handlers; ntypes++)
- types[ntypes] = htons (h->message_handlers[ntypes].type);
- msg->applications = htons (napps);
- msg->types = htons (ntypes);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending %lu bytes long message %d types and %d apps\n",
- ntohs (msg->header.size), ntypes, napps);
+ "Sending %lu bytes long message with %u ports\n",
+ ntohs (msg->header.size), h->n_ports);
send_packet (h, &msg->header, NULL);
}
}
do_reconnect (struct GNUNET_MESH_Handle *h)
{
struct GNUNET_MESH_Tunnel *t;
- unsigned int i;
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)
{
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;
}
for (t = h->tunnels_head; NULL != t; t = t->next)
{
struct GNUNET_MESH_TunnelMessage tmsg;
- struct GNUNET_MESH_PeerControl pmsg;
+ uint32_t options;
if (t->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
{
*/
continue;
}
+ t->allow_send = GNUNET_NO;
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);
- send_packet (h, &tmsg.header, t);
+ tmsg.port = htonl (t->port);
+ t->pid = tmsg.peer;
+ GNUNET_PEER_resolve (t->peer, &tmsg.peer);
- pmsg.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl));
- pmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD);
- pmsg.tunnel_id = htonl (t->tid);
+ options = 0;
+ if (GNUNET_YES == t->nobuffer)
+ options |= GNUNET_MESH_OPTION_NOBUFFER;
- /* Reconnect all peers */
- /* 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);
- send_packet (t->mesh, &pmsg.header, t);
- }
- /* Reconnect all types, if any */
- for (i = 0; i < t->napps; i++)
- {
- struct GNUNET_MESH_ConnectPeerByType msg;
+ if (GNUNET_YES == t->reliable)
+ options |= GNUNET_MESH_OPTION_RELIABLE;
- msg.header.size = htons (sizeof (struct GNUNET_MESH_ConnectPeerByType));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD_BY_TYPE);
- msg.tunnel_id = htonl (t->tid);
- 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);
+ tmsg.opt = htonl (options);
+ send_packet (h, &tmsg.header, t);
}
return GNUNET_YES;
}
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);
*/
static void
process_tunnel_created (struct GNUNET_MESH_Handle *h,
- const struct GNUNET_MESH_TunnelNotification *msg)
+ const struct GNUNET_MESH_TunnelMessage *msg)
{
struct GNUNET_MESH_Tunnel *t;
MESH_TunnelNumber tid;
+ uint32_t port;
tid = ntohl (msg->tunnel_id);
+ port = ntohl (msg->port);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating incoming tunnel %X:%u\n", tid, port);
if (tid < GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
{
GNUNET_break (0);
}
if (NULL != h->new_tunnel)
{
- struct GNUNET_ATS_Information atsi;
-
t = create_tunnel (h, tid);
- t->owner = GNUNET_PEER_intern (&msg->peer);
- t->npeers = 1;
- t->peers = GNUNET_malloc (sizeof (struct GNUNET_MESH_Peer *));
- t->peers[0] = GNUNET_malloc (sizeof (struct GNUNET_MESH_Peer));
- t->peers[0]->t = t;
- t->peers[0]->connected = 1;
- t->peers[0]->id = t->owner;
- GNUNET_PEER_change_rc (t->owner, 1);
+ t->allow_send = GNUNET_NO;
+ t->peer = GNUNET_PEER_intern (&msg->peer);
+ t->pid = msg->peer;
t->mesh = h;
t->tid = tid;
- atsi.type = 0;
- atsi.value = 0;
- t->ctx = h->new_tunnel (h->cls, t, &msg->peer, &atsi);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "new incoming tunnel %X\n", t->tid);
+ t->port = port;
+ if (0 != (msg->opt & GNUNET_MESH_OPTION_NOBUFFER))
+ t->nobuffer = GNUNET_YES;
+ else
+ t->nobuffer = GNUNET_NO;
+ if (0 != (msg->opt & GNUNET_MESH_OPTION_RELIABLE))
+ t->reliable = GNUNET_YES;
+ else
+ t->reliable = GNUNET_NO;
+ if (GNUNET_YES == t->reliable &&
+ 0 != (msg->opt & GNUNET_MESH_OPTION_OOORDER))
+ t->ooorder = GNUNET_YES;
+ else
+ t->ooorder = GNUNET_NO;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " created tunnel %p\n", t);
+ t->ctx = h->new_tunnel (h->cls, t, &msg->peer, t->port);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "User notified\n");
}
else
{
d_msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
d_msg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));
d_msg.tunnel_id = msg->tunnel_id;
+ memset (&d_msg.peer, 0, sizeof (struct GNUNET_PeerIdentity));
+ d_msg.port = 0;
+ d_msg.opt = 0;
send_packet (h, &d_msg.header, NULL);
}
struct GNUNET_MESH_Tunnel *t;
MESH_TunnelNumber tid;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Destroying tunnel from service\n");
tid = ntohl (msg->tunnel_id);
t = retrieve_tunnel (h, tid);
if (NULL == t)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "tunnel %X unknown\n", tid);
return;
}
- if (0 == t->owner)
- {
- GNUNET_break (0);
- }
LOG (GNUNET_ERROR_TYPE_DEBUG, "tunnel %X destroyed\n", t->tid);
destroy_tunnel (t, GNUNET_YES);
- return;
-}
-
-
-/**
- * Process the new peer event and notify the upper level of it
- *
- * @param h The mesh handle
- * @param msg A message with the details of the peer event
- */
-static void
-process_peer_event (struct GNUNET_MESH_Handle *h,
- const struct GNUNET_MESH_PeerControl *msg)
-{
- struct GNUNET_MESH_Tunnel *t;
- struct GNUNET_MESH_Peer *p;
- struct GNUNET_ATS_Information atsi;
- GNUNET_PEER_Id id;
- uint16_t size;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "processig peer event\n");
- size = ntohs (msg->header.size);
- if (size != sizeof (struct GNUNET_MESH_PeerControl))
- {
- GNUNET_break (0);
- return;
- }
- t = retrieve_tunnel (h, ntohl (msg->tunnel_id));
- if (NULL == t)
- {
- GNUNET_break (0);
- return;
- }
- id = GNUNET_PEER_search (&msg->peer);
- if ((p = retrieve_peer (t, id)) == NULL)
- p = add_peer_to_tunnel (t, &msg->peer);
- if (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD == ntohs (msg->header.type))
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "adding peer\n");
- if (NULL != t->connect_handler)
- {
- atsi.type = 0;
- atsi.value = 0;
- t->connect_handler (t->cls, &msg->peer, &atsi);
- }
- p->connected = 1;
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "removing peer\n");
- if (NULL != t->disconnect_handler && p->connected)
- {
- t->disconnect_handler (t->cls, &msg->peer);
- }
- remove_peer_from_tunnel (p);
- GNUNET_free (p);
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG, "processing peer event END\n");
}
/**
- * Process the incoming data packets
+ * Process the incoming data packets, call appropriate handlers.
*
* @param h The mesh handle
* @param message A message encapsulating the data
- *
- * @return GNUNET_YES if everything went fine
- * GNUNET_NO if client closed connection (h no longer valid)
*/
-static int
+static void
process_incoming_data (struct GNUNET_MESH_Handle *h,
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_MessageHeader *payload;
const struct GNUNET_MESH_MessageHandler *handler;
- const struct GNUNET_PeerIdentity *peer;
- struct GNUNET_MESH_Unicast *ucast;
- struct GNUNET_MESH_Multicast *mcast;
- struct GNUNET_MESH_ToOrigin *to_orig;
+ struct GNUNET_MESH_LocalData *dmsg;
struct GNUNET_MESH_Tunnel *t;
unsigned int i;
uint16_t type;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Got a data message!\n");
- type = ntohs (message->type);
- switch (type)
- {
- case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
- ucast = (struct GNUNET_MESH_Unicast *) message;
-
- 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",
- GNUNET_i2s (peer), ntohl (ucast->tid));
- break;
- case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
- mcast = (struct GNUNET_MESH_Multicast *) message;
- 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",
- GNUNET_i2s (peer), ntohl (mcast->tid));
- break;
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- to_orig = (struct GNUNET_MESH_ToOrigin *) message;
- 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",
- GNUNET_i2s (peer), ntohl (to_orig->tid));
- break;
- default:
- GNUNET_break (0);
- return GNUNET_YES;
- }
+
+ dmsg = (struct GNUNET_MESH_LocalData *) message;
+
+ t = retrieve_tunnel (h, ntohl (dmsg->tid));
+ payload = (struct GNUNET_MessageHeader *) &dmsg[1];
if (NULL == t)
{
- /* Tunnel was ignored, probably service didn't get it yet */
- return GNUNET_YES;
+ /* Tunnel was ignored/destroyed, probably service didn't get it yet */
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " ignored!\n");
+ return;
}
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ " %s data on tunnel %s [%X]\n",
+ t->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV ? "fwd" : "bck",
+ GNUNET_i2s (GNUNET_PEER_resolve2(t->peer)),
+ ntohl (dmsg->tid));
type = ntohs (payload->type);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " payload type %u\n", type);
for (i = 0; i < h->n_handlers; i++)
{
handler = &h->message_handlers[i];
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ " checking handler for type %u\n",
+ handler->type);
if (handler->type == type)
{
- struct GNUNET_ATS_Information atsi;
-
- atsi.type = 0;
- atsi.value = 0;
if (GNUNET_OK !=
- handler->callback (h->cls, t, &t->ctx, peer, payload, &atsi))
+ handler->callback (h->cls, t, &t->ctx, payload))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "callback caused disconnection\n");
- GNUNET_MESH_disconnect (h);
- return GNUNET_NO;
+ GNUNET_MESH_tunnel_destroy (t);
+ return;
}
else
{
}
}
}
- return GNUNET_YES;
}
/**
* Process a local ACK message, enabling the client to send
* more data to the service.
- *
+ *
* @param h Mesh handle.
* @param message Message itself.
*/
{
struct GNUNET_MESH_LocalAck *msg;
struct GNUNET_MESH_Tunnel *t;
- uint32_t ack;
+ MESH_TunnelNumber tid;
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));
-
+ tid = ntohl (msg->tunnel_id);
+ t = retrieve_tunnel (h, tid);
if (NULL == t)
{
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "ACK on unknown tunnel %X\n",
- ntohl (msg->tunnel_id));
+ LOG (GNUNET_ERROR_TYPE_WARNING, "ACK on unknown tunnel %X\n", tid);
return;
}
- ack = ntohl (msg->max_pid);
- if (ack > t->max_pid || PID_OVERFLOW (t->max_pid, ack))
- t->max_pid = ack;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X!\n", t->tid);
+ t->allow_send = GNUNET_YES;
if (NULL == h->th && 0 < t->packet_size)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " tmt rdy was NULL, requesting!\n");
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
+ * Process a local reply about info on all tunnels, pass info to the user.
*
- * @param cls closure
- * @param msg message received, NULL on timeout or fatal error
+ * @param h Mesh handle.
+ * @param message Message itself.
*/
static void
-msg_received (void *cls, const struct GNUNET_MessageHeader *msg)
+process_get_tunnels (struct GNUNET_MESH_Handle *h,
+ const struct GNUNET_MessageHeader *message)
{
- struct GNUNET_MESH_Handle *h = cls;
+ struct GNUNET_MESH_LocalMonitor *msg;
- if (msg == NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Get Tunnels messasge received\n");
+
+ if (NULL == h->tunnels_cb)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received NULL msg on %p\n", h);
- reconnect (h);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, " ignored\n");
return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "received a message type %hu from MESH\n",
- ntohs (msg->type));
- switch (ntohs (msg->type))
+
+ msg = (struct GNUNET_MESH_LocalMonitor *) message;
+ if (ntohs (message->size) !=
+ (sizeof (struct GNUNET_MESH_LocalMonitor) +
+ sizeof (struct GNUNET_PeerIdentity)))
{
- /* Notify of a new incoming tunnel */
- case GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE:
- process_tunnel_created (h, (struct GNUNET_MESH_TunnelNotification *) msg);
- break;
- /* Notify of a tunnel disconnection */
- case GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY:
- process_tunnel_destroy (h, (struct GNUNET_MESH_TunnelMessage *) msg);
- break;
- /* Notify of a new peer or a peer disconnect in the tunnel */
- case GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD:
- case GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DEL:
- process_peer_event (h, (struct GNUNET_MESH_PeerControl *) msg);
- break;
- /* Notify of a new data packet in the tunnel */
- case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
- case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- if (GNUNET_NO == process_incoming_data (h, msg))
- return;
- break;
- case GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK:
+ GNUNET_break_op (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Get tunnels message: size %hu - expected %u\n",
+ ntohs (message->size),
+ sizeof (struct GNUNET_MESH_LocalMonitor));
+ return;
+ }
+ h->tunnels_cb (h->tunnels_cls,
+ ntohl (msg->tunnel_id),
+ &msg->owner,
+ &msg->destination);
+}
+
+
+
+/**
+ * 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;
+ size_t esize;
+
+ 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;
+ esize = sizeof (struct GNUNET_MESH_LocalMonitor);
+ if (ntohs (message->size) != esize)
+ {
+ GNUNET_break_op (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Show tunnel message: size %hu - expected %u\n",
+ ntohs (message->size),
+ esize);
+
+ h->tunnel_cb (h->tunnel_cls, NULL, NULL);
+ h->tunnel_cb = NULL;
+ h->tunnel_cls = NULL;
+
+ return;
+ }
+
+ h->tunnel_cb (h->tunnel_cls,
+ &msg->destination,
+ &msg->owner);
+}
+
+
+/**
+ * Function to process all messages received from the service
+ *
+ * @param cls closure
+ * @param msg message received, NULL on timeout or fatal error
+ */
+static void
+msg_received (void *cls, const struct GNUNET_MessageHeader *msg)
+{
+ struct GNUNET_MESH_Handle *h = cls;
+ uint16_t type;
+
+ if (msg == NULL)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Mesh service disconnected, reconnecting\n", h);
+ reconnect (h);
+ return;
+ }
+ type = ntohs (msg->type);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received a message: %s\n",
+ GNUNET_MESH_DEBUG_M2S (type));
+ switch (type)
+ {
+ /* Notify of a new incoming tunnel */
+ case GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE:
+ process_tunnel_created (h, (struct GNUNET_MESH_TunnelMessage *) msg);
+ break;
+ /* Notify of a tunnel disconnection */
+ case GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY:
+ process_tunnel_destroy (h, (struct GNUNET_MESH_TunnelMessage *) msg);
+ break;
+ /* Notify of a new data packet in the tunnel */
+ case GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA:
+ process_incoming_data (h, msg);
+ break;
+ 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 %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");
+ }
}
char *cbuf = buf;
size_t tsize;
size_t psize;
+ size_t nsize;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Send packet() Buffer %u\n", size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# Send packet() Buffer %u\n", size);
if ((0 == size) || (NULL == buf))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received NULL send callback on %p\n", h);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# Received NULL send callback on %p\n", h);
reconnect (h);
h->th = NULL;
return 0;
}
tsize = 0;
next = h->th_head;
- while ((NULL != (th = next)) && (size >= th->size))
+ nsize = message_ready_size (h);
+ while ((NULL != (th = next)) && (0 < nsize) && (size >= nsize))
{
t = th->tunnel;
if (GNUNET_YES == th_is_payload (th))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " payload\n");
- if (t->max_pid < t->pid && ! PID_OVERFLOW (t->pid, t->max_pid)) {
+ struct GNUNET_MESH_LocalData *dmsg;
+ struct GNUNET_MessageHeader *mh;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# payload\n");
+ if (GNUNET_NO == t->allow_send)
+ {
/* 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)
+ GNUNET_assert (size >= th->size);
+ dmsg = (struct GNUNET_MESH_LocalData *) cbuf;
+ mh = (struct GNUNET_MessageHeader *) &dmsg[1];
+ psize = th->notify (th->notify_cls,
+ size - sizeof (struct GNUNET_MESH_LocalData),
+ mh);
+ if (psize > 0)
{
- /* traffic to origin */
- struct GNUNET_MESH_ToOrigin to;
- struct GNUNET_MessageHeader *mh;
-
- 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));
- 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 (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));
- }
- }
- else if (th->target == 0)
- {
- /* multicast */
- struct GNUNET_MESH_Multicast mc;
- struct GNUNET_MessageHeader *mh;
-
- 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));
- 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 (t->tid);
- mc.pid = htonl (t->pid);
- mc.ttl = 0;
- memset (&mc.oid, 0, sizeof (struct GNUNET_PeerIdentity));
- memcpy (cbuf, &mc, sizeof (mc));
- }
+ psize += sizeof (struct GNUNET_MESH_LocalData);
+ GNUNET_assert (size >= psize);
+ dmsg->header.size = htons (psize);
+ dmsg->tid = htonl (t->tid);
+ dmsg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# payload type %s\n",
+ GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
+ t->allow_send = GNUNET_NO;
}
else
{
- /* unicast */
- struct GNUNET_MESH_Unicast uc;
- struct GNUNET_MessageHeader *mh;
-
- 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));
- 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 (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));
- }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "# callback returned size 0, "
+ "application canceled transmission\n");
}
- 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 internal traffic, type %s\n",
+ GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
memcpy (cbuf, &th[1], th->size);
psize = th->size;
}
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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# total size: %u\n", tsize);
h->th = NULL;
- if (NULL != h->th_head)
+ size = message_ready_size (h);
+ if (0 != size)
{
- int request = GNUNET_NO;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, " head not empty\n");
- for (th = h->th_head; NULL != th; th = th->next)
- {
- struct GNUNET_MESH_Tunnel *t = th->tunnel;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, " [%p] notify: %p, size %u\n",
- th, th->notify, th->size);
- GNUNET_assert (NULL != t);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " pid %u, max %u\n", t->pid, t->max_pid);
-
- if (GNUNET_NO == th_is_payload (th) ||
- (t->max_pid >= t->pid || PID_OVERFLOW (t->pid, t->max_pid)))
- {
- request = GNUNET_YES;
- break;
- }
- }
-
- if (GNUNET_YES == request)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " next size: %u\n", th->size);
- 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, "# nothing left to transmit\n");
}
if (GNUNET_NO == h->in_receive)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " start receiving from service\n");
+ 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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# Send packet() END\n");
return tsize;
}
* Auxiliary function to send an already constructed packet to the service.
* Takes care of creating a new queue element, copying the message and
* calling the tmt_rdy function if necessary.
- *
+ *
* @param h mesh handle
* @param msg message to transmit
* @param tunnel tunnel this send is related to (NULL if N/A)
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->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
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,
/********************** API CALL DEFINITIONS *************************/
/******************************************************************************/
-/**
- * Connect to the mesh service.
- *
- * @param cfg configuration to use
- * @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
- * @param cleaner function called when an *inbound* tunnel is destroyed by the
- * remote peer, it is *not* called if GNUNET_MESH_tunnel_destroy
- * is called on the tunnel
- * @param handlers callbacks for messages we care about, NULL-terminated
- * note that the mesh is allowed to drop notifications about
- * inbound messages if the client does not process them fast
- * enough (for this notification type, a bounded queue is used)
- * @param stypes list of the applications that this client claims to provide
- * @return handle to the mesh service NULL on error
- * (in this case, init is never called)
- */
struct GNUNET_MESH_Handle *
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,
- const GNUNET_MESH_ApplicationType *stypes)
+ const uint32_t *ports)
{
struct GNUNET_MESH_Handle *h;
return NULL;
}
h->cls = cls;
- /* FIXME memdup? */
- h->applications = stypes;
h->message_handlers = handlers;
+ h->ports = ports;
h->next_tid = GNUNET_MESH_LOCAL_TUNNEL_ID_CLI;
h->reconnect_time = GNUNET_TIME_UNIT_MILLISECONDS;
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++) ;
+ if (NULL != ports && ports[0] != 0 && NULL == new_tunnel)
+ {
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "no new tunnel handler given, ports parameter is useless!!\n");
+ }
+ if ((NULL == ports || ports[0] == 0) && NULL != new_tunnel)
+ {
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "no ports given, new tunnel handler will never be called!!\n");
+ }
+ /* count handlers */
+ for (h->n_handlers = 0;
+ handlers && handlers[h->n_handlers].type;
+ h->n_handlers++) ;
+ for (h->n_ports = 0;
+ ports && ports[h->n_ports];
+ h->n_ports++) ;
send_connect (h);
LOG (GNUNET_ERROR_TYPE_DEBUG, "GNUNET_MESH_connect() END\n");
return h;
}
-/**
- * Disconnect from the mesh service. All tunnels will be destroyed. All tunnel
- * disconnect callbacks will be called on any still connected peers, notifying
- * about their disconnection. The registered inbound tunnel cleaner will be
- * called should any inbound tunnels still exist.
- *
- * @param handle connection to mesh to disconnect
- */
void
GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle)
{
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));
}
}
-/**
- * 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.
- */
-void
-GNUNET_MESH_announce_regex (struct GNUNET_MESH_Handle *h,
- const char *regex)
-{
- struct GNUNET_MessageHeader *msg;
- 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);
- }
-}
-
/**
* Create a new tunnel (we're initiator and will be allowed to add/remove peers
* and to broadcast).
*
* @param h mesh handle
* @param tunnel_ctx client's tunnel context to associate with the tunnel
- * @param connect_handler function to call when peers are actually connected
- * @param disconnect_handler function to call when peers are disconnected
- * @param handler_cls closure for connect/disconnect handlers
+ * @param peer peer identity the tunnel should go to
+ * @param port Port number.
+ * @param nobuffer Flag for disabling buffering on relay nodes.
+ * @param reliable Flag for end-to-end reliability.
+ *
+ * @return handle to the tunnel
*/
struct GNUNET_MESH_Tunnel *
-GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h, void *tunnel_ctx,
- GNUNET_MESH_PeerConnectHandler connect_handler,
- GNUNET_MESH_PeerDisconnectHandler disconnect_handler,
- void *handler_cls)
+GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h,
+ void *tunnel_ctx,
+ const struct GNUNET_PeerIdentity *peer,
+ uint32_t port,
+ int nobuffer,
+ int reliable)
{
struct GNUNET_MESH_Tunnel *t;
struct GNUNET_MESH_TunnelMessage msg;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating new tunnel\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating new tunnel to %s:%u\n",
+ GNUNET_i2s (peer), port);
t = create_tunnel (h, 0);
- t->connect_handler = connect_handler;
- t->disconnect_handler = disconnect_handler;
- t->cls = handler_cls;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " at %p\n", t);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " number %X\n", t->tid);
t->ctx = tunnel_ctx;
+ t->peer = GNUNET_PEER_intern (peer);
+ t->pid = *peer;
msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
msg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));
msg.tunnel_id = htonl (t->tid);
+ msg.port = htonl (port);
+ msg.peer = *peer;
+ msg.opt = 0;
+ if (GNUNET_YES == reliable)
+ msg.opt |= GNUNET_MESH_OPTION_RELIABLE;
+ if (GNUNET_YES == nobuffer)
+ msg.opt |= GNUNET_MESH_OPTION_NOBUFFER;
+ msg.opt = htonl (msg.opt);
+ t->allow_send = 0;
send_packet (h, &msg.header, t);
return t;
}
-/**
- * Destroy an existing tunnel. The existing callback for the tunnel will NOT
- * be called.
- *
- * @param tunnel tunnel handle
- */
void
GNUNET_MESH_tunnel_destroy (struct GNUNET_MESH_Tunnel *tunnel)
{
msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
msg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));
msg.tunnel_id = htonl (tunnel->tid);
+ memset (&msg.peer, 0, sizeof (struct GNUNET_PeerIdentity));
+ msg.port = 0;
+ msg.opt = 0;
th = h->th_head;
while (th != NULL)
{
th = th->next;
}
- destroy_tunnel (tunnel, GNUNET_NO);
- 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);
-
+ destroy_tunnel (tunnel, GNUNET_YES);
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.
+ * Get information about a tunnel.
+ *
+ * @param tunnel Tunnel handle.
+ * @param option Query (GNUNET_MESH_OPTION_*).
+ * @param ... dependant on option, currently not used
*
- * @param tunnel Tunnel affected.
+ * @return Union with an answer to the query.
*/
-void
-GNUNET_MESH_tunnel_speed_max (struct GNUNET_MESH_Tunnel *tunnel)
+const union GNUNET_MESH_TunnelInfo *
+GNUNET_MESH_tunnel_get_info (struct GNUNET_MESH_Tunnel *tunnel,
+ enum MeshTunnelOption option, ...)
{
- struct GNUNET_MESH_TunnelMessage msg;
- struct GNUNET_MESH_Handle *h;
-
- h = tunnel->mesh;
- tunnel->speed_min = GNUNET_NO;
+ const union GNUNET_MESH_TunnelInfo *ret;
- 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);
+ switch (option)
+ {
+ case GNUNET_MESH_OPTION_NOBUFFER:
+ ret = (const union GNUNET_MESH_TunnelInfo *) &tunnel->nobuffer;
+ break;
+ case GNUNET_MESH_OPTION_RELIABLE:
+ ret = (const union GNUNET_MESH_TunnelInfo *) &tunnel->reliable;
+ break;
+ case GNUNET_MESH_OPTION_OOORDER:
+ ret = (const union GNUNET_MESH_TunnelInfo *) &tunnel->ooorder;
+ break;
+ case GNUNET_MESH_OPTION_PEER:
+ ret = (const union GNUNET_MESH_TunnelInfo *) &tunnel->pid;
+ break;
+ default:
+ GNUNET_break (0);
+ return NULL;
+ }
- send_packet (h, &msg.header, NULL);
+ return ret;
}
-/**
- * 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_TransmitHandle *
+GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Tunnel *tunnel, int cork,
+ struct GNUNET_TIME_Relative maxdelay,
+ size_t notify_size,
+ GNUNET_CONNECTION_TransmitReadyNotify notify,
+ void *notify_cls)
{
- struct GNUNET_MESH_TunnelMessage msg;
- struct GNUNET_MESH_Handle *h;
-
- h = tunnel->mesh;
- tunnel->buffering = buffer;
+ struct GNUNET_MESH_TransmitHandle *th;
- if (GNUNET_YES == buffer)
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_BUFFER);
+ GNUNET_assert (NULL != tunnel);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "MESH NOTIFY TRANSMIT READY\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X\n", tunnel->tid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " allow_send %d\n", tunnel->allow_send);
+ if (tunnel->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " to origin\n");
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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " to destination\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " payload size %u\n", notify_size);
+ GNUNET_assert (NULL != notify);
+ GNUNET_assert (0 == tunnel->packet_size); // Only one data packet allowed
+ th = GNUNET_malloc (sizeof (struct GNUNET_MESH_TransmitHandle));
+ th->tunnel = tunnel;
+ th->timeout = GNUNET_TIME_relative_to_absolute (maxdelay);
+ th->size = notify_size + sizeof (struct GNUNET_MESH_LocalData);
+ tunnel->packet_size = th->size;
+ 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 == tunnel->allow_send)
+ return th;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " call client notify tmt rdy\n");
+ tunnel->mesh->th =
+ GNUNET_CLIENT_notify_transmit_ready (tunnel->mesh->client, th->size,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_YES, &send_callback,
+ tunnel->mesh);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "MESH NOTIFY TRANSMIT READY END\n");
+ return th;
}
-/**
- * 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.
- *
- * @param tunnel handle to existing tunnel
- * @param peer peer to add
- */
+
void
-GNUNET_MESH_peer_request_connect_add (struct GNUNET_MESH_Tunnel *tunnel,
- const struct GNUNET_PeerIdentity *peer)
+GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle *th)
{
- struct GNUNET_MESH_PeerControl msg;
- GNUNET_PEER_Id peer_id;
- unsigned int i;
+ struct GNUNET_MESH_Handle *mesh;
- peer_id = GNUNET_PEER_intern (peer);
- for (i = 0; i < tunnel->npeers; i++)
+ 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 ((0 == message_ready_size (mesh)) && (NULL != mesh->th))
{
- if (tunnel->peers[i]->id == peer_id)
- {
- /* Peer already exists in tunnel */
- GNUNET_PEER_change_rc (peer_id, -1);
- GNUNET_break (0);
- return;
- }
+ /* queue empty, no point in asking for transmission */
+ GNUNET_CLIENT_notify_transmit_ready_cancel (mesh->th);
+ mesh->th = NULL;
}
- if (NULL == add_peer_to_tunnel (tunnel, peer))
- return;
-
- msg.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD);
- msg.tunnel_id = htonl (tunnel->tid);
- msg.peer = *peer;
- send_packet (tunnel->mesh, &msg.header, tunnel);
-
- return;
}
-
-/**
- * Request that a peer should be removed from the tunnel. The existing
- * disconnect handler will be called ONCE if we were connected.
- *
- * @param tunnel handle to existing tunnel
- * @param peer peer to remove
- */
void
-GNUNET_MESH_peer_request_connect_del (struct GNUNET_MESH_Tunnel *tunnel,
- const struct GNUNET_PeerIdentity *peer)
+GNUNET_MESH_receive_done (struct GNUNET_MESH_Tunnel *tunnel)
{
- struct GNUNET_MESH_PeerControl msg;
- GNUNET_PEER_Id peer_id;
- unsigned int i;
-
- peer_id = GNUNET_PEER_search (peer);
- if (0 == peer_id)
- {
- GNUNET_break (0);
- return;
- }
- for (i = 0; i < tunnel->npeers; i++)
- if (tunnel->peers[i]->id == peer_id)
- break;
- if (i == tunnel->npeers)
- {
- GNUNET_break (0);
- return;
- }
- if (NULL != tunnel->disconnect_handler && tunnel->peers[i]->connected == 1)
- tunnel->disconnect_handler (tunnel->cls, peer);
- GNUNET_PEER_change_rc (peer_id, -1);
- GNUNET_free (tunnel->peers[i]);
- tunnel->peers[i] = tunnel->peers[tunnel->npeers - 1];
- GNUNET_array_grow (tunnel->peers, tunnel->npeers, tunnel->npeers - 1);
-
- msg.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DEL);
- msg.tunnel_id = htonl (tunnel->tid);
- memcpy (&msg.peer, peer, sizeof (struct GNUNET_PeerIdentity));
- send_packet (tunnel->mesh, &msg.header, tunnel);
+ send_ack (tunnel);
}
/**
- * Request that the mesh should try to connect to a peer supporting the given
- * message type.
+ * 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.
*
- * @param tunnel handle to existing tunnel
- * @param app_type application type that must be supported by the peer (MESH
- * should discover peer in proximity handling this type)
+ * 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_peer_request_connect_by_type (struct GNUNET_MESH_Tunnel *tunnel,
- GNUNET_MESH_ApplicationType app_type)
+GNUNET_MESH_get_tunnels (struct GNUNET_MESH_Handle *h,
+ GNUNET_MESH_TunnelsCB callback,
+ void *callback_cls)
{
- struct GNUNET_MESH_ConnectPeerByType msg;
+ struct GNUNET_MessageHeader msg;
- GNUNET_array_append (tunnel->apps, tunnel->napps, app_type);
+ 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;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "* CONNECT BY TYPE *\n");
- msg.header.size = htons (sizeof (struct GNUNET_MESH_ConnectPeerByType));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD_BY_TYPE);
- msg.tunnel_id = htonl (tunnel->tid);
- msg.type = htonl (app_type);
- send_packet (tunnel->mesh, &msg.header, tunnel);
+ return;
}
/**
- * 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?
+ * Cancel a monitor request. The monitor callback will not be called.
+ *
+ * @param h Mesh handle.
*
- * @param tunnel handle to existing tunnel
- * @param description string describing the destination node requirements
+ * @return Closure given to GNUNET_MESH_monitor, if any.
*/
-void
-GNUNET_MESH_peer_request_connect_by_string (struct GNUNET_MESH_Tunnel *tunnel,
- const char *description)
+void *
+GNUNET_MESH_get_tunnels_cancel (struct GNUNET_MESH_Handle *h)
{
- struct GNUNET_MESH_ConnectPeerByString *m;
- size_t len;
- size_t msgsize;
-
- len = strlen (description);
- msgsize = sizeof(struct GNUNET_MESH_ConnectPeerByString) + len;
- GNUNET_assert (UINT16_MAX > msgsize);
- {
- char buffer[msgsize];
-
- 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);
+ void *cls;
- send_packet (tunnel->mesh, &m->header, tunnel);
- }
+ cls = h->tunnels_cls;
+ h->tunnels_cb = NULL;
+ h->tunnels_cls = NULL;
+ return cls;
}
/**
- * Request that the given peer isn't added to this tunnel in calls to
- * connect_by_* calls, (due to misbehaviour, bad performance, ...).
+ * Request information about a specific tunnel of the running mesh peer.
*
- * @param tunnel handle to existing tunnel.
- * @param peer peer identity of the peer which should be blacklisted
- * for the tunnel.
+ * WARNING: unstable API, likely to change in the future!
+ * FIXME Add destination option.
+ *
+ * @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_peer_blacklist (struct GNUNET_MESH_Tunnel *tunnel,
- const struct GNUNET_PeerIdentity *peer)
+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_PeerControl msg;
+ struct GNUNET_MESH_LocalMonitor msg;
- msg.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_BLACKLIST);
- msg.tunnel_id = htonl (tunnel->tid);
- msg.peer = *peer;
- send_packet (tunnel->mesh, &msg.header, tunnel);
+ msg.header.size = htons (sizeof (msg));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL);
+ 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;
}
/**
- * Request that the given peer isn't blacklisted anymore from this tunnel,
- * and therefore can be added in future calls to connect_by_*.
- * The peer must have been previously blacklisted for this tunnel.
+ * Function called to notify a client about the connection
+ * begin ready to queue more data. "buf" will be
+ * NULL and "size" zero if the connection was closed for
+ * writing in the meantime.
*
- * @param tunnel handle to existing tunnel.
- * @param peer peer identity of the peer which shouldn't be blacklisted
- * for the tunnel anymore.
+ * @param cls closure
+ * @param size number of bytes available in buf
+ * @param buf where the callee should write the message
+ * @return number of bytes written to buf
*/
-void
-GNUNET_MESH_peer_unblacklist (struct GNUNET_MESH_Tunnel *tunnel,
- const struct GNUNET_PeerIdentity *peer)
+static size_t
+mesh_mq_ntr (void *cls, size_t size,
+ void *buf)
{
- struct GNUNET_MESH_PeerControl msg;
+ struct GNUNET_MQ_Handle *mq = cls;
+ struct MeshMQState *state = GNUNET_MQ_impl_state (mq);
+ const struct GNUNET_MessageHeader *msg = GNUNET_MQ_impl_current (mq);
+ uint16_t msize;
- msg.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_UNBLACKLIST);
- msg.tunnel_id = htonl (tunnel->tid);
- msg.peer = *peer;
- send_packet (tunnel->mesh, &msg.header, tunnel);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "mesh-mq",
+ "writing message (t: %u, s: %u) to buffer\n",
+ ntohs (msg->type), ntohs (msg->size));
- return;
+ state->th = NULL;
+ if (NULL == buf)
+ {
+ GNUNET_MQ_inject_error (mq, GNUNET_MQ_ERROR_WRITE);
+ return 0;
+ }
+ msize = ntohs (msg->size);
+ GNUNET_assert (msize <= size);
+ memcpy (buf, msg, msize);
+ GNUNET_MQ_impl_send_continue (mq);
+ return msize;
}
/**
- * Ask the mesh to call "notify" once it is ready to transmit the
- * 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.
+ * Signature of functions implementing the
+ * sending functionality of a message queue.
*
- * @param tunnel tunnel to use for transmission
- * @param cork is corking allowed for this transmission?
- * @param maxdelay how long can the message wait?
- * @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;
- * will be called with NULL on timeout or if the overall queue
- * for this peer is larger than queue_size and this is currently
- * the message with the lowest priority
- * @param notify_cls closure for notify
- * @return non-NULL if the notify callback was queued,
- * NULL if we can not even queue the request (insufficient
- * memory); if NULL is returned, "notify" will NOT be called.
+ * @param mq the message queue
+ * @param msg the message to send
+ * @param impl_state state of the implementation
*/
-struct GNUNET_MESH_TransmitHandle *
-GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Tunnel *tunnel, int cork,
- struct GNUNET_TIME_Relative maxdelay,
- const struct GNUNET_PeerIdentity *target,
- size_t notify_size,
- GNUNET_CONNECTION_TransmitReadyNotify notify,
- void *notify_cls)
+static void
+mesh_mq_send_impl (struct GNUNET_MQ_Handle *mq,
+ const struct GNUNET_MessageHeader *msg, void *impl_state)
{
- struct GNUNET_MESH_TransmitHandle *th;
- size_t overhead;
+ struct MeshMQState *state = impl_state;
+
+ GNUNET_assert (NULL == state->th);
+ GNUNET_MQ_impl_send_commit (mq);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "mesh-mq",
+ "calling ntr for message (t: %u, s: %u)\n",
+ ntohs (msg->type), ntohs (msg->size));
+ state->th =
+ GNUNET_MESH_notify_transmit_ready (state->tunnel,
+ /* FIXME: add option for corking */
+ GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ ntohs (msg->size),
+ mesh_mq_ntr, mq);
- GNUNET_assert (NULL != tunnel);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "mesh notify transmit ready called\n");
- if (NULL != target)
- 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);
- GNUNET_assert (0 == tunnel->packet_size); // Only one data packet allowed
- th = GNUNET_malloc (sizeof (struct GNUNET_MESH_TransmitHandle));
- th->tunnel = tunnel;
- th->timeout = GNUNET_TIME_relative_to_absolute (maxdelay);
- th->target = GNUNET_PEER_intern (target);
- if (tunnel->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
- overhead = sizeof (struct GNUNET_MESH_ToOrigin);
- else if (NULL == target)
- overhead = sizeof (struct GNUNET_MESH_Multicast);
- else
- overhead = sizeof (struct GNUNET_MESH_Unicast);
- 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;
- 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,
- GNUNET_YES, &send_callback,
- tunnel->mesh);
- return th;
}
/**
- * Cancel the specified transmission-ready notification.
+ * Signature of functions implementing the
+ * destruction of a message queue.
+ * Implementations must not free 'mq', but should
+ * take care of 'impl_state'.
*
- * @param th handle that was returned by "notify_transmit_ready".
+ * @param mq the message queue to destroy
+ * @param impl_state state of the implementation
*/
-void
-GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle *th)
+static void
+mesh_mq_destroy_impl (struct GNUNET_MQ_Handle *mq, void *impl_state)
{
- struct GNUNET_MESH_Handle *mesh;
-
- 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))
- {
- /* queue empty, no point in asking for transmission */
- GNUNET_CLIENT_notify_transmit_ready_cancel (mesh->th);
- mesh->th = NULL;
- }
-}
+ struct MeshMQState *state = impl_state;
+ if (NULL != state->th)
+ GNUNET_MESH_notify_transmit_ready_cancel (state->th);
-/**
- * Transition API for tunnel ctx management
- */
-void
-GNUNET_MESH_tunnel_set_data (struct GNUNET_MESH_Tunnel *tunnel, void *data)
-{
- tunnel->ctx = data;
+ GNUNET_free (state);
}
+
/**
- * Transition API for tunnel ctx management
+ * Create a message queue for a mesh tunnel.
+ * The message queue can only be used to transmit messages,
+ * not to receive them.
+ *
+ * @param tunnel the tunnel to create the message qeue for
+ * @return a message queue to messages over the tunnel
*/
-void *
-GNUNET_MESH_tunnel_get_data (struct GNUNET_MESH_Tunnel *tunnel)
+struct GNUNET_MQ_Handle *
+GNUNET_MESH_mq_create (struct GNUNET_MESH_Tunnel *tunnel)
{
- return tunnel->ctx;
+ struct GNUNET_MQ_Handle *mq;
+ struct MeshMQState *state;
+
+ state = GNUNET_new (struct MeshMQState);
+ state->tunnel = tunnel;
+
+ mq = GNUNET_MQ_queue_for_callbacks (mesh_mq_send_impl,
+ mesh_mq_destroy_impl,
+ NULL, /* FIXME: cancel impl. */
+ state,
+ NULL, /* no msg handlers */
+ NULL, /* no err handlers */
+ NULL); /* no handler cls */
+ return mq;
}
-
projects / oweals / gnunet.git / blobdiff