[GNUnet-SVN] r17696 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2011-10-23 19:36:38 +0200 (Sun, 23 Oct 2011)
New Revision: 17696

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
fixing quota violation messages

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-10-23 17:20:21 UTC 
(rev 17695)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-10-23 17:36:38 UTC 
(rev 17696)
@@ -292,20 +292,10 @@
 #if 1
   /* FIXME: this should not be needed, and not sure it's good to have it, but 
without
      this connections seem to go extra-slow */
-  if ((ats_count > 0) && (ats != NULL))
-  {
-    if (NULL != session)
-      GNUNET_log_from (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
-                      "transport-ats",
-                      "Giving ATS session %p of plugin %s for peer %s\n",
-                      session,
-                      plugin_name,
-                      GNUNET_i2s (peer));
-    GNUNET_ATS_address_update (GST_ats, peer,
-                               plugin_name, sender_address, sender_address_len,
-                               session,
-                               ats, ats_count);
-  }
+  GNUNET_ATS_address_update (GST_ats, peer,
+                            plugin_name, sender_address, sender_address_len,
+                            session,
+                            ats, ats_count);  
 #endif
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-10-23 
17:20:21 UTC (rev 17695)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-10-23 
17:36:38 UTC (rev 17696)
@@ -969,14 +969,14 @@
   n = lookup_neighbour (sender);
   if (n == NULL)
   {
-    GNUNET_STATISTICS_update (GST_stats,
-                              gettext_noop
-                              ("# messages discarded due to lack of neighbour 
record"),
-                              1, GNUNET_NO);
     GST_neighbours_try_connect (sender);
     n = lookup_neighbour (sender);
     if (NULL == n)
     {
+      GNUNET_STATISTICS_update (GST_stats,
+                               gettext_noop
+                               ("# messages discarded due to lack of neighbour 
record"),
+                               1, GNUNET_NO);
       *do_forward = GNUNET_NO;
       return GNUNET_TIME_UNIT_ZERO;
     }
@@ -1020,7 +1020,7 @@
     return GNUNET_CONSTANTS_QUOTA_VIOLATION_TIMEOUT;
   }
   *do_forward = GNUNET_YES;
-  ret = GNUNET_BANDWIDTH_tracker_get_delay (&n->in_tracker, 0);
+  ret = GNUNET_BANDWIDTH_tracker_get_delay (&n->in_tracker, 32 * 1024);
   if (ret.rel_value > 0)
   {
 #if DEBUG_TRANSPORT