[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29607 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29607 - gnunet/src/ats |
Date: |
Thu, 26 Sep 2013 14:29:44 +0200 |
Author: wachs
Date: 2013-09-26 14:29:44 +0200 (Thu, 26 Sep 2013)
New Revision: 29607
Modified:
gnunet/src/ats/gnunet-service-ats-solver_proportional.c
gnunet/src/ats/gnunet-service-ats_addresses.c
Log:
modifications to addresses and proportional solver
Modified: gnunet/src/ats/gnunet-service-ats-solver_proportional.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats-solver_proportional.c 2013-09-26
12:26:23 UTC (rev 29606)
+++ gnunet/src/ats/gnunet-service-ats-solver_proportional.c 2013-09-26
12:29:44 UTC (rev 29607)
@@ -910,11 +910,12 @@
GNUNET_assert(peer != NULL);
/* Add to list of pending requests */
- if (GNUNET_NO
- == GNUNET_CONTAINER_multihashmap_contains (s->requests,
+ if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains (s->requests,
&peer->hashPubKey))
- GNUNET_CONTAINER_multihashmap_put (s->requests, &peer->hashPubKey, NULL,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ {
+ GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put
(s->requests, &peer->hashPubKey, NULL,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ }
/* Get address with: stick to current address, lower distance, lower latency
*/
fba_ctx.s = s;
@@ -1347,15 +1348,11 @@
addresse_increment (s, net, GNUNET_YES, GNUNET_NO);
aw->addr->solver_information = net;
- if ((GNUNET_YES
- == GNUNET_CONTAINER_multihashmap_contains (s->requests,
- &address->peer.hashPubKey))
- && (NULL
- == get_active_address (s,
- (struct GNUNET_CONTAINER_MultiHashMap *) s->addresses,
- &address->peer)))
- GAS_proportional_get_preferred_address (s, &address->peer);
-
+ if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (s->requests,
&address->peer.hashPubKey))
+ {
+ if (NULL == get_active_address (s, (struct GNUNET_CONTAINER_MultiHashMap
*) s->addresses, &address->peer))
+ GAS_proportional_get_preferred_address (s, &address->peer);
+ }
LOG(GNUNET_ERROR_TYPE_DEBUG,
"After adding address now total %u and active %u addresses in network
`%s'\n",
net->total_addresses, net->active_addresses, net->desc);
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2013-09-26 12:26:23 UTC
(rev 29606)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2013-09-26 12:29:44 UTC
(rev 29607)
@@ -787,7 +787,10 @@
{
/* Add a new address */
GNUNET_assert(
- GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (handle->addresses,
&peer->hashPubKey, new_address, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+ GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (handle->addresses,
+ &peer->hashPubKey,
+ new_address,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
GNUNET_STATISTICS_set (handle->stat, "# addresses",
GNUNET_CONTAINER_multihashmap_size (handle->addresses), GNUNET_NO);
@@ -1231,24 +1234,7 @@
GNUNET_free(cur);
}
-/*
- static int
- addrinfo_it (void *cls, const struct GNUNET_HashCode *key, void *value)
- {
- static int count = 0;
- struct GNUNET_PeerIdentity *id = cls;
- struct ATS_Address *aa = value;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "[%u] Peer `%s' %s length %u session %u active %s\n",
- count, GNUNET_i2s (id), aa->plugin, aa->addr_len, aa->session_id,
- (GNUNET_YES == aa->active) ? "active" : "inactive");
-
- count ++;
- return GNUNET_OK;
- }
- */
-
/**
* Request address suggestions for a peer
*
@@ -1277,6 +1263,9 @@
{
cur = GNUNET_malloc (sizeof (struct GAS_Addresses_Suggestion_Requests));
cur->id = (*peer);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Adding new address suggestion request for `%s'\n",
+ GNUNET_i2s (peer));
GNUNET_CONTAINER_DLL_insert(handle->r_head, handle->r_tail, cur);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29607 - gnunet/src/ats,
gnunet <=