diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-12-13 15:13:07 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-12-13 15:13:07 +0000 |
commit | 5838db58281b2f734b29a7801d70f42fda9310cd (patch) | |
tree | e6d3286e9c51c7c73cb1f5c101909ea3c31610a0 /src/ats | |
parent | 00a56212f72da3fe730eae9e73a9df56e9983b27 (diff) | |
download | gnunet-5838db58281b2f734b29a7801d70f42fda9310cd.tar.gz gnunet-5838db58281b2f734b29a7801d70f42fda9310cd.zip |
fixing crash 0002007
adding network information to addresses
Diffstat (limited to 'src/ats')
-rw-r--r-- | src/ats/ats_api_scheduling.c | 2 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index c5a9c623f..03b8e3411 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c | |||
@@ -860,7 +860,7 @@ GNUNET_ATS_scheduling_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
860 | sh->suggest_cb_cls = suggest_cb_cls; | 860 | sh->suggest_cb_cls = suggest_cb_cls; |
861 | GNUNET_array_grow (sh->session_array, sh->session_array_size, 4); | 861 | GNUNET_array_grow (sh->session_array, sh->session_array_size, 4); |
862 | GNUNET_OS_network_interfaces_list(interface_proc, sh); | 862 | GNUNET_OS_network_interfaces_list(interface_proc, sh); |
863 | sh->interface_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, get_addresses, NULL); | 863 | sh->interface_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, get_addresses, sh); |
864 | reconnect (sh); | 864 | reconnect (sh); |
865 | return sh; | 865 | return sh; |
866 | } | 866 | } |
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 159ff685e..875633a6e 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -62,6 +62,8 @@ struct ATS_Address | |||
62 | 62 | ||
63 | uint32_t atsp_cost_wlan; | 63 | uint32_t atsp_cost_wlan; |
64 | 64 | ||
65 | uint32_t atsp_network_type; | ||
66 | |||
65 | struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in; | 67 | struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in; |
66 | 68 | ||
67 | struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out; | 69 | struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out; |
@@ -279,6 +281,10 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer, | |||
279 | case GNUNET_ATS_COST_WLAN: | 281 | case GNUNET_ATS_COST_WLAN: |
280 | old->atsp_cost_wlan = ntohl (atsi[i].value); | 282 | old->atsp_cost_wlan = ntohl (atsi[i].value); |
281 | break; | 283 | break; |
284 | case GNUNET_ATS_NETWORK_TYPE: | ||
285 | old->atsp_network_type = ntohl (atsi[i].value); | ||
286 | break; | ||
287 | |||
282 | default: | 288 | default: |
283 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 289 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
284 | "Received unsupported ATS type %u\n", ntohl (atsi[i].type)); | 290 | "Received unsupported ATS type %u\n", ntohl (atsi[i].type)); |