[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25061 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25061 - gnunet/src/ats |
Date: |
Tue, 20 Nov 2012 09:18:18 +0100 |
Author: wachs
Date: 2012-11-20 09:18:18 +0100 (Tue, 20 Nov 2012)
New Revision: 25061
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-11-20 08:00:46 UTC
(rev 25060)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2012-11-20 08:18:18 UTC
(rev 25061)
@@ -1156,7 +1156,7 @@
struct GNUNET_ATS_Information *ats;
uint32_t ats_count;
- if ((NULL != pi_ctx->it) && (GNUNET_YES == addr->used))
+ if (NULL != pi_ctx->it)
{
ats_count = assemble_ats_information (addr, &ats);
@@ -1164,6 +1164,7 @@
&addr->peer,
addr->plugin,
addr->addr, addr->addr_len,
+ addr->active,
ats, ats_count,
addr->assigned_bw_out,
addr->assigned_bw_in);
@@ -1187,6 +1188,8 @@
struct GNUNET_BANDWIDTH_Value32NBO zero_bw;
GNUNET_assert (NULL != peer);
GNUNET_assert (NULL != addresses);
+ if (NULL == pi_it)
+ return; /* does not make sense without callback */
zero_bw = GNUNET_BANDWIDTH_value_init (0);
pi_ctx.it = pi_it;
@@ -1195,7 +1198,7 @@
GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
&peerinfo_it, &pi_ctx);
if (NULL != pi_it)
- pi_it (pi_it_cls, NULL, NULL, NULL, 0, NULL, 0, zero_bw, zero_bw);
+ pi_it (pi_it_cls, NULL, NULL, NULL, 0, GNUNET_NO, NULL, 0, zero_bw,
zero_bw);
}
Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h 2012-11-20 08:00:46 UTC
(rev 25060)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h 2012-11-20 08:18:18 UTC
(rev 25061)
@@ -180,6 +180,7 @@
const struct GNUNET_PeerIdentity *id,
const char *plugin_name,
const void *plugin_addr, size_t plugin_addr_len,
+ const int address_active,
const struct GNUNET_ATS_Information *atsi,
uint32_t atsi_count,
struct GNUNET_BANDWIDTH_Value32NBO
Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c 2012-11-20 08:00:46 UTC
(rev 25060)
+++ gnunet/src/ats/gnunet-service-ats_performance.c 2012-11-20 08:18:18 UTC
(rev 25061)
@@ -220,6 +220,7 @@
const struct GNUNET_PeerIdentity *id,
const char *plugin_name,
const void *plugin_addr, size_t plugin_addr_len,
+ const int active,
const struct GNUNET_ATS_Information *atsi,
uint32_t atsi_count,
struct GNUNET_BANDWIDTH_Value32NBO
@@ -298,7 +299,7 @@
const struct GNUNET_MessageHeader *message)
{
struct PerformanceClient *pc;
- struct AddressListRequestMessage * alrm = cls;
+ struct AddressListRequestMessage * alrm = (struct AddressListRequestMessage
*) message;
struct GNUNET_PeerIdentity allzeros;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25061 - gnunet/src/ats,
gnunet <=