From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 13 Dec 2011 15:13:07 +0000 (+0000)
Subject: fixing crash 0002007
X-Git-Tag: initial-import-from-subversion-38251~15655
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5838db58281b2f734b29a7801d70f42fda9310cd;p=oweals%2Fgnunet.git

fixing crash 0002007
adding network information to addresses
---

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,
   sh->suggest_cb_cls = suggest_cb_cls;
   GNUNET_array_grow (sh->session_array, sh->session_array_size, 4);
   GNUNET_OS_network_interfaces_list(interface_proc, sh);
-  sh->interface_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, get_addresses, NULL);
+  sh->interface_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, get_addresses, sh);
   reconnect (sh);
   return sh;
 }
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
 
   uint32_t atsp_cost_wlan;
 
+  uint32_t atsp_network_type;
+
   struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in;
 
   struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out;
@@ -279,6 +281,10 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
     case GNUNET_ATS_COST_WLAN:
       old->atsp_cost_wlan = ntohl (atsi[i].value);
       break;
+    case GNUNET_ATS_NETWORK_TYPE:
+      old->atsp_network_type = ntohl (atsi[i].value);
+      break;
+
     default:
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Received unsupported ATS type %u\n", ntohl (atsi[i].type));