diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-08 16:39:33 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-08 16:39:33 +0000 |
commit | 03cece829b042e5a829a633e2e790ab83ac9308e (patch) | |
tree | 13e7efded3e389d8a8340f5a5cdba956566980e7 /src | |
parent | 0e29d84d844a3613f5ecf9e033b8c20f88affe30 (diff) | |
download | gnunet-03cece829b042e5a829a633e2e790ab83ac9308e.tar.gz gnunet-03cece829b042e5a829a633e2e790ab83ac9308e.zip |
cleaning up get_active_address
Diffstat (limited to 'src')
-rw-r--r-- | src/ats/plugin_ats_proportional.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c index 329f2ad5d..e29e352c5 100644 --- a/src/ats/plugin_ats_proportional.c +++ b/src/ats/plugin_ats_proportional.c | |||
@@ -843,20 +843,18 @@ get_active_address_it (void *cls, | |||
843 | /** | 843 | /** |
844 | * Find current active address for peer | 844 | * Find current active address for peer |
845 | * | 845 | * |
846 | * @param solver the solver handle | 846 | * @param s the solver handle |
847 | * @param addresses the address set | ||
848 | * @param peer the peer | 847 | * @param peer the peer |
849 | * @return active address or NULL | 848 | * @return active address or NULL |
850 | */ | 849 | */ |
851 | static struct ATS_Address * | 850 | static struct ATS_Address * |
852 | get_active_address (void *solver, | 851 | get_active_address (struct GAS_PROPORTIONAL_Handle *s, |
853 | const struct GNUNET_CONTAINER_MultiPeerMap * addresses, | ||
854 | const struct GNUNET_PeerIdentity *peer) | 852 | const struct GNUNET_PeerIdentity *peer) |
855 | { | 853 | { |
856 | static struct ATS_Address *dest; | 854 | struct ATS_Address *dest; |
857 | 855 | ||
858 | dest = NULL; | 856 | dest = NULL; |
859 | GNUNET_CONTAINER_multipeermap_get_multiple (addresses, | 857 | GNUNET_CONTAINER_multipeermap_get_multiple (s->env->addresses, |
860 | peer, | 858 | peer, |
861 | &get_active_address_it, | 859 | &get_active_address_it, |
862 | &dest); | 860 | &dest); |
@@ -1092,7 +1090,6 @@ update_active_address (struct GAS_PROPORTIONAL_Handle *s, | |||
1092 | 1090 | ||
1093 | /* Find active address */ | 1091 | /* Find active address */ |
1094 | current_address = get_active_address (s, | 1092 | current_address = get_active_address (s, |
1095 | s->env->addresses, | ||
1096 | peer); | 1093 | peer); |
1097 | 1094 | ||
1098 | LOG (GNUNET_ERROR_TYPE_INFO, | 1095 | LOG (GNUNET_ERROR_TYPE_INFO, |
@@ -1220,7 +1217,6 @@ GAS_proportional_address_change_preference (void *solver, | |||
1220 | 1217 | ||
1221 | /* This peer is requested, find best address */ | 1218 | /* This peer is requested, find best address */ |
1222 | active_address = get_active_address (s, | 1219 | active_address = get_active_address (s, |
1223 | s->env->addresses, | ||
1224 | peer); | 1220 | peer); |
1225 | best_address = update_active_address (s, peer); | 1221 | best_address = update_active_address (s, peer); |
1226 | 1222 | ||
@@ -1298,7 +1294,6 @@ GAS_proportional_stop_get_preferred_address (void *solver, | |||
1298 | struct Network *cur_net; | 1294 | struct Network *cur_net; |
1299 | 1295 | ||
1300 | cur = get_active_address (s, | 1296 | cur = get_active_address (s, |
1301 | s->env->addresses, | ||
1302 | peer); | 1297 | peer); |
1303 | if (NULL != cur) | 1298 | if (NULL != cur) |
1304 | { | 1299 | { |
@@ -1383,27 +1378,13 @@ GAS_proportional_address_property_changed (void *solver, | |||
1383 | double rel_value) | 1378 | double rel_value) |
1384 | { | 1379 | { |
1385 | struct GAS_PROPORTIONAL_Handle *s = solver; | 1380 | struct GAS_PROPORTIONAL_Handle *s = solver; |
1386 | struct Network *n; | ||
1387 | struct AddressWrapper *asi; | 1381 | struct AddressWrapper *asi; |
1388 | struct ATS_Address *best_address; | 1382 | struct ATS_Address *best_address; |
1389 | struct ATS_Address *active_address; | 1383 | struct ATS_Address *active_address; |
1390 | 1384 | ||
1391 | asi = address->solver_information; | 1385 | asi = address->solver_information; |
1392 | if (NULL == asi) | ||
1393 | { | ||
1394 | GNUNET_break(0); | ||
1395 | return; | ||
1396 | } | ||
1397 | |||
1398 | n = asi->network; | ||
1399 | if (NULL == n) | ||
1400 | { | ||
1401 | GNUNET_break(0); | ||
1402 | return; | ||
1403 | } | ||
1404 | |||
1405 | LOG (GNUNET_ERROR_TYPE_INFO, | 1386 | LOG (GNUNET_ERROR_TYPE_INFO, |
1406 | "Property `%s' for peer `%s' address %p changed to %.2f \n", | 1387 | "Property `%s' for peer `%s' address %p changed to %.2f\n", |
1407 | GNUNET_ATS_print_property_type (type), | 1388 | GNUNET_ATS_print_property_type (type), |
1408 | GNUNET_i2s (&address->peer), | 1389 | GNUNET_i2s (&address->peer), |
1409 | address, | 1390 | address, |
@@ -1416,7 +1397,6 @@ GAS_proportional_address_property_changed (void *solver, | |||
1416 | 1397 | ||
1417 | /* This peer is requested, find active and best address */ | 1398 | /* This peer is requested, find active and best address */ |
1418 | active_address = get_active_address(s, | 1399 | active_address = get_active_address(s, |
1419 | s->env->addresses, | ||
1420 | &address->peer); | 1400 | &address->peer); |
1421 | best_address = update_active_address (s, | 1401 | best_address = update_active_address (s, |
1422 | &address->peer); | 1402 | &address->peer); |
@@ -1520,7 +1500,6 @@ GAS_proportional_address_delete (void *solver, | |||
1520 | net->total_addresses, | 1500 | net->total_addresses, |
1521 | net->active_addresses); | 1501 | net->active_addresses); |
1522 | 1502 | ||
1523 | /* Remove address */ | ||
1524 | GNUNET_CONTAINER_DLL_remove (net->head, | 1503 | GNUNET_CONTAINER_DLL_remove (net->head, |
1525 | net->tail, | 1504 | net->tail, |
1526 | aw); | 1505 | aw); |