[GNUnet-SVN] r31252 - gnunet/src/dv

[gnunet]

Author: grothoff
Date: 2013-12-10 11:25:14 +0100 (Tue, 10 Dec 2013)
New Revision: 31252

Modified:
   gnunet/src/dv/gnunet-service-dv.c
   gnunet/src/dv/plugin_transport_dv.c
Log:
-fix check, do not drop our own messages, but count foreign drops in stats

Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c   2013-12-10 09:56:28 UTC (rev 31251)
+++ gnunet/src/dv/gnunet-service-dv.c   2013-12-10 10:25:14 UTC (rev 31252)
@@ -634,9 +634,9 @@
  * Forward the given payload to the given target.
  *
  * @param target where to send the message
+ * @param distance expected (remaining) distance to the target
  * @param uid unique ID for the message
  * @param ultimate_target ultimate recipient for the message
- * @param distance expected (remaining) distance to the target
  * @param sender original sender of the message
  * @param payload payload of the message
  */
@@ -653,11 +653,15 @@
   size_t msize;
 
   if ( (target->pm_queue_size >= MAX_QUEUE_SIZE) &&
+       (0 == uid) &&
        (0 != memcmp (sender,
                     &my_identity,
                     sizeof (struct GNUNET_PeerIdentity))) )
   {
-    GNUNET_break (0 == uid);
+    /* not _our_ client and queue is full, drop */
+    GNUNET_STATISTICS_update (stats,
+                              "# messages dropped",
+                              1, GNUNET_NO);
     return;
   }
   msize = sizeof (struct RouteMessage) + ntohs (payload->size);

Modified: gnunet/src/dv/plugin_transport_dv.c
===================================================================
--- gnunet/src/dv/plugin_transport_dv.c 2013-12-10 09:56:28 UTC (rev 31251)
+++ gnunet/src/dv/plugin_transport_dv.c 2013-12-10 10:25:14 UTC (rev 31252)
@@ -301,7 +301,7 @@
    * If you remove it, also remove libgnunetats linkage from Makefile.am
    */
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received `%s' message for peer `%s' with next hop in network %s \n",
+       "Received `%s' message for peer `%s' with next hop in network %s\n",
        "DV_CONNECT",
        GNUNET_i2s (peer),
        GNUNET_ATS_print_network_type (network));