*/
/**
- * @file mesh/gnunet-service-mesh.c
+ * @file mesh/gnunet-service-mesh-new.c
* @brief GNUnet MESH service
* @author Bartlomiej Polot
*
- * STRUCTURE:
- * - DATA STRUCTURES
- * - GLOBAL VARIABLES
- * - GENERAL HELPERS
- * - PERIODIC FUNCTIONS
- * - MESH NETWORK HANDLER HELPERS
- * - MESH NETWORK HANDLES
- * - MESH LOCAL HANDLER HELPERS
- * - MESH LOCAL HANDLES
- * - MAIN FUNCTIONS (main & run)
- *
* TODO:
- * - error reporting (CREATE/CHANGE/ADD/DEL?) -- new message!
- * - partial disconnect reporting -- same as error reporting?
- * - add ping message
* - relay corking down to core
- * - set ttl relative to tree depth
- * - Add data ACK count in path ACK
- * - Make common GNUNET_MESH_Data header for unicast, to_orig, multicast
+ * - set ttl relative to path length
+ * - add signatures
+ * - add encryption
+ * - add port numbers
* TODO END
*/
#include "platform.h"
#include "mesh2.h"
#include "mesh2_protocol.h"
-#include "mesh_tunnel_tree.h"
+#include "mesh_path.h"
#include "block_mesh.h"
#include "gnunet_dht_service.h"
#include "gnunet_statistics_service.h"
*/
struct MESH_TunnelID id;
+ /**
+ * Port of the tunnel.
+ */
+ uint32_t port;
+
+ /**
+ * State of the tunnel.
+ */
+ enum MeshTunnelState state;
+
/**
* Local tunnel number ( >= GNUNET_MESH_LOCAL_TUNNEL_ID_CLI or 0 )
*/
/**
* Struct containing information about a client of the service
*
- * TODO: add a list of 'waiting' types
+ * TODO: add a list of 'waiting' ports
*/
struct MeshClient
{
struct GNUNET_SERVER_Client *handle;
/**
- * Messages that this client has declared interest in.
+ * Ports that this client has declared interest in.
* Indexed by a GMC_hash32 (type), contains *Client.
*/
- struct GNUNET_CONTAINER_MultiHashMap *types;
+ struct GNUNET_CONTAINER_MultiHashMap *ports;
/**
* Whether the client is active or shutting down (don't send confirmations
}
#endif
+/* FIXME */
unsigned int debug_fwd_ack;
unsigned int debug_bck_ack;
static MESH_TunnelNumber next_local_tid;
/**
- * All message types clients of this peer are interested in.
+ * All ports clients of this peer have opened.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *types;
+static struct GNUNET_CONTAINER_MultiHashMap *ports;
/**
* Task to periodically announce itself in the network.
}
}
+/**
+ * Notify the appropiate client that a new incoming tunnel was created.
+ *
+ * @param t Tunnel that was created.
+ */
+static void
+send_client_tunnel_create (struct MeshTunnel *t)
+{
+ struct GNUNET_MESH_TunnelMessage msg;
+
+ if (NULL == t->client)
+ return;
+ msg.header.size = htons (sizeof (msg));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
+ msg.tunnel_id = htonl (t->local_tid_dest);
+ msg.port = htonl (t->port);
+ GNUNET_SERVER_notification_context_unicast (nc, t->client->handle,
+ &msg.header, GNUNET_NO);
+}
+
/**
- * Notify all clients (not depending on registration status) that the incoming
- * tunnel is no longer valid.
+ * Notify dest client that the incoming tunnel is no longer valid.
*
* @param t Tunnel that was destroyed.
*/
switch (type)
{
struct GNUNET_MESH_Unicast *u;
- struct GNUNET_MESH_ToOrigin *to;
case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
u = (struct GNUNET_MESH_Unicast *) data;
u->ttl = htonl (ntohl (u->ttl) - 1);
break;
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- to = (struct GNUNET_MESH_ToOrigin *) data;
- t->prev_fc.last_pid_sent++; /* FIXME per hop? */
- to->pid = htonl (t->prev_fc.last_pid_sent);
}
GNUNET_PEER_resolve (peer, &id);
neighbor = peer_get (&id);
* Sends a CREATE PATH message for a path to a peer, properly registrating
* all used resources.
*
- * @param peer PeerInfo of the final peer for whom this path is being created.
- * @param p Path itself.
* @param t Tunnel for which the path is created.
*/
static void
-send_create_path (struct MeshPeerInfo *peer, struct MeshPeerPath *p,
- struct MeshTunnel *t)
+send_create_path (struct MeshTunnel *t)
{
struct MeshPeerInfo *neighbor;
- if (NULL == p)
- {
- GNUNET_break (0);
- return;
- }
-
neighbor = peer_get_short (t->next_hop);
queue_add (t,
GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE,
- sizeof (struct GNUNET_MESH_ManipulatePath) +
- (p->length * sizeof (struct GNUNET_PeerIdentity)),
+ sizeof (struct GNUNET_MESH_CreateTunnel) +
+ (t->path->length * sizeof (struct GNUNET_PeerIdentity)),
neighbor,
t);
+ t->state = MESH_TUNNEL_WAITING;
}
/**
- * Try to establish a new connection to this peer in the fiven tunnel.
+ * Try to establish a new connection to this peer in the given tunnel.
* If the peer doesn't have any path to it yet, try to get one.
* If the peer already has some path, send a CREATE PATH towards it.
*
{
p = peer_get_best_path (peer, t);
tunnel_use_path (t, p);
- send_create_path (peer, p, t);
+ send_create_path (t);
}
else if (NULL == peer->dhtget)
{
NULL, /* xquery */
0, /* xquery bits */
&dht_get_id_handler, peer);
+ t->state = MESH_TUNNEL_SEARCHING;
}
/* Otherwise, there is no path but the DHT get is already started. */
}
msg.header.size = htons (sizeof (msg));
msg.tid = htonl (t->id.tid);
GNUNET_PEER_resolve (t->id.oid, &msg.oid);
- msg.last_ack = htonl (fc->last_ack_recv);
if (fc == &t->prev_fc)
{
peer = t->prev_hop;
}
- else
+ else if (fc == &t->next_fc)
{
peer = t->next_hop;
}
+ else
+ {
+ GNUNET_break (0);
+ return;
+ }
send_prebuilt_message (&msg.header, peer, t);
fc->poll_time = GNUNET_TIME_STD_BACKOFF (fc->poll_time);
fc->poll_task = GNUNET_SCHEDULER_add_delayed (fc->poll_time,
GNUNET_break (0);
}
+ /* TODO: Check if we need to transmit the ACK (as in fwd) */
+
ack = t->next_fc.last_pid_recv + t->queue_max - t->prev_fc.queue_n;
if (t->next_fc.last_ack_sent == ack && GNUNET_NO == t->force_ack)
if (GNUNET_MESSAGE_TYPE_MESH_UNICAST == pq->type ||
GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN == pq->type)
{
- // Should have been removed on destroy children
+ /* Should have been removed on destroy children */
GNUNET_break (0);
}
queue_destroy (pq, GNUNET_YES);
send_core_path_create (void *cls, size_t size, void *buf)
{
struct MeshTunnel *t = cls;
- struct GNUNET_MESH_ManipulatePath *msg;
+ struct GNUNET_MESH_CreateTunnel *msg;
struct GNUNET_PeerIdentity *peer_ptr;
struct MeshPeerPath *p = t->path;
size_t size_needed;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CREATE PATH sending...\n");
size_needed =
- sizeof (struct GNUNET_MESH_ManipulatePath) +
+ sizeof (struct GNUNET_MESH_CreateTunnel) +
p->length * sizeof (struct GNUNET_PeerIdentity);
if (size < size_needed || NULL == buf)
GNUNET_break (0);
return 0;
}
- msg = (struct GNUNET_MESH_ManipulatePath *) buf;
+ msg = (struct GNUNET_MESH_CreateTunnel *) buf;
msg->header.size = htons (size_needed);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE);
msg->tid = ntohl (t->id.tid);
opt = 0;
if (GNUNET_YES == t->nobuffer)
opt |= MESH_TUNNEL_OPT_NOBUFFER;
- msg->opt = htonl(opt);
- msg->reserved = 0;
+ msg->opt = htonl (opt);
+ msg->port = htonl (t->port);
peer_ptr = (struct GNUNET_PeerIdentity *) &msg[1];
for (i = 0; i < p->length; i++)
switch (type)
{
case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
+ t->next_fc.last_pid_sent = ((struct GNUNET_MESH_Unicast *) buf)->pid;
tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_UNICAST);
break;
case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
+ t->prev_fc.last_pid_sent = ((struct GNUNET_MESH_ToOrigin *) buf)->pid;
tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
break;
default:
GNUNET_STATISTICS_update(stats,
"# messages dropped (buffer full)",
1, GNUNET_NO);
- return; // Drop message
+ return; /* Drop message */
}
(*n)++;
}
uint16_t size;
uint16_t i;
MESH_TunnelNumber tid;
- struct GNUNET_MESH_ManipulatePath *msg;
+ struct GNUNET_MESH_CreateTunnel *msg;
struct GNUNET_PeerIdentity *pi;
struct GNUNET_HashCode hash;
struct MeshPeerPath *path;
"Received a path create msg [%s]\n",
GNUNET_i2s (&my_full_id));
size = ntohs (message->size);
- if (size < sizeof (struct GNUNET_MESH_ManipulatePath))
+ if (size < sizeof (struct GNUNET_MESH_CreateTunnel))
{
GNUNET_break_op (0);
return GNUNET_OK;
}
- size -= sizeof (struct GNUNET_MESH_ManipulatePath);
+ size -= sizeof (struct GNUNET_MESH_CreateTunnel);
if (size % sizeof (struct GNUNET_PeerIdentity))
{
GNUNET_break_op (0);
return GNUNET_OK;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " path has %u hops.\n", size);
- msg = (struct GNUNET_MESH_ManipulatePath *) message;
+ msg = (struct GNUNET_MESH_CreateTunnel *) message;
tid = ntohl (msg->tid);
pi = (struct GNUNET_PeerIdentity *) &msg[1];
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" path is for tunnel %s [%X].\n", GNUNET_i2s (pi), tid);
t = tunnel_get (pi, tid);
- if (NULL == t) // FIXME only for INCOMING tunnels?
+ if (NULL == t)
{
uint32_t opt;
t = tunnel_new (GNUNET_PEER_intern (pi), tid, NULL, 0);
if (NULL == t)
{
- // FIXME notify failure
+ GNUNET_break (0);
return GNUNET_OK;
}
+ t->port = ntohl (msg->port);
opt = ntohl (msg->opt);
if (0 != (opt & MESH_TUNNEL_OPT_NOBUFFER))
{
t->nobuffer = GNUNET_YES;
t->prev_fc.last_ack_sent = t->prev_fc.last_pid_recv + 1;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " nobuffer:%d\n", t->nobuffer);
-
- if (GNUNET_YES == t->nobuffer)
- {
+ t->next_fc.last_ack_sent = t->next_fc.last_pid_recv + 1;
t->queue_max = 1;
}
-
- // FIXME only assign a local tid if a local client is interested (on demand)
- while (NULL != tunnel_get_incoming (next_local_tid))
- next_local_tid = (next_local_tid + 1) | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
- t->local_tid_dest = next_local_tid++;
- next_local_tid = next_local_tid | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
- // FIXME end
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " nobuffer:%d\n", t->nobuffer);
tunnel_reset_timeout (t);
GMC_hash32 (t->local_tid_dest, &hash);
return GNUNET_OK;
}
}
+ else
+ {
+ GNUNET_break_op (0);
+ }
+ t->state = MESH_TUNNEL_WAITING;
dest_peer_info =
GNUNET_CONTAINER_multihashmap_get (peers, &pi[size - 1].hashPubKey);
if (NULL == dest_peer_info)
GNUNET_PEER_change_rc (t->prev_hop, 1);
if (own_pos == size - 1)
{
- /* It is for us! Send ack. */
+ struct MeshClient *c;
+ struct GNUNET_HashCode hc;
+
+ /* Find target client */
+ GMC_hash32 (t->port, &hc);
+ c = GNUNET_CONTAINER_multihashmap_get (ports, &hc);
+ if (NULL == c)
+ {
+ /* TODO send reject */
+ return GNUNET_OK;
+ }
+ t->client = c;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " It's for us!\n");
- peer_info_add_path_to_origin (orig_peer_info, path, GNUNET_NO);
+ peer_info_add_path_to_origin (orig_peer_info, path, GNUNET_YES);
t->dest = myid;
+
+ /* Assign local tid */
+ while (NULL != tunnel_get_incoming (next_local_tid))
+ next_local_tid = (next_local_tid + 1) | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
+ t->local_tid_dest = next_local_tid++;
+ next_local_tid = next_local_tid | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
+
+ send_client_tunnel_create (t);
send_path_ack (t);
}
else
peer_info_add_path (dest_peer_info, path2, GNUNET_NO);
path2 = path_duplicate (path);
peer_info_add_path_to_origin (orig_peer_info, path2, GNUNET_NO);
- send_create_path (dest_peer_info, path, t);
+ send_create_path (t);
}
return GNUNET_OK;
}
-/**
- * Core handler for path destruction
- *
- * @param cls closure
- * @param message message
- * @param peer peer identity this notification is about
- *
- * @return GNUNET_OK to keep the connection open,
- * GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
-{
- struct GNUNET_MESH_ManipulatePath *msg;
- struct GNUNET_PeerIdentity *pi;
- struct MeshPeerPath *path;
- struct MeshTunnel *t;
- unsigned int own_pos;
- unsigned int i;
- size_t size;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received a PATH DESTROY msg from %s\n", GNUNET_i2s (peer));
- size = ntohs (message->size);
- if (size < sizeof (struct GNUNET_MESH_ManipulatePath))
- {
- GNUNET_break_op (0);
- return GNUNET_OK;
- }
-
- size -= sizeof (struct GNUNET_MESH_ManipulatePath);
- if (size % sizeof (struct GNUNET_PeerIdentity))
- {
- GNUNET_break_op (0);
- return GNUNET_OK;
- }
- size /= sizeof (struct GNUNET_PeerIdentity);
- if (size < 2)
- {
- GNUNET_break_op (0);
- return GNUNET_OK;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " path has %u hops.\n", size);
-
- msg = (struct GNUNET_MESH_ManipulatePath *) message;
- pi = (struct GNUNET_PeerIdentity *) &msg[1];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " path is for tunnel %s [%X].\n", GNUNET_i2s (pi),
- msg->tid);
- t = tunnel_get (pi, ntohl (msg->tid));
- if (NULL == t)
- {
- /* TODO notify back: we don't know this tunnel */
- GNUNET_break_op (0);
- return GNUNET_OK;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Creating path...\n");
- path = path_new (size);
- own_pos = 0;
- for (i = 0; i < size; i++)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ... adding %s\n",
- GNUNET_i2s (&pi[i]));
- path->peers[i] = GNUNET_PEER_intern (&pi[i]);
- if (path->peers[i] == myid)
- own_pos = i;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Own position: %u\n", own_pos);
- if (own_pos < path->length - 1)
- send_prebuilt_message (message, path->peers[own_pos + 1], t);
- else
- send_client_tunnel_destroy (t);
-
-// tunnel_delete_peer (t, path->peers[path->length - 1]); FIXME
- path_destroy (path);
- return GNUNET_OK;
-}
-
-
/**
* Core handler for notifications of broken paths
*
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
-handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
+handle_mesh_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_Unicast *msg;
" pid %u not seen yet, forwarding\n", pid);
}
- t->prev_fc.last_pid_recv = pid;
-
if (GMC_is_pid_bigger (pid, t->prev_fc.last_ack_sent))
{
GNUNET_STATISTICS_update (stats, "# unsolicited unicast", 1, GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received PID %u, ACK %u\n",
pid, t->prev_fc.last_ack_sent);
+ tunnel_send_fwd_ack(t, GNUNET_MESSAGE_TYPE_MESH_POLL);
return GNUNET_OK;
}
+ t->prev_fc.last_pid_recv = pid;
tunnel_reset_timeout (t);
if (t->dest == myid)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" not for us, retransmitting...\n");
- if (GNUNET_YES == t->nobuffer &&
- GNUNET_YES == GMC_is_pid_bigger (pid, t->next_fc.last_ack_recv))
- {
- GNUNET_STATISTICS_update (stats, "# unsolicited unicast", 1, GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, " %u > %u\n",
- pid, t->next_fc.last_ack_recv);
- GNUNET_break_op (0);
- return GNUNET_OK;
- }
send_prebuilt_message (message, t->next_hop, t);
GNUNET_STATISTICS_update (stats, "# unicast forwarded", 1, GNUNET_NO);
return GNUNET_OK;
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
-handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
+handle_mesh_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_ToOrigin *msg;
- struct MeshPeerInfo *peer_info;
struct MeshTunnel *t;
size_t size;
uint32_t pid;
return GNUNET_OK;
}
-
if (t->next_fc.last_pid_recv == pid)
{
/* already seen this packet, drop */
return GNUNET_OK;
}
+ if (GMC_is_pid_bigger (pid, t->next_fc.last_ack_sent))
+ {
+ GNUNET_STATISTICS_update (stats, "# unsolicited to_orig", 1, GNUNET_NO);
+ GNUNET_break_op (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received PID %u, ACK %u\n",
+ pid, t->next_fc.last_ack_sent);
+ tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_POLL);
+ return GNUNET_OK;
+ }
+ t->next_fc.last_pid_recv = pid;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" pid %u not seen yet, forwarding\n", pid);
- t->next_fc.last_pid_recv = pid;
if (NULL != t->owner)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" not for us, retransmitting...\n");
- peer_info = peer_get (&msg->oid);
- if (NULL == peer_info)
- {
- /* unknown origin of tunnel */
- GNUNET_break (0);
- return GNUNET_OK;
- }
if (0 == t->prev_hop) /* No owner AND no prev hop */
{
if (GNUNET_YES == t->destroy)
"from peer %s\n",
GNUNET_i2s (peer));
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "for tunnel %s [%X]\n",
+ "on tunnel %s [%X]\n",
GNUNET_i2s (&msg->oid), ntohl(msg->tid));
return GNUNET_OK;
}
{
struct GNUNET_MESH_ACK *msg;
struct MeshTunnel *t;
+ GNUNET_PEER_Id id;
uint32_t ack;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got an ACK packet from %s!\n",
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ACK %u\n", ack);
/* Is this a forward or backward ACK? */
- if (t->prev_hop != GNUNET_PEER_search (peer))
+ id = GNUNET_PEER_search (peer);
+ if (t->next_hop == id)
{
- debug_bck_ack++;
+ debug_fwd_ack++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " FWD ACK\n");
if (GNUNET_SCHEDULER_NO_TASK != t->next_fc.poll_task &&
GMC_is_pid_bigger (ack, t->next_fc.last_ack_recv))
peer_unlock_queue (t->next_hop);
tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_ACK);
}
- else
+ else if (t->prev_hop == id)
{
+ debug_bck_ack++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " BCK ACK\n");
if (GNUNET_SCHEDULER_NO_TASK != t->prev_fc.poll_task &&
GMC_is_pid_bigger (ack, t->prev_fc.last_ack_recv))
peer_unlock_queue (t->prev_hop);
tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_ACK);
}
+ else
+ GNUNET_break_op (0);
return GNUNET_OK;
}
{
struct GNUNET_MESH_Poll *msg;
struct MeshTunnel *t;
+ GNUNET_PEER_Id id;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got an POLL packet from %s!\n",
GNUNET_i2s (peer));
}
/* Is this a forward or backward ACK? */
- if (t->prev_hop != GNUNET_PEER_search(peer))
+ id = GNUNET_PEER_search(peer);
+ if (t->next_hop == id)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " from FWD\n");
- /* FIXME cinfo->bck_ack = cinfo->fwd_pid; // mark as ready to send */
tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_POLL);
}
- else
+ else if (t->prev_hop == id)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " from BCK\n");
tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_POLL);
}
+ else
+ GNUNET_break (0);
return GNUNET_OK;
}
{
GNUNET_break (0);
}
+ t->state = MESH_TUNNEL_READY;
/* Message for us? */
if (0 == memcmp (&msg->oid, &my_full_id, sizeof (struct GNUNET_PeerIdentity)))
*/
static struct GNUNET_CORE_MessageHandler core_handlers[] = {
{&handle_mesh_path_create, GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE, 0},
- {&handle_mesh_path_destroy, GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY, 0},
{&handle_mesh_path_broken, GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN,
sizeof (struct GNUNET_MESH_PathBroken)},
{&handle_mesh_tunnel_destroy, GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY,
sizeof (struct GNUNET_MESH_TunnelDestroy)},
- {&handle_mesh_data_unicast, GNUNET_MESSAGE_TYPE_MESH_UNICAST, 0},
+ {&handle_mesh_unicast, GNUNET_MESSAGE_TYPE_MESH_UNICAST, 0},
{&handle_mesh_keepalive, GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE,
sizeof (struct GNUNET_MESH_TunnelKeepAlive)},
- {&handle_mesh_data_to_orig, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN, 0},
+ {&handle_mesh_to_orig, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN, 0},
{&handle_mesh_ack, GNUNET_MESSAGE_TYPE_MESH_ACK,
sizeof (struct GNUNET_MESH_ACK)},
{&handle_mesh_poll, GNUNET_MESSAGE_TYPE_MESH_POLL,
* @param type type of the result
* @param size number of bytes in data
* @param data pointer to the result data
- *
- * TODO: re-issue the request after certain time? cancel after X results?
*/
static void
dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
path_destroy (p);
for (i = 0; i < peer->ntunnels; i++)
{
- peer_connect (peer, peer->tunnels[i]); // FIXME add if
+ if (peer->tunnels[i]->state == MESH_TUNNEL_SEARCHING)
+ peer_connect (peer, peer->tunnels[i]);
}
return;
GNUNET_CONTAINER_multihashmap_destroy (c->own_tunnels);
GNUNET_CONTAINER_multihashmap_destroy (c->incoming_tunnels);
- if (NULL != c->types)
- GNUNET_CONTAINER_multihashmap_destroy (c->types);
+ if (NULL != c->ports)
+ GNUNET_CONTAINER_multihashmap_destroy (c->ports);
next = c->next;
GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, c);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " CLIENT FREE at %p\n", c);
struct GNUNET_MESH_ClientConnect *cc_msg;
struct MeshClient *c;
unsigned int size;
- uint16_t ntypes;
- uint16_t *t;
- uint16_t i;
+ uint32_t *p;
+ unsigned int i;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "new client connected\n");
/* Check data sanity */
size = ntohs (message->size) - sizeof (struct GNUNET_MESH_ClientConnect);
cc_msg = (struct GNUNET_MESH_ClientConnect *) message;
- ntypes = ntohs (cc_msg->types);
- if (size != ntypes * sizeof (uint16_t))
+ if (0 != (size % sizeof (uint32_t)))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
+ size /= sizeof (uint32_t);
/* Create new client structure */
c = GNUNET_malloc (sizeof (struct MeshClient));
- c->id = next_client_id++; // overflow not important: just for debug
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " CLIENT NEW %u\n", c->id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client has %u types\n", ntypes);
+ c->id = next_client_id++; /* overflow not important: just for debug */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client id %u\n", c->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client has %u ports\n", size);
c->handle = client;
GNUNET_SERVER_client_keep (client);
- if (ntypes > 0)
+ if (size > 0)
{
- uint16_t u16;
+ uint32_t u32;
struct GNUNET_HashCode hc;
- t = (uint16_t *) &cc_msg[1];
- c->types = GNUNET_CONTAINER_multihashmap_create (ntypes, GNUNET_NO);
- for (i = 0; i < ntypes; i++)
+ p = (uint32_t *) &cc_msg[1];
+ c->ports = GNUNET_CONTAINER_multihashmap_create (size, GNUNET_NO);
+ for (i = 0; i < size; i++)
{
- u16 = ntohs (t[i]);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " msg type: %u\n", u16);
- GMC_hash32 ((uint32_t) u16, &hc);
+ u32 = ntohl (p[i]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " port: %u\n", u32);
+ GMC_hash32 (u32, &hc);
- /* store in clients hashmap */
- GNUNET_CONTAINER_multihashmap_put (c->types, &hc, c,
+ /* store in client's hashmap */
+ GNUNET_CONTAINER_multihashmap_put (c->ports, &hc, c,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
/* store in global hashmap */
- GNUNET_CONTAINER_multihashmap_put (types, &hc, c,
+ /* FIXME only allow one client to have the port open,
+ * have a backup hashmap with waiting clients */
+ GNUNET_CONTAINER_multihashmap_put (ports, &hc, c,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
}
}
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
+ t->port = ntohl (t->port);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CREATED TUNNEL %s [%x] (%x)\n",
GNUNET_i2s (&my_full_id), t->id.tid, t->local_tid);
copy->ttl = htonl (default_ttl);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" calling generic handler...\n");
- handle_mesh_data_unicast (NULL, &my_full_id, ©->header);
+ handle_mesh_unicast (NULL, &my_full_id, ©->header);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "receive done OK\n");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- fc->last_pid_recv++;
/* Ok, everything is correct, send the message
* (pretend we got it from a mesh peer)
GNUNET_PEER_resolve (t->id.oid, ©->oid);
copy->tid = htonl (t->id.tid);
copy->ttl = htonl (default_ttl);
- copy->pid = htonl (t->prev_fc.last_pid_sent + 1);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" calling generic handler...\n");
- handle_mesh_data_to_orig (NULL, &my_full_id, ©->header);
+ handle_mesh_to_orig (NULL, &my_full_id, ©->header);
}
GNUNET_SERVER_receive_done (client, GNUNET_OK);
};
-/**
- * To be called on core init/fail.
- *
- * @param cls service closure
- * @param server handle to the server for this service
- * @param identity the public identity of this peer
- */
-static void
-core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *identity)
-{
- static int i = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core init\n");
- core_handle = server;
- if (0 != memcmp (identity, &my_full_id, sizeof (my_full_id)) ||
- NULL == server)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Wrong CORE service\n"));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- " core id %s\n",
- GNUNET_i2s (identity));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- " my id %s\n",
- GNUNET_i2s (&my_full_id));
- GNUNET_SCHEDULER_shutdown (); // Try gracefully
- if (10 < i++)
- GNUNET_abort(); // Try harder
- }
- return;
-}
-
-
/**
* Method called whenever a given peer connects.
*
}
+/**
+ * To be called on core init/fail.
+ *
+ * @param cls Closure (config)
+ * @param server handle to the server for this service
+ * @param identity the public identity of this peer
+ */
+static void
+core_init (void *cls, struct GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *identity)
+{
+ const struct GNUNET_CONFIGURATION_Handle *c = cls;
+ static int i = 0;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core init\n");
+ core_handle = server;
+ if (0 != memcmp (identity, &my_full_id, sizeof (my_full_id)) ||
+ NULL == server)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Wrong CORE service\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ " core id %s\n",
+ GNUNET_i2s (identity));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ " my id %s\n",
+ GNUNET_i2s (&my_full_id));
+ GNUNET_CORE_disconnect (core_handle);
+ core_handle = GNUNET_CORE_connect (c, /* Main configuration */
+ NULL, /* Closure passed to MESH functions */
+ &core_init, /* Call core_init once connected */
+ &core_connect, /* Handle connects */
+ &core_disconnect, /* remove peers on disconnects */
+ NULL, /* Don't notify about all incoming messages */
+ GNUNET_NO, /* For header only in notification */
+ NULL, /* Don't notify about all outbound messages */
+ GNUNET_NO, /* For header-only out notification */
+ core_handlers); /* Register these handlers */
+ if (10 < i++)
+ GNUNET_abort();
+ }
+ return;
+}
+
+
/******************************************************************************/
/************************ MAIN FUNCTIONS ****************************/
/******************************************************************************/
NULL, /* Don't notify about all outbound messages */
GNUNET_NO, /* For header-only out notification */
core_handlers); /* Register these handlers */
-
if (core_handle == NULL)
{
GNUNET_break (0);
tunnels = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
incoming_tunnels = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
peers = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
- types = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
+ ports = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
dht_handle = GNUNET_DHT_connect (c, 64);
if (NULL == dht_handle)
projects / oweals / gnunet.git / blobdiff