[GNUnet-SVN] r31439 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-12-16 20:44:19 +0100 (Mon, 16 Dec 2013)
New Revision: 31439

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
   gnunet/src/mesh/gnunet-service-mesh_peer.c
Log:
- don't show WARNING/ERROR on wrong connection create, debug+statistics instead


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-16 19:43:44 UTC 
(rev 31438)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-16 19:44:19 UTC 
(rev 31439)
@@ -1275,9 +1275,8 @@
   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 @@
     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 @@
                         &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;

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-12-16 19:43:44 UTC (rev 
31438)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c  2013-12-16 19:44:19 UTC (rev 
31439)
@@ -997,7 +997,9 @@
   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;
   }