aboutsummaryrefslogtreecommitdiff
path: root/src/ats/gnunet-service-ats_addresses.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-09-26 12:29:44 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-09-26 12:29:44 +0000
commit19d15fe2f575f4f6db2410d9de3ffa4de93a837b (patch)
treef986e5df5af1e8330a536ffa2009e02e79cb33b7 /src/ats/gnunet-service-ats_addresses.c
parent962b698c8f339b8d8187278941a537e9fc4c9ad7 (diff)
downloadgnunet-19d15fe2f575f4f6db2410d9de3ffa4de93a837b.tar.gz
gnunet-19d15fe2f575f4f6db2410d9de3ffa4de93a837b.zip
modifications to addresses and proportional solver
Diffstat (limited to 'src/ats/gnunet-service-ats_addresses.c')
-rw-r--r--src/ats/gnunet-service-ats_addresses.c25
1 files changed, 7 insertions, 18 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 50a72d80d..300febf09 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -787,7 +787,10 @@ GAS_addresses_add (struct GAS_Addresses_Handle *handle,
787 { 787 {
788 /* Add a new address */ 788 /* Add a new address */
789 GNUNET_assert( 789 GNUNET_assert(
790 GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (handle->addresses, &peer->hashPubKey, new_address, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); 790 GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (handle->addresses,
791 &peer->hashPubKey,
792 new_address,
793 GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
791 794
792 GNUNET_STATISTICS_set (handle->stat, "# addresses", 795 GNUNET_STATISTICS_set (handle->stat, "# addresses",
793 GNUNET_CONTAINER_multihashmap_size (handle->addresses), GNUNET_NO); 796 GNUNET_CONTAINER_multihashmap_size (handle->addresses), GNUNET_NO);
@@ -1231,23 +1234,6 @@ GAS_addresses_request_address_cancel (struct GAS_Addresses_Handle *handle,
1231 GNUNET_free(cur); 1234 GNUNET_free(cur);
1232} 1235}
1233 1236
1234/*
1235 static int
1236 addrinfo_it (void *cls, const struct GNUNET_HashCode *key, void *value)
1237 {
1238 static int count = 0;
1239 struct GNUNET_PeerIdentity *id = cls;
1240 struct ATS_Address *aa = value;
1241
1242 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
1243 "[%u] Peer `%s' %s length %u session %u active %s\n",
1244 count, GNUNET_i2s (id), aa->plugin, aa->addr_len, aa->session_id,
1245 (GNUNET_YES == aa->active) ? "active" : "inactive");
1246
1247 count ++;
1248 return GNUNET_OK;
1249 }
1250 */
1251 1237
1252/** 1238/**
1253 * Request address suggestions for a peer 1239 * Request address suggestions for a peer
@@ -1277,6 +1263,9 @@ GAS_addresses_request_address (struct GAS_Addresses_Handle *handle,
1277 { 1263 {
1278 cur = GNUNET_malloc (sizeof (struct GAS_Addresses_Suggestion_Requests)); 1264 cur = GNUNET_malloc (sizeof (struct GAS_Addresses_Suggestion_Requests));
1279 cur->id = (*peer); 1265 cur->id = (*peer);
1266 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
1267 "Adding new address suggestion request for `%s'\n",
1268 GNUNET_i2s (peer));
1280 GNUNET_CONTAINER_DLL_insert(handle->r_head, handle->r_tail, cur); 1269 GNUNET_CONTAINER_DLL_insert(handle->r_head, handle->r_tail, cur);
1281 } 1270 }
1282 1271