From aed4626fc179259154c05413717076de7c85b1a7 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Mon, 16 Dec 2013 19:44:19 +0000 Subject: [PATCH] - don't show WARNING/ERROR on wrong connection create, debug+statistics instead --- src/mesh/gnunet-service-mesh_connection.c | 10 +++++----- src/mesh/gnunet-service-mesh_peer.c | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c index 309d51e6e..a703e4b96 100644 --- a/src/mesh/gnunet-service-mesh_connection.c +++ b/src/mesh/gnunet-service-mesh_connection.c @@ -1275,9 +1275,8 @@ GMC_handle_create (void *cls, const struct GNUNET_PeerIdentity *peer, msg = (struct GNUNET_MESH_ConnectionCreate *) message; cid = &msg->cid; id = (struct GNUNET_PeerIdentity *) &msg[1]; - LOG (GNUNET_ERROR_TYPE_DEBUG, - " connection %s (%s).\n", - GNUNET_h2s (cid), GNUNET_i2s (id)); + LOG (GNUNET_ERROR_TYPE_DEBUG, " connection %s (%s->).\n", + GNUNET_h2s (cid), GNUNET_i2s (id)); /* Create connection */ c = connection_get (cid); @@ -1352,7 +1351,8 @@ GMC_handle_create (void *cls, const struct GNUNET_PeerIdentity *peer, LOG (GNUNET_ERROR_TYPE_DEBUG, " Retransmitting.\n"); GMP_add_path (dest_peer, path_duplicate (path), GNUNET_NO); GMP_add_path_to_origin (orig_peer, path_duplicate (path), GNUNET_NO); - GMC_send_prebuilt_message (message, c, GNUNET_YES, GNUNET_YES, NULL, NULL); + GMC_send_prebuilt_message (message, c, GNUNET_YES, GNUNET_YES, + NULL, NULL); } path_destroy (path); return GNUNET_OK; @@ -2705,7 +2705,7 @@ GMC_send_prebuilt_message (const struct GNUNET_MessageHeader *message, &message_sent, q); if (NULL == q->q) { - GNUNET_break (0); + LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING dropping msg on %s\n", GMC_2s (c)); GNUNET_free (data); GNUNET_free (q); return NULL; diff --git a/src/mesh/gnunet-service-mesh_peer.c b/src/mesh/gnunet-service-mesh_peer.c index aa9f52fe6..5f41725ce 100644 --- a/src/mesh/gnunet-service-mesh_peer.c +++ b/src/mesh/gnunet-service-mesh_peer.c @@ -997,7 +997,9 @@ GMP_queue_add (struct MeshPeer *peer, void *cls, uint16_t type, size_t size, if (NULL == peer->connections) { /* We are not connected to this peer, ignore request. */ - GNUNET_break_op (0); + LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING %s not a neighbor\n", GMP_2s (peer)); + GNUNET_STATISTICS_update (stats, "# messages dropped due to wrong hop", 1, + GNUNET_NO); return NULL; } -- 2.25.1