[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16677 - in gnunet/src: include mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16677 - in gnunet/src: include mesh |
Date: |
Fri, 2 Sep 2011 03:41:05 +0200 |
Author: bartpolot
Date: 2011-09-02 03:41:05 +0200 (Fri, 02 Sep 2011)
New Revision: 16677
Modified:
gnunet/src/include/gnunet_mesh_service_new.h
gnunet/src/mesh/mesh_api_new.c
Log:
Implemented reconnect, creation of incoming tunnels, refactoring
Modified: gnunet/src/include/gnunet_mesh_service_new.h
===================================================================
--- gnunet/src/include/gnunet_mesh_service_new.h 2011-09-01 22:35:34 UTC
(rev 16676)
+++ gnunet/src/include/gnunet_mesh_service_new.h 2011-09-02 01:41:05 UTC
(rev 16677)
@@ -57,6 +57,7 @@
/**
* Functions with this signature are called whenever a message is
* received or transmitted.
+ * FIXME: transmitted???
*
* @param cls closure (set from GNUNET_MESH_connect)
* @param tunnel connection to the other end
@@ -241,13 +242,11 @@
* message type.
*
* @param tunnel handle to existing tunnel
- * @param timeout how long to try to establish a connection
* @param app_type application type that must be supported by the peer
* (MESH should discover peer in proximity handling this type)
*/
void
GNUNET_MESH_peer_request_connect_by_type (struct GNUNET_MESH_Tunnel *tunnel,
- struct GNUNET_TIME_Relative timeout,
GNUNET_MESH_ApplicationType
app_type);
Modified: gnunet/src/mesh/mesh_api_new.c
===================================================================
--- gnunet/src/mesh/mesh_api_new.c 2011-09-01 22:35:34 UTC (rev 16676)
+++ gnunet/src/mesh/mesh_api_new.c 2011-09-02 01:41:05 UTC (rev 16677)
@@ -22,7 +22,6 @@
* @author Bartlomiej Polot
*
* TODO:
- * - handle reconnect (service crash/disconnect) properly
* - callbacks to client missing on certain events
* - processing messages from service is incomplete
*
@@ -280,7 +279,7 @@
* List of application types that have been requested for this tunnel
*/
GNUNET_MESH_ApplicationType *apps;
-
+
/**
* Number of peers added to the tunnel
*/
@@ -326,6 +325,34 @@
/**
+ * Get the tunnel handler for the tunnel specified by id from the given handle
+ * @param h Mesh handle
+ * @param tid ID of the wanted tunnel
+ * @return handle to the required tunnel or NULL if not found
+ */
+static struct GNUNET_MESH_Tunnel *
+create_tunnel (struct GNUNET_MESH_Handle *h, MESH_TunnelNumber tid)
+{
+ struct GNUNET_MESH_Tunnel *t;
+
+ t = GNUNET_malloc (sizeof (struct GNUNET_MESH_Tunnel));
+ t->mesh = h;
+ if (0 == tid)
+ {
+ t->tid = h->next_tid++;
+ }
+ else
+ {
+ t->tid = tid;
+ h->next_tid = tid + 1;
+ }
+ h->next_tid |= GNUNET_MESH_LOCAL_TUNNEL_ID_MARK; // keep in range
+ GNUNET_CONTAINER_DLL_insert (h->tunnels_head, h->tunnels_tail, t);
+ return t;
+}
+
+
+/**
* 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
@@ -453,18 +480,19 @@
/**
* Reconnect to the service, retransmit all infomation to try to restore the
* original state.
- *
+ * FIXME: notify user about it? (call all disconnect callbacks?)
+ *
* @param h handle to the mesh
- *
+ *
* @return GNUNET_YES in case of sucess, GNUNET_NO otherwise (service down...)
*/
static int
reconnect (struct GNUNET_MESH_Handle *h)
{
struct GNUNET_MESH_Tunnel *t;
-
unsigned int i;
+ h->in_receive = GNUNET_NO;
/* disconnect */
if (NULL != h->th)
{
@@ -485,16 +513,23 @@
}
for (t = h->tunnels_head; NULL != t; t = t->next)
{
- /* create tunnel */
+ struct GNUNET_MESH_TunnelMessage msg;
+
+ 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);
+ send_packet (h, &msg.header);
for (i = 0; i < t->npeers; i++)
{
struct GNUNET_MESH_PeerControl msg;
+
msg.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl));
msg.header.type = htons
(GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT_PEER_ADD);
msg.tunnel_id = htonl (t->tid);
-// msg.peer = *peer; FIXME
+ GNUNET_PEER_resolve (t->peers[i]->id, &msg.peer);
send_packet (t->mesh, &msg.header);
}
+ /* FIXME what about connects by type? */
}
return GNUNET_YES;
}
@@ -521,7 +556,7 @@
if (tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_MARK)
{
GNUNET_break (0);
- return; //FIXME abort? reconnect?
+ return;
}
t = GNUNET_malloc (sizeof (struct GNUNET_MESH_Tunnel));
t->cls = h->cls;
@@ -556,7 +591,14 @@
t = retrieve_tunnel (h, ntohl (msg->tunnel_id));
if (NULL == t)
{
- GNUNET_break (0);
+ t = create_tunnel (h, msg->tunnel_id);
+ 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;
return;
}
id = GNUNET_PEER_search (&msg->peer);
@@ -639,9 +681,14 @@
handler = &h->message_handlers[i];
if (handler->type == type)
{
- if (GNUNET_OK == handler->callback (h->cls, t, NULL, /* FIXME ctx */
- peer, payload, NULL))
- { /* FIXME atsi */
+ struct GNUNET_TRANSPORT_ATS_Information atsi;
+
+ atsi.type = 0;
+ atsi.value = 0;
+ /* FIXME ctx */
+ if (GNUNET_OK ==
+ handler->callback (h->cls, t, NULL, peer, payload, &atsi))
+ {
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MESH: callback completed successfully\n");
}
@@ -670,10 +717,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "mesh: received a message from MESH\n");
if (msg == NULL)
{
- GNUNET_break (0);
- h->in_receive = GNUNET_NO;
- // rather: do_reconnect () -- and set 'in_receive' to NO there...
- // FIXME: service disconnect, handle!
+ reconnect (h);
return;
}
switch (ntohs (msg->type))
@@ -732,7 +776,6 @@
h->th = NULL;
if ((0 == size) || (NULL == buf))
{
- // FIXME: disconnect, reconnect, retry?
reconnect (h);
return 0;
}
@@ -973,13 +1016,10 @@
struct GNUNET_MESH_TunnelMessage msg;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "mesh: Creating new tunnel\n");
- t = GNUNET_malloc (sizeof (struct GNUNET_MESH_Tunnel));
+ t = create_tunnel (h, 0);
t->connect_handler = connect_handler;
t->disconnect_handler = disconnect_handler;
t->cls = handler_cls;
- t->mesh = h;
- t->tid = h->next_tid++;
- h->next_tid |= GNUNET_MESH_LOCAL_TUNNEL_ID_MARK; // keep in range
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);
@@ -994,18 +1034,21 @@
* @param tun tunnel handle
*/
void
-GNUNET_MESH_tunnel_destroy (struct GNUNET_MESH_Tunnel *tun)
+GNUNET_MESH_tunnel_destroy (struct GNUNET_MESH_Tunnel *t)
{
struct GNUNET_MESH_Handle *h;
struct GNUNET_MESH_TunnelMessage msg;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "mesh: Destroying tunnel\n");
- h = tun->mesh;
+ h = t->mesh;
+ if (0 != t->owner)
+ GNUNET_PEER_change_rc (t->owner, -1);
+
msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
msg.header.size = htons (sizeof (struct GNUNET_MESH_TunnelMessage));
- msg.tunnel_id = htonl (tun->tid);
- GNUNET_free (tun);
+ msg.tunnel_id = htonl (t->tid);
+ GNUNET_free (t);
send_packet (h, &msg.header);
}
@@ -1108,7 +1151,7 @@
{
struct GNUNET_MESH_ConnectPeerByType msg;
- GNUNET_array_append(tunnel->apps, tunnel->napps, app_type);
+ GNUNET_array_append (tunnel->apps, tunnel->napps, app_type);
/* FIXME: add a new api call disconnect by type? */
msg.header.size = htons (sizeof (struct GNUNET_MESH_ConnectPeerByType));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16677 - in gnunet/src: include mesh,
gnunet <=