[GNUnet-SVN] r24533 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2012-10-25 13:25:08 +0200 (Thu, 25 Oct 2012)
New Revision: 24533

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses.h
   gnunet/src/ats/gnunet-service-ats_performance.c
Log:
changes

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2012-10-25 10:57:46 UTC 
(rev 24532)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2012-10-25 11:25:08 UTC 
(rev 24533)
@@ -1115,7 +1115,13 @@
   struct ATS_Address *addr = (struct ATS_Address *)  value;
 
   if (NULL != pi_ctx->it)
-    pi_ctx->it (pi_ctx->it_cls, &addr->peer, addr->plugin);
+    pi_ctx->it (pi_ctx->it_cls,
+                &addr->peer,
+                addr->plugin,
+                addr->addr, addr->addr_len,
+                addr->ats, addr->ats_count,
+                addr->assigned_bw_out,
+                addr->assigned_bw_in);
   return GNUNET_YES;
 }
 
@@ -1123,16 +1129,18 @@
 GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer, 
GNUNET_ATS_PeerInfo_Iterator pi_it, void *pi_it_cls)
 {
   struct PeerInfoIteratorContext pi_ctx;
+  struct GNUNET_BANDWIDTH_Value32NBO zero_bw;
   GNUNET_assert (NULL != peer);
   GNUNET_assert (NULL != addresses);
 
+  zero_bw = GNUNET_BANDWIDTH_value_init (0);
   pi_ctx.it = pi_it;
   pi_ctx.it_cls = pi_it_cls;
 
   GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey, 
&peerinfo_it, &pi_ctx);
 
   if (NULL != pi_it)
-    pi_it (pi_it_cls, NULL, NULL);
+    pi_it (pi_it_cls, NULL, NULL, NULL, 0, NULL, 0, zero_bw, zero_bw);
 
 }
 

Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h       2012-10-25 10:57:46 UTC 
(rev 24532)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h       2012-10-25 11:25:08 UTC 
(rev 24533)
@@ -172,8 +172,14 @@
 GAS_addresses_iterate_peers (GNUNET_ATS_Peer_Iterator p_it, void *cls);
 
 typedef void (*GNUNET_ATS_PeerInfo_Iterator) (void *cls,
-                                              const struct GNUNET_PeerIdentity 
*id,
-                                              const char *plugin);
+    const struct GNUNET_PeerIdentity *id,
+    const char *plugin_name,
+    const void *plugin_addr, size_t plugin_addr_len,
+    const struct GNUNET_ATS_Information *atsi,
+    uint32_t atsi_count,
+    struct GNUNET_BANDWIDTH_Value32NBO
+    bandwidth_out,
+    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in);
 
 void
 GAS_addresses_get_peer_info (const struct GNUNET_PeerIdentity *peer, 
GNUNET_ATS_PeerInfo_Iterator pi_it, void *pi_it_cls);

Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c     2012-10-25 10:57:46 UTC 
(rev 24532)
+++ gnunet/src/ats/gnunet-service-ats_performance.c     2012-10-25 11:25:08 UTC 
(rev 24533)
@@ -93,19 +93,25 @@
   return NULL;
 }
 
-
 static void
 peerinfo_it (void *cls,
              const struct GNUNET_PeerIdentity *id,
-             const char *plugin)
+             const char *plugin_name,
+             const void *plugin_addr, size_t plugin_addr_len,
+             const struct GNUNET_ATS_Information *atsi,
+             uint32_t atsi_count,
+             struct GNUNET_BANDWIDTH_Value32NBO
+             bandwidth_out,
+             struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
   struct PerformanceClient *pc = cls;
   GNUNET_assert (NULL != pc);
   if (NULL != id)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s' plugin 
`%s'\n", GNUNET_i2s (id), plugin);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s' plugin `%s' 
BW out %llu, BW in %llu \n",
+        GNUNET_i2s (id),
+        plugin_name, ntohl (bandwidth_out.value__), ntohl 
(bandwidth_in.value__));
     /* TODO: Notify client here! */
-    //GNUNET_break (0);
   }
 
 }