*/
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_DEBUG, "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);
* Functions to handle messages from core
*/
static struct GNUNET_CORE_MessageHandler core_handlers[] = {
- {&GMC_handle_create, GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE,
- 0},
+ {&GMC_handle_create, GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE, 0},
{&GMC_handle_confirm, GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK,
sizeof (struct GNUNET_MESH_ConnectionACK)},
{&GMC_handle_broken, GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN,
sizeof (struct GNUNET_MESH_ConnectionBroken)},
{&GMC_handle_destroy, GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY,
sizeof (struct GNUNET_MESH_ConnectionDestroy)},
- {&GMC_handle_keepalive, GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE,
- sizeof (struct GNUNET_MESH_ConnectionKeepAlive)},
{&GMC_handle_ack, GNUNET_MESSAGE_TYPE_MESH_ACK,
sizeof (struct GNUNET_MESH_ACK)},
{&GMC_handle_poll, GNUNET_MESSAGE_TYPE_MESH_POLL,
msg->header.size = htons (sizeof (struct GNUNET_MESH_ConnectionACK));
msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK);
msg->cid = *GMC_get_id (c);
- msg->reserved = 0;
-
- /* TODO add signature */
LOG (GNUNET_ERROR_TYPE_DEBUG, "CONNECTION ACK sent!\n");
return sizeof (struct GNUNET_MESH_ConnectionACK);
/* Check if buffer size is enough for the message */
if (queue->size > size)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "* not enough room, reissue\n");
- peer->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle,
- GNUNET_NO, get_priority (queue),
- GNUNET_TIME_UNIT_FOREVER_REL,
- dst_id,
- queue->size,
- &queue_send,
- peer);
- return 0;
+ LOG (GNUNET_ERROR_TYPE_WARNING, "not enough room (%u vs %u), reissue\n",
+ queue->size, size);
+ peer->core_transmit =
+ GNUNET_CORE_notify_transmit_ready (core_handle,
+ GNUNET_NO, get_priority (queue),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ dst_id,
+ queue->size,
+ &queue_send,
+ peer);
+ return 0;
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "* size %u ok\n", queue->size);
{
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:
if (0 < drop_percent &&
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 101) < drop_percent)
{
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Dropping message of type %s\n",
- GM_m2s (queue->type));
+ LOG (GNUNET_ERROR_TYPE_WARNING, "DD %s on connection\n",
+ GM_m2s (queue->type), GMC_2s (c));
data_size = 0;
}
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "ss %s on connection %s (%p) %s (size %u)\n",
+ GM_m2s (queue->type), GMC_2s (c), c, GM_f2s (queue->fwd), data_size);
+ }
/* Free queue, but cls was freed by send_core_* */
GMP_queue_destroy (queue, GNUNET_NO);
int priority;
int call_core;
- LOG (GNUNET_ERROR_TYPE_INFO,
- "queue add %s %s towards %s (size %u) on c %p (%s)\n",
- GM_f2s (fwd), GM_m2s (type), GMP_2s(peer),
- size, c, GMC_2s (c));
+ LOG (GNUNET_ERROR_TYPE_INFO, "qq %s on connection %s (%p) %s towards %s (size %u)\n",
+ GM_m2s (type), GMC_2s (c), c, GM_f2s (fwd), GMP_2s(peer), size);
if (NULL == peer->connections)
{
}
+/**
+ * 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 ();
GNUNET_PEER_resolve2 (peer->id), NULL, NULL);
}
+
/**
* Try to establish a new connection to this peer (in its tunnel).
* If the peer doesn't have any path to it yet, try to get one.
struct MeshTunnel3 *t;
struct MeshPeerPath *p;
struct MeshConnection *c;
- struct GNUNET_HELLO_Message *hello;
int rerun_search;
LOG (GNUNET_ERROR_TYPE_DEBUG, "peer_connect towards %s\n", GMP_2s (peer));
/* If we have a current hello, try to connect using it. */
- hello = GMP_get_hello (peer);
- if (NULL != hello)
- {
- struct GNUNET_MessageHeader *mh;
-
- mh = GNUNET_HELLO_get_header (hello);
- GNUNET_TRANSPORT_offer_hello (transport_handle, mh, try_connect, peer);
- }
+ GMP_try_connect (peer);
t = peer->tunnel;
c = NULL;
"peer %s ok, has %u connections.\n",
GMP_2s (peer), GNUNET_CONTAINER_multihashmap_size (peer->connections));
result = GNUNET_CONTAINER_multihashmap_put (peer->connections,
- GMC_get_id (c),
+ GMC_get_h (c),
c,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
LOG (GNUNET_ERROR_TYPE_DEBUG,
{
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;
}
GMP_2s (peer), GNUNET_CONTAINER_multihashmap_size (peer->connections));
return GNUNET_CONTAINER_multihashmap_remove (peer->connections,
- GMC_get_id (c),
+ GMC_get_h (c),
c);
}
struct GNUNET_HELLO_Message *old;
size_t size;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "New hello for %s\n", GMP_2s (peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "set hello for %s\n", GMP_2s (peer));
if (NULL == hello)
return;
old = GMP_get_hello (peer);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " old hello %p\n", old);
if (NULL == old)
{
size = GNUNET_HELLO_size (hello);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " new size: %u\n", size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " new (%u bytes)\n", size);
peer->hello = GNUNET_malloc (size);
memcpy (peer->hello, hello, size);
}
else
{
peer->hello = GNUNET_HELLO_merge (old, hello);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " merge! %p\n", peer->hello);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " merge into %p (%u bytes)\n",
+ peer->hello, GNUNET_HELLO_size (hello));
GNUNET_free (old);
}
}
struct GNUNET_TIME_Absolute expiration;
struct GNUNET_TIME_Relative remaining;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Get hello\n");
if (NULL == peer->hello)
return NULL;
remaining = GNUNET_TIME_absolute_get_remaining (expiration);
if (0 == remaining.rel_value_us)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " expired on %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " get - hello expired on %s\n",
GNUNET_STRINGS_absolute_time_to_string (expiration));
GNUNET_free (peer->hello);
peer->hello = NULL;
}
+/**
+ * Try to connect to a peer on TRANSPORT level.
+ *
+ * @param peer Peer to whom to connect.
+ */
+void
+GMP_try_connect (struct MeshPeer *peer)
+{
+ struct GNUNET_HELLO_Message *hello;
+ struct GNUNET_MessageHeader *mh;
+
+ if (NULL == transport_handle)
+ return;
+
+ hello = GMP_get_hello (peer);
+ if (NULL == hello)
+ return;
+
+ mh = GNUNET_HELLO_get_header (hello);
+ GNUNET_TRANSPORT_offer_hello (transport_handle, mh, try_connect, peer);
+}
+
+
/**
* Count the number of known paths toward the peer.
*
projects / oweals / gnunet.git / blobdiff