diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-05 12:52:20 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-05 12:52:20 +0000 |
commit | c55971f17dc99f9833af48e078c8f681be771cb7 (patch) | |
tree | 544fd671b67903506419c98d463d086a696e25a1 /src/ats/plugin_ats_ril.c | |
parent | 15dd8e6cc1199d611d804853e134882bf13b234a (diff) | |
download | gnunet-c55971f17dc99f9833af48e078c8f681be771cb7.tar.gz gnunet-c55971f17dc99f9833af48e078c8f681be771cb7.zip |
big ATS refactoring, no serious semantic changes should stem from this
Diffstat (limited to 'src/ats/plugin_ats_ril.c')
-rw-r--r-- | src/ats/plugin_ats_ril.c | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c index 5c396e82e..31bed2a27 100644 --- a/src/ats/plugin_ats_ril.c +++ b/src/ats/plugin_ats_ril.c | |||
@@ -2386,74 +2386,6 @@ GAS_ril_address_property_changed (void *solver, | |||
2386 | 2386 | ||
2387 | 2387 | ||
2388 | /** | 2388 | /** |
2389 | * Update the session of an address in the solver | ||
2390 | * | ||
2391 | * NOTE: values in addresses are already updated | ||
2392 | * | ||
2393 | * @param solver solver handle | ||
2394 | * @param address the address | ||
2395 | * @param cur_session the current session | ||
2396 | * @param new_session the new session | ||
2397 | */ | ||
2398 | static void | ||
2399 | GAS_ril_address_session_changed (void *solver, | ||
2400 | struct ATS_Address *address, | ||
2401 | uint32_t cur_session, | ||
2402 | uint32_t new_session) | ||
2403 | { | ||
2404 | LOG(GNUNET_ERROR_TYPE_DEBUG, | ||
2405 | "API_address_session_changed()\n"); | ||
2406 | } | ||
2407 | |||
2408 | |||
2409 | /** | ||
2410 | * Notify solver that the network an address is located in has changed | ||
2411 | * | ||
2412 | * NOTE: values in addresses are already updated | ||
2413 | * | ||
2414 | * @param solver solver handle | ||
2415 | * @param address the address | ||
2416 | * @param current_network the current network | ||
2417 | * @param new_network the new network | ||
2418 | */ | ||
2419 | static void | ||
2420 | GAS_ril_address_change_network (void *solver, | ||
2421 | struct ATS_Address *address, | ||
2422 | uint32_t current_network, | ||
2423 | uint32_t new_network) | ||
2424 | { | ||
2425 | struct GAS_RIL_Handle *s = solver; | ||
2426 | struct RIL_Peer_Agent *agent; | ||
2427 | |||
2428 | LOG(GNUNET_ERROR_TYPE_DEBUG, | ||
2429 | "API_address_change_network() Network type changed, moving " | ||
2430 | "%s address of peer %s from '%s' to '%s'\n", | ||
2431 | (GNUNET_YES == address->active) ? "active" : "inactive", GNUNET_i2s (&address->peer), | ||
2432 | GNUNET_ATS_print_network_type (current_network), GNUNET_ATS_print_network_type (new_network)); | ||
2433 | |||
2434 | s->parameters.temperature = s->parameters.temperature_init; | ||
2435 | s->parameters.epsilon = s->parameters.epsilon_init; | ||
2436 | |||
2437 | if (address->active && !ril_network_is_active (solver, new_network)) | ||
2438 | { | ||
2439 | GAS_ril_address_delete (solver, address, GNUNET_NO); | ||
2440 | return; | ||
2441 | } | ||
2442 | |||
2443 | agent = ril_get_agent (s, &address->peer, GNUNET_NO); | ||
2444 | if (NULL == agent) | ||
2445 | { | ||
2446 | GNUNET_assert(!ril_network_is_active (solver, current_network)); | ||
2447 | |||
2448 | GAS_ril_address_add (s, address, new_network); | ||
2449 | return; | ||
2450 | } | ||
2451 | |||
2452 | address->solver_information = ril_get_network(solver, new_network); | ||
2453 | } | ||
2454 | |||
2455 | |||
2456 | /** | ||
2457 | * Give feedback about the current assignment | 2389 | * Give feedback about the current assignment |
2458 | * | 2390 | * |
2459 | * @param solver the solver handle | 2391 | * @param solver the solver handle |
@@ -2850,8 +2782,6 @@ libgnunet_plugin_ats_ril_init (void *cls) | |||
2850 | 2782 | ||
2851 | env->sf.s_add = &GAS_ril_address_add; | 2783 | env->sf.s_add = &GAS_ril_address_add; |
2852 | env->sf.s_address_update_property = &GAS_ril_address_property_changed; | 2784 | env->sf.s_address_update_property = &GAS_ril_address_property_changed; |
2853 | env->sf.s_address_update_session = &GAS_ril_address_session_changed; | ||
2854 | env->sf.s_address_update_network = &GAS_ril_address_change_network; | ||
2855 | env->sf.s_get = &GAS_ril_get_preferred_address; | 2785 | env->sf.s_get = &GAS_ril_get_preferred_address; |
2856 | env->sf.s_get_stop = &GAS_ril_stop_get_preferred_address; | 2786 | env->sf.s_get_stop = &GAS_ril_stop_get_preferred_address; |
2857 | env->sf.s_pref = &GAS_ril_address_change_preference; | 2787 | env->sf.s_pref = &GAS_ril_address_change_preference; |