*/
static struct GNUNET_CORE_Handle *core_handle;
+/**
+ * Handle to try to start new connections.
+ */
static struct GNUNET_TRANSPORT_Handle *transport_handle;
-
/******************************************************************************/
/***************************** CORE CALLBACKS *********************************/
/******************************************************************************/
{
struct MeshPeer *mp;
struct MeshPeerPath *path;
+ char own_id[16];
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer connected\n");
- LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", GNUNET_i2s (&my_full_id));
+ strncpy (own_id, GNUNET_i2s (&my_full_id), 15);
mp = GMP_get (peer);
if (myid == mp->id)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " (self)\n");
+ LOG (GNUNET_ERROR_TYPE_INFO, "CONNECTED %s (self)\n", own_id);
path = path_new (1);
}
else
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", GNUNET_i2s (peer));
+ LOG (GNUNET_ERROR_TYPE_INFO, "CONNECTED %s <= %s\n",
+ own_id, GNUNET_i2s (peer));
path = path_new (2);
path->peers[1] = mp->id;
GNUNET_PEER_change_rc (mp->id, 1);
{
struct MeshPeer *p;
struct MeshPeerPath *direct_path;
+ char own_id[16];
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer disconnected\n");
+ strncpy (own_id, GNUNET_i2s (&my_full_id), 15);
p = GNUNET_CONTAINER_multipeermap_get (peers, peer);
if (NULL == p)
{
return;
}
if (myid == p->id)
- LOG (GNUNET_ERROR_TYPE_DEBUG, " (self: %s)\n", GMP_2s (p));
+ LOG (GNUNET_ERROR_TYPE_INFO, "DISCONNECTED %s (self)\n", own_id);
else
- LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", GMP_2s (p));
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "DISCONNECTED %s <= %s\n",
+ own_id, GNUNET_i2s (peer));
direct_path = pop_direct_path (p);
GNUNET_CONTAINER_multihashmap_iterate (p->connections, ¬ify_broken, p);
GNUNET_CONTAINER_multihashmap_destroy (p->connections);
GNUNET_break (0);
}
- if (GMC_is_sendable (q->c, q->fwd))
- return GNUNET_YES;
+ if (GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN != q->type)
+ return GMC_is_sendable (q->c, q->fwd);
return GNUNET_NO;
}
{
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
- case GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE:
case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
case GNUNET_MESSAGE_TYPE_MESH_KX:
case GNUNET_MESSAGE_TYPE_MESH_ACK:
}
+/**
+ * Get the first message for a connection and unqueue it.
+ *
+ * @param peer Neighboring peer.
+ * @param c Connection.
+ *
+ * @return First message for this connection.
+ */
+struct GNUNET_MessageHeader *
+GMP_connection_pop (struct MeshPeer *peer, struct MeshConnection *c)
+{
+ struct MeshPeerQueue *q;
+ struct GNUNET_MessageHeader *msg;
+
+ for (q = peer->queue_head; NULL != q; q = q->next)
+ {
+ if (q->c != c)
+ continue;
+ switch (q->type)
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE:
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
+ case GNUNET_MESSAGE_TYPE_MESH_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_POLL:
+ GMP_queue_destroy (q, GNUNET_YES);
+ continue;
+
+ case GNUNET_MESSAGE_TYPE_MESH_KX:
+ case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
+ msg = (struct GNUNET_MessageHeader *) q->cls;
+ GMP_queue_destroy (q, GNUNET_NO);
+ return msg;
+
+ default:
+ GNUNET_break (0);
+ }
+ }
+
+ return NULL;
+}
+
+
void
GMP_queue_unlock (struct MeshPeer *peer, struct MeshConnection *c)
{
}
else
{
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "\n***************************************\n"
- "Mesh is running with drop mode enabled.\n"
- "This is NOT a good idea!\n"
- "Remove the DROP_PERCENT option from your configuration.\n"
- "***************************************\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "**************************************\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Mesh is running with DROP enabled.\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "This is NOT a good idea!\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Remove DROP_PERCENT from config file.\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "**************************************\n");
}
core_handle = GNUNET_CORE_connect (c, /* Main configuration */
NULL, /* Don't notify about all outbound messages */
GNUNET_NO, /* For header-only out notification */
core_handlers); /* Register these handlers */
- transport_handle = GNUNET_TRANSPORT_connect (c, &my_full_id,
- NULL, /* cls */
- NULL, NULL, NULL); /* Notify callbacks */
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (c, "MESH", "DISABLE_TRY_CONNECT"))
+ {
+ transport_handle = GNUNET_TRANSPORT_connect (c, &my_full_id, NULL, /* cls */
+ /* Notify callbacks */
+ NULL, NULL, NULL);
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "**************************************\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "* DISABLE TRYING CONNECT in config *\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "* Use this only for test purposes. *\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "**************************************\n");
+ }
+
- if (NULL == core_handle || NULL == transport_handle)
+
+ if (NULL == core_handle)
{
GNUNET_break (0);
GNUNET_SCHEDULER_shutdown ();
p = peer_get_best_path (peer);
if (NULL != p)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " %u hops\n", p->length);
+ char *s;
+
+ s = path_2s (p);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " path to use: %s\n", s);
+ GNUNET_free (s);
+
c = GMT_use_path (t, p);
if (NULL == c)
{
{
if (path->peers[l] == myid)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "shortening path by %u\n", l);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " shortening path by %u\n", l);
for (l2 = 0; l2 < path->length - l; l2++)
{
path->peers[l2] = path->peers[l + l2];
}
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "adding path [%u]\n", path->length);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " final length: %u\n", path->length);
l = path_get_length (path);
if (0 == l)
LOG (GNUNET_ERROR_TYPE_DEBUG, " added\n");
GNUNET_CONTAINER_DLL_insert_before (peer->path_head,
peer->path_tail, aux, path);
+ if (NULL != peer->tunnel && 3 < GMT_count_connections (peer->tunnel))
+ {
+ GMP_connect (peer);
+ }
return path;
}
else
GNUNET_CONTAINER_DLL_insert_tail (peer->path_head, peer->path_tail,
path);
LOG (GNUNET_ERROR_TYPE_DEBUG, " added last\n");
+ if (NULL != peer->tunnel && 3 < GMT_count_connections (peer->tunnel))
+ {
+ GMP_connect (peer);
+ }
return path;
}
struct GNUNET_HELLO_Message *hello;
struct GNUNET_MessageHeader *mh;
+ if (NULL == transport_handle)
+ return;
+
hello = GMP_get_hello (peer);
if (NULL == hello)
return;