#include "gnunet_util_lib.h"
#include "gnunet_peer_lib.h"
#include "gnunet_mesh2_service.h"
-#include "mesh.h"
-#include "mesh_protocol.h"
+#include "mesh2.h"
+#include "mesh2_protocol.h"
#define LOG(kind,...) GNUNET_log_from (kind, "mesh2-api",__VA_ARGS__)
+/* FIXME: use dynamic values, expose in API */
+#define INITIAL_WINDOW_SIZE 4
+#define ACK_THRESHOLD 2
+/* FIXME END */
+
#define DEBUG_ACK GNUNET_YES
/******************************************************************************/
*/
const struct GNUNET_MESH_MessageHandler *message_handlers;
+ /**
+ * 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.
*/
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;
MESH_TunnelNumber tid;
/**
- * Owner of the tunnel. (1 if the tunnel is a local client).
- */
- GNUNET_PEER_Id owner;
-
- /**
- * Destination of the tunnel.
- */
- GNUNET_PEER_Id destination;
-
- /**
- * Next hop for the tunnel.
+ * Port number.
*/
- GNUNET_PEER_Id next_hop;
+ uint32_t port;
/**
- * Previous hop for the tunnel.
+ * Other end of the tunnel.
*/
- GNUNET_PEER_Id prev_hop;
+ GNUNET_PEER_Id peer;
/**
* Any data the caller wants to put in here
*/
unsigned int packet_size;
- /**
- * Number of applications requested this tunnel
- */
- unsigned int napps;
-
- /**
- * Is the tunnel throttled to the slowest peer?
- */
- int speed_min;
-
/**
* Is the tunnel allowed to buffer?
*/
int buffering;
/**
- * Next packet ID to send.
+ * Maximum allowed PID to send (last ACK recevied).
*/
- uint32_t next_send_pid;
+ uint32_t last_ack_recv;
/**
- * Maximum allowed PID to send (ACK recevied).
+ * Last PID received from the service.
*/
- uint32_t max_send_pid;
+ uint32_t last_pid_recv;
- /**
- * Last pid received from the service.
- */
- uint32_t last_recv_pid;
+ /**
+ * Last packet ID sent to the service.
+ */
+ uint32_t last_pid_sent;
/**
- * Which ACK value have we last sent to the service?
+ * Last ACK value sent to the service: how much are we willing to accept?
*/
- uint32_t max_recv_pid;
+ uint32_t last_ack_sent;
};
t = th->tunnel;
if (GNUNET_NO == th_is_payload (th))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " message internal\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# message internal\n");
return th->size;
}
- if (GNUNET_NO == GMC_is_pid_bigger(t->next_send_pid, t->max_send_pid))
+ if (GNUNET_YES == GMC_is_pid_bigger(t->last_ack_recv, t->last_pid_sent))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " message payload ok (%u <= %u)\n",
- t->next_send_pid, t->max_send_pid);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# message payload ok (%u <= %u)\n",
+ t->last_pid_sent, t->last_ack_recv);
return th->size;
}
}
{
t->tid = tid;
}
- t->max_send_pid = INITIAL_WINDOW_SIZE - 1;
- t->last_recv_pid = (uint32_t) -1;
+ t->last_ack_recv = (uint32_t) -1;
+ t->last_pid_recv = (uint32_t) -1;
+ t->last_ack_sent = (uint32_t) -1;
+ t->last_pid_sent = (uint32_t) -1;
t->buffering = GNUNET_YES;
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);
/* free all peer's ID */
GNUNET_CONTAINER_DLL_remove (h->tunnels_head, h->tunnels_tail, t);
- GNUNET_PEER_change_rc (t->owner, -1);
- GNUNET_PEER_change_rc (t->destination, -1);
- GNUNET_PEER_change_rc (t->next_hop, -1);
- GNUNET_PEER_change_rc (t->prev_hop, -1);
+ GNUNET_PEER_change_rc (t->peer, -1);
/* 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 */
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
*
struct GNUNET_MESH_LocalAck msg;
uint32_t delta;
- delta = t->max_recv_pid - t->last_recv_pid;
+ delta = t->last_ack_sent - t->last_pid_recv;
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);
+ t->tid, t->last_ack_sent, t->last_pid_recv, delta);
return;
}
if (GNUNET_YES == t->buffering)
- t->max_recv_pid = t->last_recv_pid + INITIAL_WINDOW_SIZE;
+ t->last_ack_sent = t->last_pid_recv + INITIAL_WINDOW_SIZE;
else
- t->max_recv_pid = t->last_recv_pid + 1;
+ t->last_ack_sent = t->last_pid_recv + 1;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Sending ACK on tunnel %X: %u\n",
- t->tid, t->max_recv_pid);
+ t->tid, t->last_ack_sent);
msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK);
msg.header.size = htons (sizeof (msg));
msg.tunnel_id = htonl (t->tid);
- msg.max_pid = htonl (t->max_recv_pid);
+ msg.max_pid = htonl (t->last_ack_sent);
#if DEBUG_ACK
t->mesh->acks_sent++;
size_t size;
size = sizeof (struct GNUNET_MESH_ClientConnect);
- size += h->n_handlers * sizeof (uint16_t);
+ size += h->n_ports * sizeof (uint32_t);
{
char buf[size] GNUNET_ALIGN;
struct GNUNET_MESH_ClientConnect *msg;
- 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);
- types = (uint16_t *) & apps[napps];
- for (ntypes = 0; ntypes < h->n_handlers; ntypes++)
+ ports = (uint32_t *) &msg[1];
+ for (i = 0; i < h->n_ports; i++)
{
- types[ntypes] = htons (h->message_handlers[ntypes].type);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " type %u\n",
- h->message_handlers[ntypes].type);
+ ports[i] = htonl (h->ports[i]);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " port %u\n",
+ h->ports[i]);
}
- 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");
for (t = h->tunnels_head; NULL != t; t = t->next)
{
struct GNUNET_MESH_TunnelMessage tmsg;
- struct GNUNET_MESH_PeerControl pmsg;
if (t->tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
{
*/
continue;
}
- t->next_send_pid = 0;
- t->max_send_pid = INITIAL_WINDOW_SIZE - 1;
- t->last_recv_pid = (uint32_t) -1;
+ t->last_ack_sent = (uint32_t) -1;
+ t->last_pid_sent = (uint32_t) -1;
+ t->last_ack_recv = (uint32_t) -1;
+ t->last_pid_recv = (uint32_t) -1;
tmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
tmsg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));
tmsg.tunnel_id = htonl (t->tid);
+ GNUNET_PEER_resolve (t->peer, &tmsg.peer);
send_packet (h, &tmsg.header, t);
- 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);
-
- /* 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;
-
- 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);
}
return GNUNET_YES;
}
}
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->last_ack_sent = INITIAL_WINDOW_SIZE - 1;
+ t->peer = GNUNET_PEER_intern (&msg->peer);
+ GNUNET_PEER_change_rc (t->peer, 1);
t->mesh = h;
t->tid = tid;
- if ((msg->opt & MESH_TUNNEL_OPT_NOBUFFER) != 0)
+ t->port = ntohl (msg->port);
+ if (0 != (msg->opt & MESH_TUNNEL_OPT_NOBUFFER))
t->buffering = GNUNET_NO;
else
t->buffering = GNUNET_YES;
- if ((msg->opt & MESH_TUNNEL_OPT_SPEED_MIN) != 0)
- t->speed_min = GNUNET_YES;
- atsi.type = 0;
- atsi.value = 0;
LOG (GNUNET_ERROR_TYPE_DEBUG, " created tunnel %p\n", t);
- t->ctx = h->new_tunnel (h->cls, t, &msg->peer, &atsi);
+ t->ctx = h->new_tunnel (h->cls, t, &msg->peer, t->port);
LOG (GNUNET_ERROR_TYPE_DEBUG, "User notified\n");
}
else
{
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
*
const struct GNUNET_MessageHeader *payload;
const struct GNUNET_MESH_MessageHandler *handler;
const struct GNUNET_PeerIdentity *peer;
+ struct GNUNET_PeerIdentity id;
struct GNUNET_MESH_Unicast *ucast;
- struct GNUNET_MESH_Multicast *mcast;
struct GNUNET_MESH_ToOrigin *to_orig;
struct GNUNET_MESH_Tunnel *t;
unsigned int i;
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;
- pid = ntohl (mcast->pid);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " mcast on tunnel %s [%X]\n",
- GNUNET_i2s (peer), ntohl (mcast->tid));
- break;
case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
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;
+ GNUNET_PEER_resolve (t->peer, &id);
+ peer = &id;
pid = ntohl (to_orig->pid);
LOG (GNUNET_ERROR_TYPE_DEBUG, " torig on tunnel %s [%X]\n",
GNUNET_i2s (peer), ntohl (to_orig->tid));
return GNUNET_YES;
}
if (GNUNET_YES ==
- GMC_is_pid_bigger(pid, t->max_recv_pid))
+ GMC_is_pid_bigger(pid, t->last_ack_sent))
{
GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_WARNING,
- " unauthorized message! (%u, max %u)\n",
- pid, t->max_recv_pid);
+ " unauthorized message! (%u, ACK %u)\n",
+ pid, t->last_ack_sent);
// FIXME fc what now? accept? reject?
return GNUNET_YES;
}
- t->last_recv_pid = pid;
+ t->last_pid_recv = pid;
type = ntohs (payload->type);
send_ack (h, t);
for (i = 0; i < h->n_handlers; i++)
handler = &h->message_handlers[i];
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, peer, payload))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "callback caused disconnection\n");
GNUNET_MESH_disconnect (h);
}
ack = ntohl (msg->max_pid);
LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X, ack %u!\n", t->tid, ack);
- if (GNUNET_YES == GMC_is_pid_bigger(ack, t->max_send_pid))
- t->max_send_pid = ack;
+ if (GNUNET_YES == GMC_is_pid_bigger(ack, t->last_ack_recv))
+ t->last_ack_recv = ack;
else
return;
if (NULL == h->th && 0 < t->packet_size)
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_LocalMonitor *msg;
- uint32_t npeers;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Get Tunnels messasge received\n");
}
msg = (struct GNUNET_MESH_LocalMonitor *) message;
- npeers = ntohl (msg->npeers);
if (ntohs (message->size) !=
(sizeof (struct GNUNET_MESH_LocalMonitor) +
- npeers * sizeof (struct GNUNET_PeerIdentity)))
+ sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break_op (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Get tunnels message: size %hu - expected %u (%u peers)\n",
+ "Get tunnels message: size %hu - expected %u\n",
ntohs (message->size),
- sizeof (struct GNUNET_MESH_LocalMonitor) +
- npeers * sizeof (struct GNUNET_PeerIdentity),
- npeers);
+ sizeof (struct GNUNET_MESH_LocalMonitor));
return;
}
h->tunnels_cb (h->tunnels_cls,
- &msg->owner,
ntohl (msg->tunnel_id),
- (struct GNUNET_PeerIdentity *) &msg[1],
- npeers);
+ &msg->owner,
+ &msg->destination);
}
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");
/* 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",
+ "Show tunnel message: size %hu - expected %u\n",
ntohs (message->size),
- esize,
- npeers);
+ esize);
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]]);
+ h->tunnel_cb (h->tunnel_cls,
+ &msg->destination,
+ &msg->owner);
}
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:
size_t nsize;
LOG (GNUNET_ERROR_TYPE_DEBUG, "\n");
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Send packet() Buffer %u\n", size);
+ 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;
t = th->tunnel;
if (GNUNET_YES == th_is_payload (th))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " payload\n");
- if (GNUNET_YES == GMC_is_pid_bigger(t->next_send_pid, t->max_send_pid))
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# payload\n");
+ if (GNUNET_NO == GMC_is_pid_bigger(t->last_ack_recv, t->last_pid_sent))
{
/* This tunnel is not ready to transmit yet, try next message */
next = th->next;
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 %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# to origin, type %s\n",
GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
if (psize > 0)
{
to.header.size = htons (psize);
to.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
to.tid = htonl (t->tid);
- to.pid = htonl (t->next_send_pid);
+ to.pid = htonl (t->last_pid_sent + 1);
to.ttl = 0;
memset (&to.oid, 0, sizeof (struct GNUNET_PeerIdentity));
- memset (&to.sender, 0, sizeof (struct GNUNET_PeerIdentity));
memcpy (cbuf, &to, sizeof (to));
}
}
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 %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# unicast, type %s\n",
GNUNET_MESH_DEBUG_M2S (ntohs (mh->type)));
if (psize > 0)
{
uc.header.size = htons (psize);
uc.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_UNICAST);
uc.tid = htonl (t->tid);
- uc.pid = htonl (t->next_send_pid);
+ uc.pid = htonl (t->last_pid_sent + 1);
uc.ttl = 0;
memset (&uc.oid, 0, sizeof (struct GNUNET_PeerIdentity));
- GNUNET_PEER_resolve (th->target, &uc.destination);
memcpy (cbuf, &uc, sizeof (uc));
}
}
- t->next_send_pid++;
+ t->last_pid_sent++;
}
else
{
struct GNUNET_MessageHeader *mh = (struct GNUNET_MessageHeader *) &th[1];
- LOG (GNUNET_ERROR_TYPE_DEBUG, " mesh traffic, type %s\n",
+ 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;
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;
size = message_ready_size (h);
if (0 != size)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " next size: %u\n", size);
+ 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,
else
{
if (NULL != h->th_head)
- LOG (GNUNET_ERROR_TYPE_DEBUG, " can't transmit any more\n");
+ 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;
}
/********************** 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;
- size_t size;
LOG (GNUNET_ERROR_TYPE_DEBUG, "GNUNET_MESH_connect()\n");
h = GNUNET_malloc (sizeof (struct GNUNET_MESH_Handle));
}
h->cls = cls;
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 apps */
- for (h->n_applications = 0;
- stypes && stypes[h->n_applications];
- h->n_applications++) ;
- if (0 < h->n_applications)
- {
- size = h->n_applications * sizeof (GNUNET_MESH_ApplicationType *);
- h->applications = GNUNET_malloc (size);
- memcpy (h->applications, stypes, size);
- }
/* 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;
GNUNET_SCHEDULER_cancel(handle->reconnect_task);
handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_free_non_null (handle->applications);
GNUNET_free (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.
- * @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,
- unsigned int compression_characters)
-{
- struct GNUNET_MESH_RegexAnnounce *msg;
- size_t payload;
- size_t len;
- size_t msgsize;
- size_t offset;
- char buffer[UINT16_MAX];
-
- len = strlen (regex);
- 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
- {
- msgsize = (len - offset > payload) ? payload : len - offset;
- memcpy (&msg[1], ®ex[offset], msgsize);
- offset += msgsize;
- msgsize += sizeof(struct GNUNET_MESH_RegexAnnounce);
-
- msg->header.size = htons (msgsize);
- msg->last = htons (offset >= len);
-
- send_packet (h, &msg->header, NULL);
- } while (len > offset);
-}
-
-/**
- * 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
- */
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)
{
struct GNUNET_MESH_Tunnel *t;
struct GNUNET_MESH_TunnelMessage msg;
t = create_tunnel (h, 0);
LOG (GNUNET_ERROR_TYPE_DEBUG, " at %p\n", t);
LOG (GNUNET_ERROR_TYPE_DEBUG, " number %X\n", t->tid);
- t->connect_handler = connect_handler;
- t->disconnect_handler = disconnect_handler;
- t->cls = handler_cls;
t->ctx = tunnel_ctx;
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;
send_packet (h, &msg.header, t);
return t;
}
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.
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);
add_to_queue (tunnel->mesh, th);
if (NULL != tunnel->mesh->th)
return th;
- if (GMC_is_pid_bigger(tunnel->next_send_pid, tunnel->max_send_pid))
+ if (!GMC_is_pid_bigger (tunnel->last_ack_recv, tunnel->last_pid_sent))
return th;
- LOG (GNUNET_ERROR_TYPE_DEBUG, " call notify tmt rdy\n");
+ 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,
* Request information about a specific tunnel of the running mesh peer.
*
* 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.
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;
projects / oweals / gnunet.git / blobdiff