{
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);
"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)
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);
}