diff options
Diffstat (limited to 'src/ats/plugin_ats_ril.c')
-rw-r--r-- | src/ats/plugin_ats_ril.c | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c index c87876ea1..5c396e82e 100644 --- a/src/ats/plugin_ats_ril.c +++ b/src/ats/plugin_ats_ril.c | |||
@@ -2166,7 +2166,7 @@ GAS_ril_address_change_preference (void *solver, | |||
2166 | * @param network network type of this address | 2166 | * @param network network type of this address |
2167 | */ | 2167 | */ |
2168 | static void | 2168 | static void |
2169 | GAS_ril_address_add (void *solver, | 2169 | GAS_ril_address_add (void *solver, |
2170 | struct ATS_Address *address, | 2170 | struct ATS_Address *address, |
2171 | uint32_t network) | 2171 | uint32_t network) |
2172 | { | 2172 | { |
@@ -2181,7 +2181,7 @@ GAS_ril_address_add (void *solver, | |||
2181 | int i; | 2181 | int i; |
2182 | unsigned int zero; | 2182 | unsigned int zero; |
2183 | 2183 | ||
2184 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2184 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2185 | "API_address_add()\n"); | 2185 | "API_address_add()\n"); |
2186 | 2186 | ||
2187 | net = ril_get_network (s, network); | 2187 | net = ril_get_network (s, network); |
@@ -2256,7 +2256,7 @@ GAS_ril_address_add (void *solver, | |||
2256 | */ | 2256 | */ |
2257 | static void | 2257 | static void |
2258 | GAS_ril_address_delete (void *solver, | 2258 | GAS_ril_address_delete (void *solver, |
2259 | struct ATS_Address *address, | 2259 | struct ATS_Address *address, |
2260 | int session_only) | 2260 | int session_only) |
2261 | { | 2261 | { |
2262 | struct GAS_RIL_Handle *s = solver; | 2262 | struct GAS_RIL_Handle *s = solver; |
@@ -2272,7 +2272,7 @@ GAS_ril_address_delete (void *solver, | |||
2272 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2272 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2273 | "API_address_delete() Delete %s%s %s address %s for peer '%s'\n", | 2273 | "API_address_delete() Delete %s%s %s address %s for peer '%s'\n", |
2274 | session_only ? "session for " : "", address->active ? "active" : "inactive", address->plugin, | 2274 | session_only ? "session for " : "", address->active ? "active" : "inactive", address->plugin, |
2275 | address->addr, | 2275 | address->addr, |
2276 | GNUNET_i2s (&address->peer)); | 2276 | GNUNET_i2s (&address->peer)); |
2277 | 2277 | ||
2278 | agent = ril_get_agent (s, &address->peer, GNUNET_NO); | 2278 | agent = ril_get_agent (s, &address->peer, GNUNET_NO); |
@@ -2373,7 +2373,7 @@ GAS_ril_address_property_changed (void *solver, | |||
2373 | 2373 | ||
2374 | LOG(GNUNET_ERROR_TYPE_DEBUG, | 2374 | LOG(GNUNET_ERROR_TYPE_DEBUG, |
2375 | "API_address_property_changed() Property '%s' for peer '%s' address %s changed " | 2375 | "API_address_property_changed() Property '%s' for peer '%s' address %s changed " |
2376 | "to %.2f \n", | 2376 | "to %.2f \n", |
2377 | GNUNET_ATS_print_property_type (type), | 2377 | GNUNET_ATS_print_property_type (type), |
2378 | GNUNET_i2s (&address->peer), | 2378 | GNUNET_i2s (&address->peer), |
2379 | address->addr, rel_value); | 2379 | address->addr, rel_value); |
@@ -2407,27 +2407,6 @@ GAS_ril_address_session_changed (void *solver, | |||
2407 | 2407 | ||
2408 | 2408 | ||
2409 | /** | 2409 | /** |
2410 | * Notify the solver that an address is (not) actively used by transport | ||
2411 | * to communicate with a remote peer | ||
2412 | * | ||
2413 | * NOTE: values in addresses are already updated | ||
2414 | * | ||
2415 | * @param solver solver handle | ||
2416 | * @param address the address | ||
2417 | * @param in_use usage state | ||
2418 | */ | ||
2419 | static void | ||
2420 | GAS_ril_address_inuse_changed (void *solver, | ||
2421 | struct ATS_Address *address, | ||
2422 | int in_use) | ||
2423 | { | ||
2424 | LOG(GNUNET_ERROR_TYPE_DEBUG, | ||
2425 | "API_address_inuse_changed() Usage for %s address of peer '%s' changed to %s\n", | ||
2426 | address->plugin, GNUNET_i2s (&address->peer), (GNUNET_YES == in_use) ? "USED" : "UNUSED"); | ||
2427 | } | ||
2428 | |||
2429 | |||
2430 | /** | ||
2431 | * Notify solver that the network an address is located in has changed | 2410 | * Notify solver that the network an address is located in has changed |
2432 | * | 2411 | * |
2433 | * NOTE: values in addresses are already updated | 2412 | * NOTE: values in addresses are already updated |
@@ -2446,7 +2425,7 @@ GAS_ril_address_change_network (void *solver, | |||
2446 | struct GAS_RIL_Handle *s = solver; | 2425 | struct GAS_RIL_Handle *s = solver; |
2447 | struct RIL_Peer_Agent *agent; | 2426 | struct RIL_Peer_Agent *agent; |
2448 | 2427 | ||
2449 | LOG(GNUNET_ERROR_TYPE_DEBUG, | 2428 | LOG(GNUNET_ERROR_TYPE_DEBUG, |
2450 | "API_address_change_network() Network type changed, moving " | 2429 | "API_address_change_network() Network type changed, moving " |
2451 | "%s address of peer %s from '%s' to '%s'\n", | 2430 | "%s address of peer %s from '%s' to '%s'\n", |
2452 | (GNUNET_YES == address->active) ? "active" : "inactive", GNUNET_i2s (&address->peer), | 2431 | (GNUNET_YES == address->active) ? "active" : "inactive", GNUNET_i2s (&address->peer), |
@@ -2526,8 +2505,8 @@ GAS_ril_bulk_stop (void *solver) | |||
2526 | { | 2505 | { |
2527 | struct GAS_RIL_Handle *s = solver; | 2506 | struct GAS_RIL_Handle *s = solver; |
2528 | 2507 | ||
2529 | LOG(GNUNET_ERROR_TYPE_DEBUG, | 2508 | LOG(GNUNET_ERROR_TYPE_DEBUG, |
2530 | "API_bulk_stop() lock: %d\n", | 2509 | "API_bulk_stop() lock: %d\n", |
2531 | s->bulk_lock - 1); | 2510 | s->bulk_lock - 1); |
2532 | 2511 | ||
2533 | if (s->bulk_lock < 1) | 2512 | if (s->bulk_lock < 1) |
@@ -2604,7 +2583,7 @@ GAS_ril_stop_get_preferred_address (void *solver, | |||
2604 | struct GAS_RIL_Handle *s = solver; | 2583 | struct GAS_RIL_Handle *s = solver; |
2605 | struct RIL_Peer_Agent *agent; | 2584 | struct RIL_Peer_Agent *agent; |
2606 | 2585 | ||
2607 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2586 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2608 | "API_stop_get_preferred_address()"); | 2587 | "API_stop_get_preferred_address()"); |
2609 | 2588 | ||
2610 | agent = ril_get_agent (s, peer, GNUNET_NO); | 2589 | agent = ril_get_agent (s, peer, GNUNET_NO); |
@@ -2872,7 +2851,6 @@ libgnunet_plugin_ats_ril_init (void *cls) | |||
2872 | env->sf.s_add = &GAS_ril_address_add; | 2851 | env->sf.s_add = &GAS_ril_address_add; |
2873 | env->sf.s_address_update_property = &GAS_ril_address_property_changed; | 2852 | env->sf.s_address_update_property = &GAS_ril_address_property_changed; |
2874 | env->sf.s_address_update_session = &GAS_ril_address_session_changed; | 2853 | env->sf.s_address_update_session = &GAS_ril_address_session_changed; |
2875 | env->sf.s_address_update_inuse = &GAS_ril_address_inuse_changed; | ||
2876 | env->sf.s_address_update_network = &GAS_ril_address_change_network; | 2854 | env->sf.s_address_update_network = &GAS_ril_address_change_network; |
2877 | env->sf.s_get = &GAS_ril_get_preferred_address; | 2855 | env->sf.s_get = &GAS_ril_get_preferred_address; |
2878 | env->sf.s_get_stop = &GAS_ril_stop_get_preferred_address; | 2856 | env->sf.s_get_stop = &GAS_ril_stop_get_preferred_address; |