diff options
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 97593d3bb..abdbe6b04 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -603,7 +603,7 @@ announce_id (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
603 | * - Adapt X to churn | 603 | * - Adapt X to churn |
604 | */ | 604 | */ |
605 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: DHT_put for ID %s started.\n", | 605 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: DHT_put for ID %s started.\n", |
606 | GNUNET_h2s_full (&my_full_id.hashPubKey)); | 606 | GNUNET_i2s (&my_full_id)); |
607 | GNUNET_DHT_put (dht_handle, /* DHT handle */ | 607 | GNUNET_DHT_put (dht_handle, /* DHT handle */ |
608 | &my_full_id.hashPubKey, /* Key to use */ | 608 | &my_full_id.hashPubKey, /* Key to use */ |
609 | 10U, /* Replication level */ | 609 | 10U, /* Replication level */ |
@@ -1595,11 +1595,11 @@ path_build_from_dht (const struct GNUNET_PeerIdentity *get_path, | |||
1595 | if (get_path_length > 0) | 1595 | if (get_path_length > 0) |
1596 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1596 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1597 | "MESH: (first of GET: %s)\n", | 1597 | "MESH: (first of GET: %s)\n", |
1598 | GNUNET_h2s_full(&get_path[0].hashPubKey)); | 1598 | GNUNET_i2s(&get_path[0])); |
1599 | if (put_path_length > 0) | 1599 | if (put_path_length > 0) |
1600 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1600 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1601 | "MESH: (first of PUT: %s)\n", | 1601 | "MESH: (first of PUT: %s)\n", |
1602 | GNUNET_h2s_full(&put_path[0].hashPubKey)); | 1602 | GNUNET_i2s(&put_path[0])); |
1603 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1603 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1604 | "MESH: In total: %d hops\n", | 1604 | "MESH: In total: %d hops\n", |
1605 | p->length); | 1605 | p->length); |
@@ -1611,7 +1611,7 @@ path_build_from_dht (const struct GNUNET_PeerIdentity *get_path, | |||
1611 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1611 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1612 | "MESH: %u: %s\n", | 1612 | "MESH: %u: %s\n", |
1613 | p->peers[i], | 1613 | p->peers[i], |
1614 | GNUNET_h2s_full(&peer_id.hashPubKey)); | 1614 | GNUNET_i2s(&peer_id)); |
1615 | } | 1615 | } |
1616 | #endif | 1616 | #endif |
1617 | return p; | 1617 | return p; |
@@ -3145,7 +3145,7 @@ dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp, | |||
3145 | GNUNET_PEER_resolve (path_info->peer->id, &pi); | 3145 | GNUNET_PEER_resolve (path_info->peer->id, &pi); |
3146 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 3146 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
3147 | "MESH: for %s\n", | 3147 | "MESH: for %s\n", |
3148 | GNUNET_h2s_full(&pi.hashPubKey)); | 3148 | GNUNET_i2s(&pi)); |
3149 | // GNUNET_DHT_get_stop(path_info->peer->dhtget); | 3149 | // GNUNET_DHT_get_stop(path_info->peer->dhtget); |
3150 | // path_info->peer->dhtget = NULL; | 3150 | // path_info->peer->dhtget = NULL; |
3151 | 3151 | ||
@@ -3588,7 +3588,7 @@ handle_local_connect_add (void *cls, struct GNUNET_SERVER_Client *client, | |||
3588 | return; | 3588 | return; |
3589 | } | 3589 | } |
3590 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: for %s\n", | 3590 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: for %s\n", |
3591 | GNUNET_h2s_full(&peer_msg->peer.hashPubKey)); | 3591 | GNUNET_i2s(&peer_msg->peer)); |
3592 | peer_info = peer_info_get (&peer_msg->peer); | 3592 | peer_info = peer_info_get (&peer_msg->peer); |
3593 | 3593 | ||
3594 | tunnel_add_peer(t, peer_info); | 3594 | tunnel_add_peer(t, peer_info); |
@@ -3757,7 +3757,7 @@ handle_local_connect_by_type (void *cls, struct GNUNET_SERVER_Client *client, | |||
3757 | GNUNET_DHT_get_stop (t->dht_get_type); | 3757 | GNUNET_DHT_get_stop (t->dht_get_type); |
3758 | } | 3758 | } |
3759 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: looking in DHT for %s\n", | 3759 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: looking in DHT for %s\n", |
3760 | GNUNET_h2s_full (&hash)); | 3760 | GNUNET_h2s (&hash)); |
3761 | t->dht_get_type = | 3761 | t->dht_get_type = |
3762 | GNUNET_DHT_get_start (dht_handle, | 3762 | GNUNET_DHT_get_start (dht_handle, |
3763 | GNUNET_TIME_UNIT_FOREVER_REL, | 3763 | GNUNET_TIME_UNIT_FOREVER_REL, |
@@ -4092,7 +4092,7 @@ core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
4092 | #if MESH_DEBUG_CONNECTION | 4092 | #if MESH_DEBUG_CONNECTION |
4093 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Peer connected\n"); | 4093 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Peer connected\n"); |
4094 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", | 4094 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", |
4095 | GNUNET_h2s(&my_full_id.hashPubKey)); | 4095 | GNUNET_i2s(&my_full_id)); |
4096 | #endif | 4096 | #endif |
4097 | peer_info = peer_info_get (peer); | 4097 | peer_info = peer_info_get (peer); |
4098 | if (myid == peer_info->id) | 4098 | if (myid == peer_info->id) |
@@ -4106,7 +4106,7 @@ core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
4106 | else | 4106 | else |
4107 | { | 4107 | { |
4108 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", | 4108 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", |
4109 | GNUNET_h2s(&peer->hashPubKey)); | 4109 | GNUNET_i2s(peer)); |
4110 | } | 4110 | } |
4111 | #endif | 4111 | #endif |
4112 | path = path_new (2); | 4112 | path = path_new (2); |