aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2014-02-19 20:02:24 +0000
committerBart Polot <bart@net.in.tum.de>2014-02-19 20:02:24 +0000
commita06237deeec4aed38b09f633d7ebbeabb7da4c03 (patch)
tree321b4df6285a1b37b377947805ad7f112f82fd18
parent1ca6128d352a36661cc868eededbf2ea107de5a3 (diff)
downloadgnunet-a06237deeec4aed38b09f633d7ebbeabb7da4c03.tar.gz
gnunet-a06237deeec4aed38b09f633d7ebbeabb7da4c03.zip
- log
-rw-r--r--src/mesh/gnunet-service-mesh_connection.c6
-rw-r--r--src/mesh/gnunet-service-mesh_tunnel.c14
2 files changed, 10 insertions, 10 deletions
diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c
index 10a2f834c..e26176606 100644
--- a/src/mesh/gnunet-service-mesh_connection.c
+++ b/src/mesh/gnunet-service-mesh_connection.c
@@ -773,7 +773,7 @@ send_connection_ack (struct MeshConnection *connection, int fwd)
773 struct MeshTunnel3 *t; 773 struct MeshTunnel3 *t;
774 774
775 t = connection->t; 775 t = connection->t;
776 LOG (GNUNET_ERROR_TYPE_INFO, "Send %s ACK on connection %s\n", 776 LOG (GNUNET_ERROR_TYPE_INFO, "=> {%18s ACK} on connection %s\n",
777 GM_f2s (!fwd), GMC_2s (connection)); 777 GM_f2s (!fwd), GMC_2s (connection));
778 GMP_queue_add (get_hop (connection, fwd), NULL, 778 GMP_queue_add (get_hop (connection, fwd), NULL,
779 GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK, 779 GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK,
@@ -2962,9 +2962,9 @@ GMC_send_create (struct MeshConnection *connection)
2962 size = sizeof (struct GNUNET_MESH_ConnectionCreate); 2962 size = sizeof (struct GNUNET_MESH_ConnectionCreate);
2963 size += connection->path->length * sizeof (struct GNUNET_PeerIdentity); 2963 size += connection->path->length * sizeof (struct GNUNET_PeerIdentity);
2964 2964
2965 LOG (GNUNET_ERROR_TYPE_INFO, "Send %s (%u bytes) on connection %s\n", 2965 LOG (GNUNET_ERROR_TYPE_INFO, "=> %s on connection %s (%u bytes)\n",
2966 GM_m2s (GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE), 2966 GM_m2s (GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE),
2967 size, GMC_2s (connection)); 2967 GMC_2s (connection), size);
2968 LOG (GNUNET_ERROR_TYPE_DEBUG, " C_P+ %p %u (create)\n", 2968 LOG (GNUNET_ERROR_TYPE_DEBUG, " C_P+ %p %u (create)\n",
2969 connection, connection->pending_messages); 2969 connection, connection->pending_messages);
2970 connection->pending_messages++; 2970 connection->pending_messages++;
diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c
index 482a12ad7..902e64a28 100644
--- a/src/mesh/gnunet-service-mesh_tunnel.c
+++ b/src/mesh/gnunet-service-mesh_tunnel.c
@@ -960,7 +960,7 @@ send_kx (struct MeshTunnel3 *t,
960static void 960static void
961send_ephemeral (struct MeshTunnel3 *t) 961send_ephemeral (struct MeshTunnel3 *t)
962{ 962{
963 LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__); 963 LOG (GNUNET_ERROR_TYPE_INFO, "=> EPHM for %s\n", GMT_2s (t));
964 964
965 kx_msg.sender_status = htonl (t->estate); 965 kx_msg.sender_status = htonl (t->estate);
966 send_kx (t, &kx_msg.header); 966 send_kx (t, &kx_msg.header);
@@ -976,7 +976,7 @@ send_ping (struct MeshTunnel3 *t)
976{ 976{
977 struct GNUNET_MESH_KX_Ping msg; 977 struct GNUNET_MESH_KX_Ping msg;
978 978
979 LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__); 979 LOG (GNUNET_ERROR_TYPE_INFO, "=> PING for %s\n", GMT_2s (t));
980 msg.header.size = htons (sizeof (msg)); 980 msg.header.size = htons (sizeof (msg));
981 msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_PING); 981 msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_PING);
982 msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX); 982 msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
@@ -1004,7 +1004,7 @@ send_pong (struct MeshTunnel3 *t, uint32_t challenge)
1004{ 1004{
1005 struct GNUNET_MESH_KX_Pong msg; 1005 struct GNUNET_MESH_KX_Pong msg;
1006 1006
1007 LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__); 1007 LOG (GNUNET_ERROR_TYPE_INFO, "=> PONG for %s\n", GMT_2s (t));
1008 msg.header.size = htons (sizeof (msg)); 1008 msg.header.size = htons (sizeof (msg));
1009 msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_PONG); 1009 msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_PONG);
1010 msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX); 1010 msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
@@ -1435,7 +1435,7 @@ handle_ephemeral (struct MeshTunnel3 *t,
1435 const struct GNUNET_MESH_KX_Ephemeral *msg) 1435 const struct GNUNET_MESH_KX_Ephemeral *msg)
1436{ 1436{
1437 struct GNUNET_HashCode km; 1437 struct GNUNET_HashCode km;
1438 LOG (GNUNET_ERROR_TYPE_DEBUG, " ephemeral key message\n"); 1438 LOG (GNUNET_ERROR_TYPE_INFO, "<= EPHM for %s\n", GMT_2s (t));
1439 1439
1440 if (GNUNET_OK != check_ephemeral (t, msg)) 1440 if (GNUNET_OK != check_ephemeral (t, msg))
1441 { 1441 {
@@ -1474,7 +1474,7 @@ handle_ping (struct MeshTunnel3 *t,
1474 return; 1474 return;
1475 } 1475 }
1476 1476
1477 LOG (GNUNET_ERROR_TYPE_DEBUG, " ping message\n"); 1477 LOG (GNUNET_ERROR_TYPE_INFO, "<= PING for %s\n", GMT_2s (t));
1478 t_decrypt (t, &res.target, &msg->target, ping_encryption_size (), msg->iv); 1478 t_decrypt (t, &res.target, &msg->target, ping_encryption_size (), msg->iv);
1479 if (0 != memcmp (&my_full_id, &res.target, sizeof (my_full_id))) 1479 if (0 != memcmp (&my_full_id, &res.target, sizeof (my_full_id)))
1480 { 1480 {
@@ -1505,7 +1505,7 @@ handle_pong (struct MeshTunnel3 *t,
1505{ 1505{
1506 uint32_t challenge; 1506 uint32_t challenge;
1507 1507
1508 LOG (GNUNET_ERROR_TYPE_DEBUG, "PONG received\n"); 1508 LOG (GNUNET_ERROR_TYPE_INFO, "<= PONG for %s\n", GMT_2s (t));
1509 if (GNUNET_SCHEDULER_NO_TASK == t->rekey_task) 1509 if (GNUNET_SCHEDULER_NO_TASK == t->rekey_task)
1510 { 1510 {
1511 GNUNET_STATISTICS_update (stats, "# duplicate PONG messages", 1, GNUNET_NO); 1511 GNUNET_STATISTICS_update (stats, "# duplicate PONG messages", 1, GNUNET_NO);
@@ -1548,7 +1548,7 @@ handle_decrypted (struct MeshTunnel3 *t,
1548 uint16_t type; 1548 uint16_t type;
1549 1549
1550 type = ntohs (msgh->type); 1550 type = ntohs (msgh->type);
1551 LOG (GNUNET_ERROR_TYPE_INFO, "<- %s message\n", GM_m2s (type)); 1551 LOG (GNUNET_ERROR_TYPE_INFO, "<= %s on %s\n", GM_m2s (type), GMT_2s (t));
1552 1552
1553 switch (type) 1553 switch (type)
1554 { 1554 {