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

[gnunet]

Author: wachs
Date: 2013-10-18 09:32:47 +0200 (Fri, 18 Oct 2013)
New Revision: 30280

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
- fix assertion in scheduling
- formatting


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2013-10-18 04:02:03 UTC 
(rev 30279)
+++ gnunet/src/transport/gnunet-service-transport.c     2013-10-18 07:32:47 UTC 
(rev 30280)
@@ -461,22 +461,25 @@
        struct GNUNET_ATS_Information *ats_new;
 
   if (GNUNET_NO == GNUNET_ATS_session_known (GST_ats, address, session))
-       return;
+    return;
 
-       /* Call to manipulation to manipulate ATS information */
-       ats_new = GST_manipulation_manipulate_metrics (peer, address, session, 
ats, ats_count);
-       if (NULL == ats_new)
-       {
-                       GNUNET_break (0);
-                       return;
-       }
-  if (GNUNET_NO == GNUNET_ATS_address_update (GST_ats, address, session, 
ats_new, ats_count))
+  /* Call to manipulation to manipulate ATS information */
+  ats_new = GST_manipulation_manipulate_metrics (peer, address, session, ats,
+      ats_count);
+  if (NULL == ats_new)
   {
-       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                       _("Address or session unknown: failed to update 
properties for peer `%s' plugin `%s' address `%s' session %p\n"),
-                       GNUNET_i2s (peer), address->transport_name, 
GST_plugins_a2s (address), session);
+    GNUNET_break(0);
+    return;
   }
-  GNUNET_free (ats_new);
+  if (GNUNET_NO == GNUNET_ATS_address_update (GST_ats,
+      address, session, ats_new, ats_count))
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+        _("Address or session unknown: failed to update properties for peer 
`%s' plugin `%s' address `%s' session %p\n"),
+        GNUNET_i2s (peer), address->transport_name, GST_plugins_a2s (address),
+        session);
+  }
+  GNUNET_free(ats_new);
 }
 
 

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2013-10-18 
04:02:03 UTC (rev 30279)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2013-10-18 
07:32:47 UTC (rev 30280)
@@ -2567,7 +2567,7 @@
   atsi[0].value = htonl (bps_out);
   atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_DOWN);
   atsi[1].value = htonl (bps_in);
-  GNUNET_ATS_address_update (GST_ats, n->primary_address.address,
+  GST_ats_update_metrics (key, n->primary_address.address,
       n->primary_address.session, atsi, 2);
   n->util_bytes_recv = 0;
   n->util_bytes_sent = 0;