wip
[oweals/gnunet.git] / src / transport / gnunet-service-transport.c
index 8264a2577ae2fb24b5bec176153c8fa6f420d423..49f9531df6e69e6caffd83b3c564ab08036c9ee9 100644 (file)
 
 #define DEBUG_TRANSPORT_HELLO GNUNET_NO
 
+#define DEBUG_ATS GNUNET_NO
+
+#define VERBOSE_ATS GNUNET_NO
+
 /**
  * Should we do some additional checks (to validate behavior
  * of clients)?
 
 #define VERY_BIG_DOUBLE_VALUE 100000000000LL
 
+#define ATS_NEW 0
+#define ATS_Q_UPDATED 1
+#define ATS_C_UPDATED 2
+#define ATS_QC_UPDATED 3
+#define ATS_UNMODIFIED 4
+
 /**
  * List of addresses of other peers
  */
@@ -188,7 +198,9 @@ struct ForeignAddressList
    */
   struct Session *session;
 
-  struct ATS_ressource_cost * ressources;
+  struct ATS_ressource_entry * ressources;
+
+  struct ATS_quality_entry * quality;
 
   /**
    * What was the last latency observed for this address, plugin and peer?
@@ -837,32 +849,267 @@ struct CheckHelloValidatedContext
   unsigned int ve_count;
 };
 
-struct ATS_ressource_cost
+struct ATS_quality_metric
 {
        int index;
-       int atsi_index;
-       struct ATS_ressource_cost * prev;
-       struct ATS_ressource_cost * next;
-       double c_1;
+       int atis_index;
+       char * name;
 };
 
-struct ATS_plugin
+struct ATS_mechanism
 {
-       struct ATS_plugin * prev;
-       struct ATS_plugin * next;
-       char * short_name;
-       struct ATS_ressource_cost * head;
-       struct ATS_ressource_cost * tail;
+       struct ATS_mechanism * prev;
+       struct ATS_mechanism * next;
+       struct ForeignAddressList * addr;
+       struct TransportPlugin * plugin;
+       struct ATS_peer * peer;
+       int col_index;
+       int     id;
+       struct ATS_ressource_cost * rc;
 };
 
-struct ATS_quality_metric
+struct ATS_peer
+{
+       int id;
+       struct GNUNET_PeerIdentity peer;
+       struct NeighbourList * n;
+       struct ATS_mechanism * m_head;
+       struct ATS_mechanism * m_tail;
+
+       /* preference value f */
+       double f;
+       int     t;
+};
+
+struct ATS_stat
+{
+       /**
+        * result of last GLPK run
+        * 5 == OPTIMAL
+        */
+       int solution;
+
+       /**
+        * is problem currently valid and can it be solved
+        */
+       int valid;
+
+       /**
+        * Number of transport mechanisms in the problem
+        */
+       int c_mechs;
+
+       /**
+        * Number of transport mechanisms in the problem
+        */
+       int c_peers;
+
+       /**
+        * row index where quality related rows start
+        */
+       int begin_qm;
+
+       /**
+        * row index where quality related rows end
+        */
+       int end_qm;
+
+       /**
+        * row index where ressource cost related rows start
+        */
+       int begin_cr;
+
+       /**
+        * row index where ressource cost related rows end
+        */
+       int end_cr;
+
+       int col_d;
+       int col_u;
+       int col_r;
+       int col_qm;
+       int col_cr;
+};
+
+struct ATS_ressource_entry
 {
+       /* index in ressources array */
        int index;
+       /* depending ATSi parameter to calculcate limits */
        int atis_index;
-       char * name;
+       /* lower bound */
+       double c;
 };
 
 
+struct ATS_ressource
+{
+       /* index in ressources array */
+       int index;
+       /* depending ATSi parameter to calculcate limits */
+       int atis_index;
+       /* cfg option to load limits */
+       char * cfg_param;
+       /* lower bound */
+       double c_min;
+       /* upper bound */
+       double c_max;
+
+       /* cofficients for the specific plugins */
+       double c_unix;
+       double c_tcp;
+       double c_udp;
+       double c_http;
+       double c_https;
+       double c_wlan;
+       double c_default;
+};
+
+static struct ATS_ressource ressources[] =
+{
+               /* FIXME: the coefficients for the specific plugins */
+               {1, 7, "LAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 1, 3},
+               {2, 7, "WAN_BW_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 1, 1, 2, 2, 2, 3},
+               {3, 4, "WLAN_ENERGY_LIMIT", 0, VERY_BIG_DOUBLE_VALUE, 0, 0, 0, 0, 0, 2, 1}
+/*
+               {4, 4, "COST_ENERGY_CONSUMPTION", VERY_BIG_DOUBLE_VALUE},
+               {5, 5, "COST_CONNECT", VERY_BIG_DOUBLE_VALUE},
+               {6, 6, "COST_BANDWITH_AVAILABLE", VERY_BIG_DOUBLE_VALUE},
+               {7, 7, "COST_NETWORK_OVERHEAD", VERY_BIG_DOUBLE_VALUE},*/
+};
+
+static int available_ressources = 3;
+
+
+
+struct ATS_info
+{
+
+       /**
+        * Time of last execution
+        */
+       struct GNUNET_TIME_Absolute last;
+       /**
+        * Minimum intervall between two executions
+        */
+       struct GNUNET_TIME_Relative min_delta;
+       /**
+        * Regular intervall when execution is triggered
+        */
+       struct GNUNET_TIME_Relative exec_interval;
+       /**
+        * Maximum execution time per calculation
+        */
+       struct GNUNET_TIME_Relative max_exec_duration;
+
+#if HAVE_LIBGLPK
+       /**
+        * GLPK (MLP) problem object
+        */
+       glp_prob *prob;
+#endif
+
+       /**
+        * task to recalculate the bandwidth assignment
+        */
+       GNUNET_SCHEDULER_TaskIdentifier ats_task;
+
+       /**
+        * Current state of the GLPK problem
+        */
+       struct ATS_stat stat;
+
+       /**
+        * mechanisms used in current problem
+        * needed for problem modification
+        */
+       struct ATS_mechanism * mechanisms;
+
+       /**
+        * peers used in current problem
+        * needed for problem modification
+        */
+       struct ATS_peer * peers;
+
+       /**
+        * Maximum number of LP iterations per calculation
+        */
+       int max_iterations;
+
+       /**
+        * Dump problem to a file?
+        */
+       int save_mlp;
+
+       /**
+        * Dump solution to a file
+        */
+       int save_solution;
+
+       /**
+        * Dump solution when minimum peers:
+        */
+       int dump_min_peers;
+
+       /**
+        * Dump solution when minimum addresses:
+        */
+       int dump_min_addr;
+
+       /**
+        * Dump solution overwrite file:
+        */
+       int dump_overwrite;
+
+       /**
+        * Ressource costs or quality metrics changed
+        * update problem before solving
+        */
+       int modified_resources;
+
+       /**
+        * Ressource costs or quality metrics changed, update matrix
+        * update problem before solving
+        */
+       int modified_quality;
+
+       /**
+        * Peers have connected or disconnected
+        * problem has to be recreated
+        */
+       int modified_addr;
+
+       /**
+        * Was the available basis invalid and we needed to rerun simplex?
+        */
+       int simplex_rerun_required;
+
+       /**
+        * Diversity weight
+        */
+       double D;
+
+       /**
+        * Utility weight
+        */
+       double U;
+
+       /**
+        * Relativity weight
+        */
+       double R;
+
+       /**
+        * Minimum bandwidth per peer
+        */
+       int v_b_min;
+
+       /**
+        * Minimum number of connections per peer
+        */
+       int v_n_min;
+};
+
 
 /**
  * Our HELLO message.
@@ -940,6 +1187,14 @@ static struct GNUNET_STATISTICS_Handle *stats;
  */
 static struct ATS_info *ats;
 
+struct ATS_quality_entry
+{
+       int index;
+       int atsi_index;
+       uint32_t values[3];
+       int current;
+};
+
 static struct ATS_quality_metric qm[] =
 {
                {1, 1028, "QUALITY_NET_DISTANCE"},
@@ -947,6 +1202,7 @@ static struct ATS_quality_metric qm[] =
 };
 static int available_quality_metrics = 2;
 
+
 /**
  * The peer specified by the given neighbour has timed-out or a plugin
  * has disconnected.  We may either need to do nothing (other plugins
@@ -970,25 +1226,27 @@ static void disconnect_neighbour (struct NeighbourList *n, int check);
  */
 static void try_transmission_to_peer (struct NeighbourList *n);
 
+static void ats_shutdown ( );
 
-struct ATS_info * ats_init ();
-
-void ats_shutdown ( );
-
-void ats_notify_peer_connect (
+static void ats_notify_peer_connect (
                const struct GNUNET_PeerIdentity *peer,
-               const struct GNUNET_TRANSPORT_ATS_Information *ats_data);
+               const struct GNUNET_TRANSPORT_ATS_Information *ats_data, int ats_count);
 
-void ats_notify_peer_disconnect (
+static void ats_notify_peer_disconnect (
                const struct GNUNET_PeerIdentity *peer);
 
-void ats_notify_ats_data (
+#if 0
+static void ats_notify_ats_data (
                const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_TRANSPORT_ATS_Information *ats_data);
+#endif
 
 struct ForeignAddressList * ats_get_preferred_address (
                struct NeighbourList *n);
 
+static void
+ats_calculate_bandwidth_distribution ();
+
 /**
  * Find an entry in the neighbour list for a particular peer.
  *
@@ -1005,6 +1263,47 @@ find_neighbour (const struct GNUNET_PeerIdentity *key)
   return head;
 }
 
+static int update_addr_value (struct ForeignAddressList *fal, uint32_t value , int ats_index)
+{
+       int c;
+       int set = GNUNET_NO;
+       for (c=0; c<available_quality_metrics; c++)
+       {
+         if (ats_index == qm[c].atis_index)
+         {
+                 fal->quality[c].values[0] = fal->quality[c].values[1];
+                 fal->quality[c].values[1] = fal->quality[c].values[2];
+                 fal->quality[c].values[2] = value;
+                 set = GNUNET_YES;
+                 ats->modified_quality = GNUNET_YES;
+         }
+       }
+       if (set == GNUNET_NO)
+       {
+         for (c=0; c<available_ressources; c++)
+         {
+                 if (ats_index == ressources[c].atis_index)
+                 {
+                         fal->ressources[c].c = value;
+                         set = GNUNET_YES;
+                         ats->modified_resources = GNUNET_YES;
+                 }
+         }
+       }
+
+       return set;
+}
+
+static int update_addr_ats (struct ForeignAddressList *fal, const struct GNUNET_TRANSPORT_ATS_Information *ats_data, int ats_count)
+{
+       int c1, set;
+       set = GNUNET_NO;
+       for (c1=0; c1<ats_count; c1++)
+       {
+                 set = update_addr_value(fal, ntohl(ats_data[c1].value), ntohl(ats_data[c1].type));
+       }
+       return set;
+}
 
 /**
  * Find an entry in the transport list for a particular transport.
@@ -1427,7 +1726,7 @@ transmit_to_client (struct TransportClient *client,
   GNUNET_CONTAINER_DLL_insert_after (client->message_queue_head,
                                     client->message_queue_tail,
                                     client->message_queue_tail,
-                                    q);                                
+                                    q);
   client->message_count++;
   if (client->th == NULL)
     {
@@ -1701,7 +2000,7 @@ try_transmission_to_peer (struct NeighbourList *n)
 #if DEBUG_TRANSPORT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Transmission queue for `%4s' is empty\n",
-                 GNUNET_i2s (&neighbour->id));
+                 GNUNET_i2s (&n->id));
 #endif
       return;                     /* nothing to do */
     }
@@ -1782,7 +2081,7 @@ try_transmission_to_peer (struct NeighbourList *n)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending message of size %u for `%4s' to `%s' via plugin `%s'\n",
               mq->message_buf_size,
-              GNUNET_i2s (&neighbour->id),
+              GNUNET_i2s (&n->id),
              (mq->specific_address->addr != NULL)
              ? a2s (mq->plugin->short_name,
                     mq->specific_address->addr,
@@ -2008,7 +2307,7 @@ expire_address_task (void *cls,
  *        expired
  */
 static void
-update_addresses (struct TransportPlugin *plugin, 
+update_addresses (struct TransportPlugin *plugin,
                  int fresh)
 {
   static struct GNUNET_TIME_Absolute last_update;
@@ -2142,7 +2441,7 @@ try_fast_reconnect (struct TransportPlugin *p,
      Furthermore, the same mechanism (or small variation) could be used
      to switch to a better-performing plugin (ATS).
 
-     Finally, this needs to be tested throughly... */                                                          
+     Finally, this needs to be tested throughly... */
 
   /*
    * GNUNET_NO in the call below makes transport disconnect the peer,
@@ -2225,6 +2524,8 @@ plugin_env_session_end  (void *cls,
       GNUNET_SCHEDULER_cancel (pos->revalidate_task);
       pos->revalidate_task = GNUNET_SCHEDULER_NO_TASK;
     }
+  GNUNET_free_non_null(pos->ressources);
+  GNUNET_free_non_null(pos->quality);
   GNUNET_free (pos);
   if (nl->received_pong == GNUNET_NO)
     return; /* nothing to do, never connected... */
@@ -2284,9 +2585,9 @@ plugin_env_notify_address (void *cls,
   al = p->addresses;
   while (al != NULL)
     {
-      if ( (addrlen == al->addrlen) && 
+      if ( (addrlen == al->addrlen) &&
           (0 == memcmp (addr, &al[1], addrlen)) )
-        {            
+        {
          al->expires = abex;
          update_addresses (p, GNUNET_NO);
           return;
@@ -2346,7 +2647,7 @@ notify_clients_connect (const struct GNUNET_PeerIdentity *peer,
   memcpy (&cim->id, peer, sizeof (struct GNUNET_PeerIdentity));
 
   /* notify ats about connecting peer */
-  ats_notify_peer_connect (peer, &(cim->ats));
+  ats_notify_peer_connect (peer, &(cim->ats), 2);
 
   cpos = clients;
   while (cpos != NULL)
@@ -2462,6 +2763,7 @@ add_peer_address (struct NeighbourList *neighbour,
 {
   struct ReadyList *head;
   struct ForeignAddressList *ret;
+  int c;
 
   ret = find_peer_address (neighbour, tname, session, addr, addrlen);
   if (ret != NULL)
@@ -2478,7 +2780,7 @@ add_peer_address (struct NeighbourList *neighbour,
     return NULL;
   ret = GNUNET_malloc(sizeof(struct ForeignAddressList) + addrlen);
   ret->session = session;
-  if (addrlen > 0)
+  if ((addrlen > 0) && (addr != NULL))
     {
       ret->addr = (const char*) &ret[1];
       memcpy (&ret[1], addr, addrlen);
@@ -2487,7 +2789,54 @@ add_peer_address (struct NeighbourList *neighbour,
     {
       ret->addr = NULL;
     }
-  ret->ressources = NULL;
+
+  ret->ressources = GNUNET_malloc(available_ressources * sizeof (struct ATS_ressource_entry));
+  int plugin;
+  for (c=0; c<available_ressources; c++)
+  {
+         struct ATS_ressource_entry *r = ret->ressources;
+         r[c].index = c;
+         r[c].atis_index = ressources[c].atis_index;
+         if (0 == strcmp(neighbour->plugins->plugin->short_name,"unix"))
+         {
+                 r[c].c = ressources[c].c_unix;
+                 plugin = 1;
+         }
+         else if (0 == strcmp(neighbour->plugins->plugin->short_name,"udp"))
+         {
+                 r[c].c = ressources[c].c_udp;
+                 plugin = 2;
+         }
+         else if (0 == strcmp(neighbour->plugins->plugin->short_name,"tcp"))
+         {
+                 r[c].c = ressources[c].c_tcp;
+                 plugin = 3;
+         }
+         else if (0 == strcmp(neighbour->plugins->plugin->short_name,"http"))
+         {
+                 r[c].c = ressources[c].c_http;
+                 plugin = 4;
+         }
+         else if (0 == strcmp(neighbour->plugins->plugin->short_name,"https"))
+         {
+                 r[c].c = ressources[c].c_https;
+                 plugin = 5;
+         }
+         else if (0 == strcmp(neighbour->plugins->plugin->short_name,"wlan"))
+         {
+                 r[c].c = ressources[c].c_wlan;
+                 plugin = 6;
+         }
+         else
+         {
+               plugin = -1;
+               r[c].c = ressources[c].c_default;
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"Assigning default cost to peer `%s' addr plugin `%s'! This should not happen!",
+                               GNUNET_i2s(&neighbour->peer), neighbour->plugins->plugin->short_name);
+         }
+  }
+
+  ret->quality = GNUNET_malloc (available_quality_metrics * sizeof (struct ATS_quality_entry));
   ret->addrlen = addrlen;
   ret->expires = GNUNET_TIME_relative_to_absolute
     (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
@@ -3115,7 +3464,7 @@ do_blacklist_check (void *cls,
   if (bl == NULL)
     {
       bc->cont (bc->cont_cls,
-               setup_new_neighbour (&bc->peer, bc->do_hello));         
+               setup_new_neighbour (&bc->peer, bc->do_hello));
       GNUNET_free (bc);
       return;
     }
@@ -3327,7 +3676,7 @@ send_periodic_ping (void *cls,
   size_t tsize;
 
   peer_address->revalidate_task = GNUNET_SCHEDULER_NO_TASK;
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+  if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
   tp = peer_address->ready_list->plugin;
   neighbour = peer_address->ready_list->neighbour;
@@ -3493,7 +3842,7 @@ schedule_next_ping (struct ForeignAddressList *fal)
     {
       delay = GNUNET_TIME_UNIT_ZERO;
       fal->estimated = GNUNET_YES;
-    }                          
+    }
   if (GNUNET_YES == fal->connected)
     {
       delay = GNUNET_TIME_relative_min (delay,
@@ -3555,14 +3904,14 @@ handle_payload_message (const struct GNUNET_MessageHeader *message,
     {
       n->quota_violation_count++;
 #if DEBUG_TRANSPORT
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,                     
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Bandwidth quota (%u b/s) violation detected (total of %u).\n",
                  n->in_tracker.available_bytes_per_s__,
                  n->quota_violation_count);
 #endif
       /* Discount 32k per violation */
       GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker,
-                                       - 32 * 1024);           
+                                       - 32 * 1024);
     }
   else
     {
@@ -3734,7 +4083,7 @@ check_pending_validation (void *cls,
                      a2s (ve->transport_name,
                           &addr[slen],
                           alen));
-         return GNUNET_NO;     
+         return GNUNET_NO;
        }
       if (GNUNET_OK !=
          GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_USING,
@@ -3804,6 +4153,8 @@ check_pending_validation (void *cls,
                                1,
                                GNUNET_NO);
       fal->latency = GNUNET_TIME_absolute_get_duration (ve->send_time);
+      update_addr_value (fal, GNUNET_TIME_absolute_get_duration (ve->send_time).rel_value, GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY);
+
       schedule_next_ping (fal);
       if (n->latency.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
        n->latency = fal->latency;
@@ -4204,7 +4555,7 @@ check_hello_validated (void *cls,
          GNUNET_CONTAINER_DLL_remove (chvc_head,
                                       chvc_tail,
                                       chvc);
-         GNUNET_free (chvc);   
+         GNUNET_free (chvc);
        }
       return;
     }
@@ -4494,7 +4845,11 @@ disconnect_neighbour (struct NeighbourList *n, int check)
              GNUNET_SCHEDULER_cancel (peer_pos->revalidate_task);
              peer_pos->revalidate_task = GNUNET_SCHEDULER_NO_TASK;
            }
-          GNUNET_free(peer_pos);
+                 GNUNET_free(peer_pos->ressources);
+                 peer_pos->ressources = NULL;
+                 GNUNET_free(peer_pos->quality);
+                 peer_pos->ressources = NULL;
+                 GNUNET_free(peer_pos);
         }
       GNUNET_free (rpos);
     }
@@ -4721,7 +5076,7 @@ handle_ping(void *cls, const struct GNUNET_MessageHeader *message,
          GNUNET_assert (GNUNET_OK ==
                         GNUNET_CRYPTO_rsa_sign (my_private_key,
                                                 &pong->purpose,
-                                                &oal->pong_signature));        
+                                                &oal->pong_signature));
          memcpy (&pong->signature,
                  &oal->pong_signature,
                  sizeof (struct GNUNET_CRYPTO_RsaSignature));
@@ -4733,7 +5088,7 @@ handle_ping(void *cls, const struct GNUNET_MessageHeader *message,
          GNUNET_assert (GNUNET_OK ==
                         GNUNET_CRYPTO_rsa_sign (my_private_key,
                                                 &pong->purpose,
-                                                &pong->signature));    
+                                                &pong->signature));
        }
       else
        {
@@ -4804,6 +5159,9 @@ handle_ping(void *cls, const struct GNUNET_MessageHeader *message,
 }
 
 
+
+
+
 /**
  * Function called by the plugin for each received message.
  * Update data volumes, possibly notify plugins about
@@ -4851,6 +5209,7 @@ plugin_env_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
   GNUNET_assert ((plugin->api->send == NULL) || (service_context != NULL));
   peer_address = NULL;
   distance = 1;
+
   for (c=0; c<ats_count; c++)
   {
          if (ntohl(ats_data[c].type) == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE)
@@ -4858,8 +5217,10 @@ plugin_env_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                  distance = ntohl(ats_data[c].value);
          }
   }
+
   /* notify ATS about incoming data */
-  ats_notify_ats_data(peer, ats_data);
+  //ats_notify_ats_data(peer, ats_data);
+
 
   if (message != NULL)
     {
@@ -4872,7 +5233,11 @@ plugin_env_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                                         sender_address_len);
       if (peer_address != NULL)
        {
-         peer_address->distance = distance;
+
+      update_addr_ats(peer_address, ats_data, ats_count);
+      update_addr_value(peer_address, distance, GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE);
+
+      peer_address->distance = distance;
          if (GNUNET_YES == peer_address->validated)
            mark_address_connected (peer_address);
          peer_address->timeout
@@ -4883,6 +5248,7 @@ plugin_env_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
        }
       /* update traffic received amount ... */
       msize = ntohs (message->size);
+
       GNUNET_STATISTICS_update (stats,
                                gettext_noop ("# bytes received from other peers"),
                                msize,
@@ -4910,6 +5276,27 @@ plugin_env_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                                    GNUNET_NO);
          return GNUNET_CONSTANTS_QUOTA_VIOLATION_TIMEOUT;
        }
+    if ((ntohs(message->type) == GNUNET_MESSAGE_TYPE_TRANSPORT_ATS) &&
+       (ntohs(message->size) == (sizeof (struct GNUNET_MessageHeader) + sizeof (uint32_t))))
+    {
+       uint32_t value =  ntohl(*((uint32_t *) &message[1]));
+       //GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GNUNET_MESSAGE_TYPE_TRANSPORT_ATS: %i \n", value);
+       /* Force ressource and quality update */
+       if (value == 4)
+       {
+               ats->modified_resources = GNUNET_YES;
+               ats->modified_quality = GNUNET_YES;
+       }
+       /* Force cost update */
+       if (value == 3)
+               ats->modified_resources = GNUNET_YES;
+       /* Force quality update */
+       if (value == 2)
+               ats->modified_quality = GNUNET_YES;
+       /* Force full rebuild */
+       if (value == 1)
+               ats->modified_addr = GNUNET_YES;
+    }
 
 #if DEBUG_PING_PONG
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -4933,6 +5320,8 @@ plugin_env_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
        case GNUNET_MESSAGE_TYPE_TRANSPORT_PONG:
          handle_pong (plugin, message, peer, sender_address, sender_address_len);
          break;
+       case GNUNET_MESSAGE_TYPE_TRANSPORT_ATS:
+         break;
        default:
          handle_payload_message (message, n);
          break;
@@ -5440,7 +5829,7 @@ client_disconnect_notification (void *cls,
                  if (bc->th != NULL)
                    {
                      GNUNET_CONNECTION_notify_transmit_ready_cancel (bc->th);
-                     bc->th = NULL;            
+                     bc->th = NULL;
                    }
                  if (bc->task == GNUNET_SCHEDULER_NO_TASK)
                    bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check,
@@ -5508,7 +5897,6 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct TransportPlugin *plug;
   struct OwnAddressList *al;
   struct CheckHelloValidatedContext *chvc;
-  struct ATS_plugin * rc;
 
   while (neighbours != NULL)
     {
@@ -5537,16 +5925,6 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
           plug->addresses = al->next;
           GNUNET_free (al);
         }
-      rc = plug->rc;
-      struct ATS_ressource_cost * t;
-      while (rc->head != NULL)
-      {
-         t = rc->head;
-         GNUNET_CONTAINER_DLL_remove(rc->head, rc->tail, rc->head);
-         GNUNET_free(t);
-      }
-
-      GNUNET_free(plug->rc);
       GNUNET_free (plug);
     }
   if (my_private_key != NULL)
@@ -5596,95 +5974,416 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_break (bc_head == NULL);
 }
 
-struct ATS_mechanism
+#if HAVE_LIBGLPK
+static int ats_evaluate_results (int result, int solution, char * problem)
 {
-       struct ATS_mechanism * prev;
-       struct ATS_mechanism * next;
-       struct ForeignAddressList * addr;
-       struct TransportPlugin * plugin;
-       struct ATS_peer * peer;
-       int col_index;
-       int     id;
-       struct ATS_ressource_cost * rc;
-};
+       int cont = GNUNET_NO;
+       int error_kind = GNUNET_ERROR_TYPE_DEBUG;
+#if DEBUG_ATS
+       error_kind = GNUNET_ERROR_TYPE_ERROR;
+#endif
 
-struct ATS_peer
+       switch (result) {
+       case GLP_ESTOP  :    /* search terminated by application */
+               GNUNET_log (error_kind, "%s , Search terminated by application ", problem);
+               break;
+       case GLP_EITLIM :    /* iteration limit exceeded */
+               GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%s Iteration limit exceeded ", problem);
+               break;
+       break;
+       case GLP_ETMLIM :    /* time limit exceeded */
+               GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%s Time limit exceeded ", problem);
+       break;
+       case GLP_ENOPFS :    /* no primal feasible solution */
+       case GLP_ENODFS :    /* no dual feasible solution */
+               GNUNET_log (error_kind, "%s No feasible solution", problem);
+       break;
+
+       case GLP_EBADB  :    /* invalid basis */
+       case GLP_ESING  :    /* singular matrix */
+       case GLP_ECOND  :    /* ill-conditioned matrix */
+       case GLP_EBOUND :    /* invalid bounds */
+       case GLP_EFAIL  :    /* solver failed */
+       case GLP_EOBJLL :    /* objective lower limit reached */
+       case GLP_EOBJUL :    /* objective upper limit reached */
+       case GLP_EROOT  :    /* root LP optimum not provided */
+               GNUNET_log (error_kind, "%s Invalid Input data: %i\n", problem, result);
+       break;
+
+       case 0:
+                       GNUNET_log (error_kind, "%s Problem has been solved\n", problem);
+       break;
+       }
+
+       switch (solution) {
+               case GLP_UNDEF:
+                       GNUNET_log (error_kind, "%s solution is undefined\n", problem);
+                       break;
+               case GLP_OPT:
+                       GNUNET_log (error_kind, "%s solution is optimal\n", problem);
+                       cont=GNUNET_YES;
+                       break;
+               case GLP_FEAS:
+                       GNUNET_log (error_kind, "%s solution is %s feasible, however, its optimality (or non-optimality) has not been proven, \n", problem, (0==strcmp(problem,"LP")?"":"integer"));
+                       cont=GNUNET_YES;
+                       break;
+               case GLP_NOFEAS:
+                       GNUNET_log (error_kind, "%s problem has no %sfeasible solution\n", problem,  (0==strcmp(problem,"LP")?"":"integer "));
+                       break;
+               case GLP_INFEAS:
+                       GNUNET_log (error_kind, "%s problem is infeasible \n", problem);
+                       break;
+               case GLP_UNBND:
+                       GNUNET_log (error_kind, "%s problem is unbounded \n", problem);
+               default:
+                       break;
+       }
+return cont;
+}
+
+static void ats_solve_problem (unsigned int max_it, unsigned int  max_dur, unsigned int c_peers, unsigned int  c_mechs, struct ATS_stat *stat)
 {
-       int id;
-       struct GNUNET_PeerIdentity peer;
-       struct NeighbourList * n;
-       struct ATS_mechanism * m_head;
-       struct ATS_mechanism * m_tail;
+       int result;
+       int lp_solution;
+       int mlp_solution;
 
-       /* preference value f */
-       double f;
-       int     t;
-};
+       // Solving simplex
+
+       glp_smcp opt_lp;
+       glp_init_smcp(&opt_lp);
+#if VERBOSE_ATS
+       opt_lp.msg_lev = GLP_MSG_ALL;
+#else
+       opt_lp.msg_lev = GLP_MSG_OFF;
+#endif
+
+       // setting iteration limit
+       opt_lp.it_lim = max_it;
+       // maximum duration
+       opt_lp.tm_lim = max_dur;
+
+       if (ats->modified_addr == GNUNET_YES)
+               opt_lp.presolve = GLP_ON;
+       result = glp_simplex(ats->prob, &opt_lp);
+       lp_solution =  glp_get_status (ats->prob);
+
+       if ((result == GLP_ETMLIM) || (result == GLP_ETMLIM))
+       {
+               ats->stat.valid = GNUNET_NO;
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS exceeded time or iteration limit!\n");
+               return;
+       }
+
+       if (ats_evaluate_results(result, lp_solution, "LP") == GNUNET_YES)
+       {
+                       stat->valid = GNUNET_YES;
+       }
+       else
+       {
+               ats->simplex_rerun_required = GNUNET_YES;
+               opt_lp.presolve = GLP_ON;
+               result = glp_simplex(ats->prob, &opt_lp);
+               lp_solution =  glp_get_status (ats->prob);
+
+               // TODO: Remove if this does not appear until release
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "EXECUTED SIMPLEX WITH PRESOLVER! %i", lp_solution);
 
-struct ATS_result
+               if (ats_evaluate_results(result, lp_solution, "LP") != GNUNET_YES)
+               {
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "After execution simplex with presolver: STILL INVALID!\n");
+                       char * filename;
+                       GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%llu.mlp",ats->stat.c_peers, ats->stat.c_mechs, GNUNET_TIME_absolute_get().abs_value);
+                       glp_write_lp (ats->prob, NULL, filename);
+                       GNUNET_free (filename);
+                       stat->valid = GNUNET_NO;
+                       return;
+               }
+               stat->valid = GNUNET_YES;
+       }
+
+       // Solving mlp
+       glp_iocp opt_mlp;
+       glp_init_iocp(&opt_mlp);
+       // maximum duration
+       opt_mlp.tm_lim = max_dur;
+       // output level
+#if VERBOSE_ATS
+       opt_mlp.msg_lev = GLP_MSG_ALL;
+#else
+       opt_mlp.msg_lev = GLP_MSG_OFF;
+#endif
+
+       result = glp_intopt (ats->prob, &opt_mlp);
+       mlp_solution =  glp_mip_status (ats->prob);
+       stat->solution = mlp_solution;
+
+       if (ats_evaluate_results(result, mlp_solution, "MLP") == GNUNET_YES)
+       {
+               stat->valid = GNUNET_YES;
+       }
+       else
+       {
+               // TODO: Remove if this does not appear until release
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,  "MLP SOLUTION INVALID: %i\n", lp_solution);
+               stat->valid = GNUNET_NO;
+       }
+
+/*
+       int check;
+       int error = GNUNET_NO;
+       double bw;
+       struct ATS_mechanism *t = NULL;
+       for (c=1; c<= (c_peers); c++ )
+       {
+               check = GNUNET_NO;
+               t = peers[c].m_head;
+               while (t!=NULL)
+               {
+                       bw = glp_get_col_prim(prob, t->col_index);
+                       if (bw > 1.0)
+                       {
+#if VERBOSE_ATS
+                               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[%i][%i] `%s' %s %s %f\n", c, t->col_index, GNUNET_h2s(&peers[c].peer.hashPubKey), t->plugin->short_name, glp_get_col_name(prob,t->col_index), bw);
+#endif
+                               if (check ==GNUNET_YES)
+                               {
+                                       glp_write_sol(prob, "invalid_solution.mlp");
+                                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Invalid solution, check invalid_solution.mlp");
+                                       GNUNET_STATISTICS_update (stats, "ATS invalid solutions", 1, GNUNET_NO);
+                                       error = GNUNET_YES;
+                               }
+                               if (check ==GNUNET_NO)
+                                       check = GNUNET_YES;
+                       }
+                       t = t->next;
+               }
+       }*/
+
+#if VERBOSE_ATS
+       if (glp_get_col_prim(ats->prob,2*c_mechs+1) != 1)
+       {
+       int c;
+       for (c=1; c<= available_quality_metrics; c++ )
+       {
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(ats->prob,2*c_mechs+3+c), glp_get_col_prim(ats->prob,2*c_mechs+3+c));
+       }
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(ats->prob,2*c_mechs+1), glp_get_col_prim(ats->prob,2*c_mechs+1));
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(ats->prob,2*c_mechs+2), glp_get_col_prim(ats->prob,2*c_mechs+2));
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(ats->prob,2*c_mechs+3), glp_get_col_prim(ats->prob,2*c_mechs+3));
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "objective value:  %f\n", glp_mip_obj_val(ats->prob));
+       }
+#endif
+}
+
+static void ats_delete_problem ()
 {
-       int c_mechs;
-       int c_peers;
-       int solution;
-};
+       int c;
 
+       for (c=0; c< (ats->stat).c_mechs; c++)
+               GNUNET_free_non_null (ats->mechanisms[c].rc);
 
+       if (ats->mechanisms!=NULL)
+       {
+               GNUNET_free(ats->mechanisms);
+               ats->mechanisms = NULL;
+       }
+       if (ats->peers!=NULL)
+       {
+               GNUNET_free(ats->peers);
+               ats->peers = NULL;
+       }
 
-struct ATS_ressource
+       if (ats->prob != NULL)
+       {
+               glp_delete_prob(ats->prob);
+               ats->prob = NULL;
+       }
+
+       ats->stat.begin_cr = GNUNET_SYSERR;
+       ats->stat.begin_qm = GNUNET_SYSERR;
+       ats->stat.c_mechs = 0;
+       ats->stat.c_peers = 0;
+       ats->stat.end_cr = GNUNET_SYSERR;
+       ats->stat.end_qm = GNUNET_SYSERR;
+       ats->stat.solution = GNUNET_SYSERR;
+       ats->stat.valid = GNUNET_SYSERR;
+}
+
+
+static void ats_update_problem_qm ()
 {
-       int index;
-       int atis_index;
-       char * cfg_param;
-       double c_max;
-};
+       int array_index;
+       int row_index;
+       int c, c2;
+       int c_q_metrics = available_quality_metrics;
 
-static struct ATS_ressource ressources[] =
+       int *ja    = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (int));
+       double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (double));
+#if DEBUG_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics\n");
+#endif
+       row_index = ats->stat.begin_qm;
+
+       for (c=1; c <= c_q_metrics; c++)
+       {
+               array_index = 1;
+               double value = 1;
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
+#endif
+
+               glp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0);
+               for (c2=1; c2<=ats->stat.c_mechs; c2++)
+               {
+                       ja[array_index] = c2;
+
+                       if (qm[c-1].atis_index  == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY)
+                       {
+                               double v0, v1, v2;
+                               v0 = ats->mechanisms[c2].addr->quality[c-1].values[0];
+                               if (v1 < 1) v0 = 0.1;
+                               v1 = ats->mechanisms[c2].addr->quality[c-1].values[1];
+                               if (v1 < 1) v0 = 0.1;
+                               v2 = ats->mechanisms[c2].addr->quality[c-1].values[2];
+                               if (v1 < 1) v0 = 0.1;
+                               value = 100.0 / ((v0 + 2 * v1 + 3 * v2) / 6.0);
+                               //value = 1;
+                       }
+                       if (qm[c-1].atis_index  == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE)
+                       {
+                               double v0, v1, v2;
+                               v0 = ats->mechanisms[c2].addr->quality[c-1].values[0];
+                               if (v0 < 1) v0 = 1;
+                               v1 = ats->mechanisms[c2].addr->quality[c-1].values[1];
+                               if (v1 < 1) v1 = 1;
+                               v2 = ats->mechanisms[c2].addr->quality[c-1].values[2];
+                               if (v2 < 1) v2 = 1;
+                               value =  (v0 + 2 * v1 + 3 * v2) / 6.0;
+                               if (value >= 1)
+                                       value =  (double) 10 / value;
+                               else
+                                       value = 10;
+                       }
+                       ar[array_index] = (ats->mechanisms[c2].peer->f) * value;
+#if VERBOSE_ATS
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: %s [%i,%i]=%f \n",array_index, qm[c-1].name, row_index, ja[array_index], ar[array_index]);
+#endif
+                       array_index++;
+               }
+               ja[array_index] = ats->stat.col_qm + c - 1;
+               ar[array_index] = -1;
+
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, row_index, ja[array_index], ar[array_index]);
+               #endif
+               glp_set_mat_row (ats->prob, row_index, array_index, ja, ar);
+
+               array_index = 1;
+               row_index++;
+       }
+
+       GNUNET_free_non_null (ja);
+       GNUNET_free_non_null (ar);
+}
+
+
+static void ats_update_problem_cr ()
 {
-               {1, 1, "COST_FINANCIAL_PER_VOLUME",VERY_BIG_DOUBLE_VALUE},
-               {2, 2, "COST_FINANCIAL_PER_TIME", VERY_BIG_DOUBLE_VALUE},
-               {3, 3, "COST_COMPUTATIONAL", VERY_BIG_DOUBLE_VALUE},
-               {4, 4, "COST_ENERGY_CONSUMPTION", VERY_BIG_DOUBLE_VALUE},
-               {5, 5, "COST_CONNECT", VERY_BIG_DOUBLE_VALUE},
-               {6, 6, "COST_BANDWITH_AVAILABLE", VERY_BIG_DOUBLE_VALUE},
-               {7, 7, "COST_NETWORK_OVERHEAD", VERY_BIG_DOUBLE_VALUE},
-};
 
-static int available_ressources = 7;
+       int array_index;
+       int row_index;
+       int c, c2;
+       double ct_max, ct_min;
 
+       int *ja    = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (int));
+       double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (double));
 
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics\n");
+       row_index = ats->stat.begin_cr;
 
-struct ATS_info
+       for (c=0; c<available_ressources; c++)
+       {
+               ct_max = ressources[c].c_max;
+               ct_min = ressources[c].c_min;
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] %f..%f\n",row_index, ct_min, ct_max);
+#endif
+               glp_set_row_bnds(ats->prob, row_index, GLP_DB, ct_min, ct_max);
+
+               for (c2=1; c2<=ats->stat.c_mechs; c2++)
+               {
+                       double value = 0;
+                       ja[array_index] = c2;
+                       value = ats->mechanisms[c2].addr->ressources[c].c;
+                       ar[array_index] = value;
+#if VERBOSE_ATS
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, row_index, ja[array_index], ar[array_index]);
+#endif
+                       array_index++;
+               }
+               glp_set_mat_row (ats->prob, row_index, array_index, ja, ar);
+
+               row_index ++;
+       }
+
+
+       GNUNET_free_non_null (ja);
+       GNUNET_free_non_null (ar);
+}
+
+
+#if 0
+static void ats_update_problem_qm_TEST ()
 {
-       struct GNUNET_CONTAINER_MultiHashMap * peers;
-       /**
-        * Time of last execution
-        */
-       struct GNUNET_TIME_Absolute last;
-       /**
-        * Minimum intervall between two executions
-        */
-       struct GNUNET_TIME_Relative min_delta;
-       /**
-        * Regular intervall when execution is triggered
-        */
-       struct GNUNET_TIME_Relative exec_intervall;
-       /**
-        * Maximum execution time per calculation
-        */
-       struct GNUNET_TIME_Relative max_exec_duration;
-       /**
-        * Maximum number of LP iterations per calculation
-        */
-       int max_iterations;
+       int row_index;
+       int c, c2;
 
-       GNUNET_SCHEDULER_TaskIdentifier ats_task;
+       int old_ja[ats->stat.c_mechs + 2];
+       double old_ar[ats->stat.c_mechs + 2];
+       int c_old;
+       int changed = 0;
 
-       struct ATS_plugin * head;
-       struct ATS_plugin * tail;
-};
+       int *ja    = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (int));
+       double *ar = GNUNET_malloc ((1 + ats->stat.c_mechs*2 + 3 + available_quality_metrics) * sizeof (double));
+#if DEBUG_ATS
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem quality metrics TEST\n");
+#endif
+       if (ats->stat.begin_qm >0)
+               row_index = ats->stat.begin_qm;
+       else
+               return;
 
-#define DEBUG_ATS GNUNET_NO
-#define VERBOSE_ATS GNUNET_NO
+
+       for (c=0; c<available_quality_metrics; c++)
+       {
+
+               c_old = glp_get_mat_row (ats->prob, row_index, old_ja, old_ar);
+
+               glp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0);
+
+               for (c2=1; c2<=c_old; c2++)
+               {
+                       ja[c2] = old_ja[c2];
+                       if ((changed < 3) && (c2>2) && (old_ar[c2] != -1))
+                       {
+                               ar[c2] = old_ar[c2] + 5 - changed;
+                               changed ++;
+                       }
+                       else
+                               ar[c2] = old_ar[c2];
+#if VERBOSE_ATS
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: old [%i,%i]=%f  new [%i,%i]=%f\n",c2, row_index, old_ja[c2], old_ar[c2], row_index, ja[c2], ar[c2]);
+#endif
+               }
+               glp_set_mat_row (ats->prob, row_index, c_old, ja, ar);
+
+               row_index ++;
+       }
+
+       GNUNET_free_non_null (ja);
+       GNUNET_free_non_null (ar);
+}
+#endif
 
 
 /** solve the bandwidth distribution problem
@@ -5695,31 +6394,24 @@ struct ATS_info
  * @param R weight for relativity
  * @param v_b_min minimal bandwidth per peer
  * @param v_n_min minimum number of connections
- * @param res result struct
+ * @param stat result struct
  * @return GNUNET_SYSERR if glpk is not available, number of mechanisms used
  */
-static int ats_solve_problem (int max_it, int max_dur , double D, double U, double R, int v_b_min, int v_n_min, struct ATS_result *res)
+static int ats_create_problem (double D, double U, double R, int v_b_min, int v_n_min, struct ATS_stat *stat)
 {
-#if !HAVE_LIBGLPK
-       if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "no glpk installed\n");
-       return GNUNET_SYSERR;
-#else
-       if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "glpk installed\n");
+       if (ats->prob != NULL)
+               glp_delete_prob(ats->prob);
 
-       glp_prob *prob;
+       ats->prob = glp_create_prob();
 
        int c;
        int c_peers = 0;
        int c_mechs = 0;
-       int result;
-       int solution;
 
-       int c_c_ressources = 0;
+       int c_c_ressources = available_ressources;
        int c_q_metrics = available_quality_metrics;
 
-       //double M = 10000000000; // ~10 GB
        double M = VERY_BIG_DOUBLE_VALUE;
-
        double Q[c_q_metrics+1];
        for (c=1; c<=c_q_metrics; c++)
        {
@@ -5746,14 +6438,21 @@ static int ats_solve_problem (int max_it, int max_dur , double D, double U, doub
 
        if (c_mechs==0)
        {
-               if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No addresses for bw distribution available\n", c_peers);
-               return 0;
+#if DEBUG_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No addresses for bw distribution available\n", c_peers);
+#endif
+               stat->valid = GNUNET_NO;
+               stat->c_peers = 0;
+               stat->c_mechs = 0;
+               return GNUNET_SYSERR;
        }
 
-       struct ATS_mechanism * mechanisms = GNUNET_malloc((1+c_mechs) * sizeof (struct ATS_mechanism));
-       struct ATS_peer * peers = GNUNET_malloc((1+c_peers) * sizeof (struct ATS_peer));
+       ats->mechanisms = GNUNET_malloc((1+c_mechs) * sizeof (struct ATS_mechanism));
+       ats->peers =  GNUNET_malloc((1+c_peers) * sizeof (struct ATS_peer));
+
+       struct ATS_mechanism * mechanisms = ats->mechanisms;
+       struct ATS_peer * peers = ats->peers;
 
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Found mechanisms: %i\n", c_mechs);
        c_mechs = 1;
        c_peers = 1;
        next = neighbours;
@@ -5771,39 +6470,11 @@ static int ats_solve_problem (int max_it, int max_dur , double D, double U, doub
                        struct ForeignAddressList * a_next = r_next->addresses;
                        while (a_next != NULL)
                        {
-                               struct ATS_ressource_cost *rc;
-
-                               if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%i Peer: `%s' plugin `%s' %x:\n", c_mechs, GNUNET_i2s(&next->id), r_next->plugin->short_name, a_next);
                                mechanisms[c_mechs].addr = a_next;
                                mechanisms[c_mechs].col_index = c_mechs;
                                mechanisms[c_mechs].peer = &peers[c_peers];
                                mechanisms[c_mechs].next = NULL;
                                mechanisms[c_mechs].plugin = r_next->plugin;
-                               mechanisms[c_mechs].rc = GNUNET_malloc (available_ressources * sizeof (struct ATS_ressource_cost));
-
-                               rc = a_next->ressources;
-                               /* get address specific ressource costs */
-                               while (rc != NULL)
-                               {
-                                       memcpy(&mechanisms[c_mechs].rc[rc->index], rc, sizeof (struct ATS_ressource_cost));
-                                       if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Set address specific rc %s = %f \n", ressources[rc->index].cfg_param, mechanisms[c_mechs].rc[rc->index].c_1);
-                                       c_c_ressources ++;
-                                       rc = rc->next;
-                               }
-                               /* get plugin specific ressourc costs */
-
-
-                               rc = mechanisms[c_mechs].plugin->rc->head;
-                               while (rc != NULL)
-                               {
-                                       if ((mechanisms[c_mechs].rc[rc->index].c_1 == 0) && (rc->c_1 != 0))
-                                       {
-                                               memcpy(&mechanisms[c_mechs].rc[rc->index], rc, sizeof (struct ATS_ressource_cost));
-                                               c_c_ressources++;
-                                       }
-                                       if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Set plugin specific rc %s = %f \n", ressources[rc->index].cfg_param, mechanisms[c_mechs].rc[rc->index].c_1);
-                                       rc = rc->next;
-                               }
 
                                GNUNET_CONTAINER_DLL_insert_tail(peers[c_peers].m_head, peers[c_peers].m_tail, &mechanisms[c_mechs]);
                                c_mechs++;
@@ -5820,56 +6491,52 @@ static int ats_solve_problem (int max_it, int max_dur , double D, double U, doub
        if (v_n_min > c_peers)
                v_n_min = c_peers;
 
-       /* number of variables == coloumns */
-       //int c_cols = 2 * c_mechs + 3 + c_q_metrics;
-       /* number of constraints == rows */
-       //int c_rows = 2 * c_peers + 2 * c_mechs + c_c_ressources + c_q_metrics + 3;
-
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Creating problem with: %i peers, %i mechanisms, %i resource entries, %i quality metrics \n", c_peers, c_mechs, c_c_ressources, c_q_metrics);
+#if VERBOSE_ATS
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Creating problem with: %i peers, %i mechanisms, %i resource entries, %i quality metrics \n", c_peers, c_mechs, c_c_ressources, c_q_metrics);
+#endif
 
-       int size = 1 + 8 *c_mechs +2 + c_mechs + c_peers + (c_q_metrics*c_mechs)+c_q_metrics + 100;// + c_c_ressources ;
+       int size =  1 + 3 + 10 *c_mechs + c_peers + (c_q_metrics*c_mechs)+ c_q_metrics + c_c_ressources * c_mechs ;
        int row_index;
        int array_index=1;
        int * ia = GNUNET_malloc (size * sizeof (int));
        int * ja = GNUNET_malloc (size * sizeof (int));
        double * ar = GNUNET_malloc(size* sizeof (double));
 
-       prob = glp_create_prob();
-       glp_set_prob_name(prob, "gnunet ats bandwidth distribution");
-       glp_set_obj_dir(prob, GLP_MAX);
+       glp_set_prob_name(ats->prob, "gnunet ats bandwidth distribution");
+       glp_set_obj_dir(ats->prob, GLP_MAX);
 
        /* adding columns */
        char * name;
-       glp_add_cols(prob, 2 * c_mechs);
+       glp_add_cols(ats->prob, 2 * c_mechs);
        /* adding b_t cols */
        for (c=1; c <= c_mechs; c++)
        {
-               GNUNET_asprintf(&name, "b%i",c);
-               glp_set_col_name(prob, c, name);
+
+               GNUNET_asprintf(&name, "p_%s_b%i",GNUNET_i2s(&(mechanisms[c].peer->peer)), c);
+               glp_set_col_name(ats->prob, c, name);
                GNUNET_free (name);
-               glp_set_col_bnds(prob, c, GLP_LO, 0.0, 0.0);
-               glp_set_obj_coef(prob, c, 1);
+               glp_set_col_bnds(ats->prob, c, GLP_LO, 0.0, 0.0);
+               glp_set_obj_coef(ats->prob, c, 0);
 
        }
        /* adding n_t cols */
        for (c=c_mechs+1; c <= 2*c_mechs; c++)
        {
-               GNUNET_asprintf(&name, "n%i",(c-c_mechs));
-               glp_set_col_name(prob, c, name);
+               GNUNET_asprintf(&name, "p_%s_n%i",GNUNET_i2s(&(mechanisms[c-c_mechs].peer->peer)),(c-c_mechs));
+               glp_set_col_name(ats->prob, c, name);
                GNUNET_free (name);
-               glp_set_col_bnds(prob, c, GLP_DB, 0.0, 1.0);
-               glp_set_col_kind(prob, c, GLP_IV);
-               glp_set_obj_coef(prob, c, 0);
+               glp_set_col_bnds(ats->prob, c, GLP_DB, 0.0, 1.0);
+               glp_set_col_kind(ats->prob, c, GLP_IV);
+               glp_set_obj_coef(ats->prob, c, 0);
        }
 
        /* feasibility constraints */
        /* Constraint 1: one address per peer*/
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 1\n");
        row_index = 1;
-       glp_add_rows(prob, c_peers);
+       glp_add_rows(ats->prob, c_peers);
        for (c=1; c<=c_peers; c++)
        {
-               glp_set_row_bnds(prob, row_index, GLP_FX, 1.0, 1.0);
+               glp_set_row_bnds(ats->prob, row_index, GLP_FX, 1.0, 1.0);
 
                struct ATS_mechanism *m = peers[c].m_head;
                while (m!=NULL)
@@ -5877,7 +6544,9 @@ static int ats_solve_problem (int max_it, int max_dur , double D, double U, doub
                        ia[array_index] = row_index;
                        ja[array_index] = (c_mechs + m->col_index);
                        ar[array_index] = 1;
-                       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                        array_index++;
                        m = m->next;
                }
@@ -5885,195 +6554,248 @@ static int ats_solve_problem (int max_it, int max_dur , double D, double U, doub
        }
 
        /* Constraint 2: only active mechanism gets bandwidth assigned */
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 2\n");
-       glp_add_rows(prob, c_mechs);
+       glp_add_rows(ats->prob, c_mechs);
        for (c=1; c<=c_mechs; c++)
        {
                /* b_t - n_t * M <= 0 */
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
-               glp_set_row_bnds(prob, row_index, GLP_UP, 0.0, 0.0);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
+#endif
+               glp_set_row_bnds(ats->prob, row_index, GLP_UP, 0.0, 0.0);
 
                ia[array_index] = row_index;
                ja[array_index] = mechanisms[c].col_index;
                ar[array_index] = 1;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
                ia[array_index] = row_index;
                ja[array_index] = c_mechs + mechanisms[c].col_index;
                ar[array_index] = -M;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
                row_index ++;
        }
 
        /* Constraint 3: minimum bandwidth*/
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 3\n");
-       glp_add_rows(prob, c_mechs);
+       glp_add_rows(ats->prob, c_mechs);
        for (c=1; c<=c_mechs; c++)
        {
                /* b_t - n_t * b_min <= 0 */
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
-               glp_set_row_bnds(prob, row_index, GLP_LO, 0.0, 0.0);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
+#endif
+               glp_set_row_bnds(ats->prob, row_index, GLP_LO, 0.0, 0.0);
 
                ia[array_index] = row_index;
                ja[array_index] = mechanisms[c].col_index;
                ar[array_index] = 1;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
                ia[array_index] = row_index;
                ja[array_index] = c_mechs + mechanisms[c].col_index;
                ar[array_index] = -v_b_min;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
                row_index ++;
        }
-
+       int c2;
        /* Constraint 4: max ressource capacity */
        /* V cr: bt * ct_r <= cr_max
         * */
+       glp_add_rows(ats->prob, available_ressources);
+       double ct_max = VERY_BIG_DOUBLE_VALUE;
+       double ct_min = 0.0;
+
+       stat->begin_cr = array_index;
 
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 4\n");
-       glp_add_rows(prob, available_ressources);
-       double ct_max = 0.0;
-       //double ct_1 = 0.0;
-       int c2;
        for (c=0; c<available_ressources; c++)
        {
                ct_max = ressources[c].c_max;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] %f\n",row_index, ct_max);
-               glp_set_row_bnds(prob, row_index, GLP_DB, 0.0, ct_max);
+               ct_min = ressources[c].c_min;
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] %f..%f\n",row_index, ct_min, ct_max);
+#endif
+               glp_set_row_bnds(ats->prob, row_index, GLP_DB, ct_min, ct_max);
 
                for (c2=1; c2<=c_mechs; c2++)
                {
-                       if (mechanisms[c2].rc[c].c_1 != 0)
-                       {
+                       double value = 0;
                        ia[array_index] = row_index;
-                       ja[array_index] = mechanisms[c2].col_index;
-                       ar[array_index] = mechanisms[c2].rc[c].c_1;
-                       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+                       ja[array_index] = c2;
+                       value = mechanisms[c2].addr->ressources[c].c;
+                       ar[array_index] = value;
+#if VERBOSE_ATS
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                        array_index++;
-                       }
                }
                row_index ++;
        }
+       stat->end_cr = array_index--;
 
        /* Constraint 5: min number of connections*/
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 5\n");
-       glp_add_rows(prob, 1);
+       glp_add_rows(ats->prob, 1);
        for (c=1; c<=c_mechs; c++)
        {
                // b_t - n_t * b_min >= 0
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
-               glp_set_row_bnds(prob, row_index, GLP_LO, v_n_min, 0.0);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
+#endif
+               glp_set_row_bnds(ats->prob, row_index, GLP_LO, v_n_min, 0.0);
 
                ia[array_index] = row_index;
                ja[array_index] = c_mechs + mechanisms[c].col_index;
                ar[array_index] = 1;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
        }
        row_index ++;
 
-       /* optimisation constraints*/
-
-       /* adding columns */
-       glp_add_cols(prob, 3 + c_q_metrics);
-
-       glp_set_col_name(prob, (2*c_mechs) + 1, "d");
-       glp_set_obj_coef(prob, (2*c_mechs) + 1, D);
-       glp_set_col_bnds(prob, (2*c_mechs) + 1, GLP_LO, 0.0, 0.0);
+       // optimisation constraints
 
-       glp_set_col_name(prob, (2*c_mechs) + 2, "u");
-       glp_set_obj_coef(prob, (2*c_mechs) + 2, U);
-       glp_set_col_bnds(prob, (2*c_mechs) + 2, GLP_LO, 0.0, 0.0);
-       glp_set_col_name(prob, (2*c_mechs) + 3, "r");
-       glp_set_obj_coef(prob, (2*c_mechs) + 3, R);
-       glp_set_col_bnds(prob, (2*c_mechs) + 3, GLP_LO, 0.0, 0.0);
-
-       for (c=1; c<= c_q_metrics; c++)
-       {
-               GNUNET_asprintf(&name, "Q_%s",qm[c-1].name);
-               glp_set_col_name(prob, (2*c_mechs) + 3 + c, name);
-               glp_set_col_bnds(prob, (2*c_mechs) + 3 + c, GLP_LO, 0.0, 0.0);
-               GNUNET_free (name);
-               glp_set_obj_coef(prob, (2*c_mechs) + 3 + c, Q[c]);
-       }
+       // adding columns
 
        // Constraint 6: optimize for diversity
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 6\n");
-       glp_add_rows(prob, 1);
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
-       glp_set_row_bnds(prob, row_index, GLP_FX, 0.0, 0.0);
-       //glp_set_row_bnds(prob, row_index, GLP_UP, 0.0, 0.0);
+       int col_d;
+       col_d = glp_add_cols(ats->prob, 1);
+       stat->col_d = col_d;
+       //GNUNET_assert (col_d == (2*c_mechs) + 1);
+       glp_set_col_name(ats->prob, col_d, "d");
+       glp_set_obj_coef(ats->prob, col_d, D);
+       glp_set_col_bnds(ats->prob, col_d, GLP_LO, 0.0, 0.0);
+       glp_add_rows(ats->prob, 1);
+#if VERBOSE_ATS
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
+#endif
+       glp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0);
        for (c=1; c<=c_mechs; c++)
        {
                // b_t - n_t * b_min >= 0
                ia[array_index] = row_index;
                ja[array_index] = c_mechs + mechanisms[c].col_index;
                ar[array_index] = 1;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
        }
        ia[array_index] = row_index;
-       ja[array_index] = (2*c_mechs) + 1;
+       ja[array_index] = col_d;
        ar[array_index] = -1;
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
        array_index++;
        row_index ++;
 
 
        // Constraint 7: optimize for quality
-
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 7\n");
-    glp_add_rows(prob, available_quality_metrics);
+       int col_qm;
+       col_qm = glp_add_cols(ats->prob, c_q_metrics);
+       stat->col_qm = col_qm;
+       //GNUNET_assert (col_qm == (2*c_mechs) + 3 + 1);
+       for (c=0; c< c_q_metrics; c++)
+       {
+               GNUNET_asprintf(&name, "Q_%s",qm[c].name);
+               glp_set_col_name(ats->prob, col_qm + c, name);
+               glp_set_col_bnds(ats->prob, col_qm + c, GLP_LO, 0.0, 0.0);
+               GNUNET_free (name);
+               glp_set_obj_coef(ats->prob, col_qm + c, Q[c]);
+       }
+    glp_add_rows(ats->prob, available_quality_metrics);
+       stat->begin_qm = row_index;
        for (c=1; c <= c_q_metrics; c++)
        {
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
-               glp_set_row_bnds(prob, row_index, GLP_FX, 0.0, 0.0);
-
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
+#endif
+               double value = 1;
+               glp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0);
                for (c2=1; c2<=c_mechs; c2++)
                {
-                       double value = 0;
+
                        ia[array_index] = row_index;
                        ja[array_index] = c2;
                        if (qm[c-1].atis_index  == GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY)
                        {
-                               //value = mechanisms[c2].addr->latency.rel_value;
+                               double v0, v1, v2;
+                               v0 = mechanisms[c2].addr->quality[c-1].values[0];
+                               if (v1 < 1) v0 = 0.1;
+                               v1 = mechanisms[c2].addr->quality[c-1].values[1];
+                               if (v1 < 1) v0 = 0.1;
+                               v2 = mechanisms[c2].addr->quality[c-1].values[2];
+                               if (v1 < 1) v0 = 0.1;
+                               value = 100.0 / ((v0 + 2 * v1 + 3 * v2) / 6.0);
                                value = 1;
                        }
                        if (qm[c-1].atis_index  == GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE)
                        {
-                               //value = mechanisms[c2].addr->distance;
-                               value = 1;
+                               double v0, v1, v2;
+                               v0 = mechanisms[c2].addr->quality[c-1].values[0];
+                               if (v0 < 1) v0 = 1;
+                               v1 = mechanisms[c2].addr->quality[c-1].values[1];
+                               if (v1 < 1) v1 = 1;
+                               v2 = mechanisms[c2].addr->quality[c-1].values[2];
+                               if (v2 < 1) v2 = 1;
+                               value =  (v0 + 2 * v1 + 3 * v2) / 6.0;
+                               if (value >= 1)
+                                       value =  (double) 10 / value;
+                               else
+                                       value = 10;
                        }
-                       ar[array_index] = 1 * mechanisms[c2].peer->f * value ;
-                       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: %s [%i,%i]=%f \n",array_index, qm[c-1].name, ia[array_index], ja[array_index], ar[array_index]);
+                       ar[array_index] = (mechanisms[c2].peer->f) * value ;
+#if VERBOSE_ATS
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: %s [%i,%i]=%f \n",array_index, qm[c-1].name, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                        array_index++;
                }
 
                ia[array_index] = row_index;
-               ja[array_index] = (2*c_mechs) + 3 +c;
+               ja[array_index] = col_qm + c - 1;
                ar[array_index] = -1;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
                row_index++;
        }
+       stat->end_qm = row_index-1;
 
        // Constraint 8: optimize bandwidth utility
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 8\n");
-       glp_add_rows(prob, 1);
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
-       glp_set_row_bnds(prob, row_index, GLP_FX, 0.0, 0.0);
+       int col_u;
+       col_u = glp_add_cols(ats->prob, 1);
+       stat->col_u = col_u;
+       //GNUNET_assert (col_u == (2*c_mechs) + 2);
+       glp_set_col_name(ats->prob, col_u, "u");
+       glp_set_obj_coef(ats->prob, col_u, U);
+       glp_set_col_bnds(ats->prob, col_u, GLP_LO, 0.0, 0.0);
+       glp_add_rows(ats->prob, 1);
+#if VERBOSE_ATS
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bounds [row]=[%i] \n",row_index);
+#endif
+       glp_set_row_bnds(ats->prob, row_index, GLP_FX, 0.0, 0.0);
        for (c=1; c<=c_mechs; c++)
        {
                ia[array_index] = row_index;
                ja[array_index] = c;
                ar[array_index] = mechanisms[c].peer->f;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
        }
        ia[array_index] = row_index;
-       ja[array_index] = (2*c_mechs) + 2;
+       ja[array_index] = col_u;
        ar[array_index] = -1;
 #if VERBOSE_ATS
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
@@ -6083,172 +6805,84 @@ static int ats_solve_problem (int max_it, int max_dur , double D, double U, doub
        row_index ++;
 
        // Constraint 9: optimize relativity
-       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constraint 9\n");
-       glp_add_rows(prob, c_peers);
+       int col_r;
+       col_r = glp_add_cols(ats->prob, 1);
+       stat->col_r = col_r;
+       //GNUNET_assert (col_r == (2*c_mechs) + 3);
+       glp_set_col_name(ats->prob, col_r, "r");
+       glp_set_obj_coef(ats->prob, col_r, R);
+       glp_set_col_bnds(ats->prob, col_r, GLP_LO, 0.0, 0.0);
+       glp_add_rows(ats->prob, c_peers);
        for (c=1; c<=c_peers; c++)
        {
-               glp_set_row_bnds(prob, row_index, GLP_LO, 0.0, 0.0);
+               glp_set_row_bnds(ats->prob, row_index, GLP_LO, 0.0, 0.0);
 
                struct ATS_mechanism *m = peers[c].m_head;
                while (m!=NULL)
                {
                        ia[array_index] = row_index;
                        ja[array_index] = m->col_index;
-                       ar[array_index] = 1;
-                       if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+                       ar[array_index] = 1 / mechanisms[c].peer->f;
+#if VERBOSE_ATS
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                        array_index++;
                        m = m->next;
                }
                ia[array_index] = row_index;
-               ja[array_index] = (2*c_mechs) + 3;
+               ja[array_index] = col_r;
                ar[array_index] = -1;
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#if VERBOSE_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[index]=[%i]: [%i,%i]=%f \n",array_index, ia[array_index], ja[array_index], ar[array_index]);
+#endif
                array_index++;
 
                row_index++;
        }
-       glp_load_matrix(prob, array_index-1, ia, ja, ar);
-
-
-       glp_smcp opt_lp;
-       glp_init_smcp(&opt_lp);
-       if (VERBOSE_ATS)
-               opt_lp.msg_lev = GLP_MSG_ALL;
-       else
-               opt_lp.msg_lev = GLP_MSG_OFF;
-       result = glp_simplex(prob, &opt_lp);
-
-       glp_iocp opt_mlp;
-       glp_init_iocp(&opt_mlp);
-       /* maximum duration */
-       opt_mlp.tm_lim = max_dur;
-       /* output level */
-       if (VERBOSE_ATS)
-               opt_mlp.msg_lev = GLP_MSG_ALL;
-       else
-               opt_mlp.msg_lev = GLP_MSG_OFF;
-
-       result = glp_intopt (prob, &opt_mlp);
-       solution =  glp_mip_status (prob);
-
-#if VERBOSE_ATS
-       if (VERBOSE_ATS) glp_write_lp(prob, NULL, "ats_mlp.lp");
-
-       switch (result) {
-       case GLP_ESTOP  :    /* search terminated by application */
-               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Search terminated by application ");
-               break;
-       case GLP_EITLIM :    /* iteration limit exceeded */
-               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Iteration limit exceeded ");
-               break;
-       break;
-       case GLP_ETMLIM :    /* time limit exceeded */
-               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Time limit exceeded ");
-       break;
-       case GLP_ENOPFS :    /* no primal feasible solution */
-       case GLP_ENODFS :    /* no dual feasible solution */
-               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No feasible solution");
-       break;
-
-       case GLP_EBADB  :    /* invalid basis */
-       case GLP_ESING  :    /* singular matrix */
-       case GLP_ECOND  :    /* ill-conditioned matrix */
-       case GLP_EBOUND :    /* invalid bounds */
-       case GLP_EFAIL  :    /* solver failed */
-       case GLP_EOBJLL :    /* objective lower limit reached */
-       case GLP_EOBJUL :    /* objective upper limit reached */
-       case GLP_EROOT  :    /* root LP optimum not provided */
-               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Invalid Input data: %i\n", result);
-       break;
-
-       break;
-               default:
-                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Problem has been solved\n");
-       break;
-       }
-
-       switch (solution) {
-               case GLP_UNDEF:
-                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MIP solution is undefined\n");
-                       break;
-               case GLP_OPT:
-                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MIP solution is integer optimal\n");
-                       break;
-               case GLP_FEAS:
-                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MIP solution is integer feasible, however, its optimality (or non-optimality) has not been proven, \n");
-                       break;
-               case GLP_NOFEAS:
-                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MI problem has no integer feasible solution\n");
-                       break;
-                       break;
-               default:
-                       break;
-       }
-#endif
-       int check;
-       double bw;
-       struct ATS_mechanism *t = NULL;
-       for (c=1; c<= (c_peers); c++ )
-       {
-               check = GNUNET_NO;
-               t = peers[c].m_head;
-               while (t!=NULL)
-               {
-                       bw = glp_get_col_prim(prob, t->col_index);
-                       GNUNET_assert (1);
-                       if (bw != 0)
-                       {
-                               GNUNET_assert (check != GNUNET_YES);
-                               check = GNUNET_YES;
-                               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "[%i][%i] `%s' %s %s %f\n", c, t->col_index, GNUNET_h2s(&peers[c].peer.hashPubKey), t->plugin->short_name, glp_get_col_name(prob,t->col_index), bw);
-                       }
-                       t = t->next;
-               }
-       }
 
-       for (c=1; c<= c_q_metrics; c++ )
-       {
-               if (VERBOSE_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s %f\n", glp_get_col_name(prob,2*c_mechs+3+c), glp_get_col_prim(prob,2*c_mechs+3+c));
-       }
+       /* Loading the matrix */
+       glp_load_matrix(ats->prob, array_index-1, ia, ja, ar);
 
-       res->c_mechs = c_mechs;
-       res->c_peers = c_peers;
-       res->solution = solution;
+       stat->c_mechs = c_mechs;
+       stat->c_peers = c_peers;
+       stat->solution = 0;
+       stat->valid = GNUNET_YES;
 
        /* clean up */
 
-
-       glp_delete_prob(prob);
-
        GNUNET_free (ja);
        GNUNET_free (ia);
        GNUNET_free (ar);
 
-       for (c=0; c<c_mechs; c++)
-       {
-               GNUNET_free_non_null (mechanisms[c].rc);
-       }
+       return GNUNET_OK;
 
-       GNUNET_free(mechanisms);
-       GNUNET_free(peers);
+}
 
-       return c_mechs;
+void ats_notify_ats_data (
+               const struct GNUNET_PeerIdentity *peer,
+               const struct GNUNET_TRANSPORT_ATS_Information *ats_data)
+{
+#if DEBUG_ATS
+       GNUNET_log (GNUNET_ERROR_TYPE_BULK, "ATS_notify_ats_data: %s\n",GNUNET_i2s(peer));
 #endif
+       ats_calculate_bandwidth_distribution();
 }
+#endif //END: HAVE_LIBGLPK
 
-void ats_calculate_bandwidth_distribution ()
+static void
+ats_calculate_bandwidth_distribution ()
 {
-       static int glpk = GNUNET_YES;
+#if HAVE_LIBGLPK
        struct GNUNET_TIME_Absolute start;
-       struct GNUNET_TIME_Relative duration;
-       struct ATS_result result;
-       int c_mechs = 0;
+       struct GNUNET_TIME_Relative creation;
+       struct GNUNET_TIME_Relative solving;
+       char *text = "unmodified";
 
-       struct GNUNET_TIME_Relative delta = GNUNET_TIME_absolute_get_difference(ats->last,GNUNET_TIME_absolute_get());
+       struct GNUNET_TIME_Relative delta = GNUNET_TIME_absolute_get_difference (ats->last, GNUNET_TIME_absolute_get());
        if (delta.rel_value < ats->min_delta.rel_value)
        {
 #if DEBUG_ATS
-               //GNUNET_log (GNUNET_ERROR_TYPE_BULK, "Minimum time between cycles not reached\n");
+               GNUNET_log (GNUNET_ERROR_TYPE_BULK, "Minimum time between cycles not reached\n");
 #endif
                return;
        }
@@ -6258,41 +6892,122 @@ void ats_calculate_bandwidth_distribution ()
                dur = INT_MAX;
        else
                dur = (int) ats->max_exec_duration.rel_value;
+       ats->simplex_rerun_required = GNUNET_NO;
+
+       start = GNUNET_TIME_absolute_get();
+       if ((ats->modified_addr == GNUNET_YES) || (ats->prob==NULL))
+       {
+               text = "new";
+               ats->modified_addr = GNUNET_YES;
+               ats_delete_problem ();
+               ats_create_problem (ats->D, ats->U, ats->R, ats->v_b_min, ats->v_n_min, &ats->stat);
+#if DEBUG_ATS
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers/Addresses were modified... new problem: %i peer, %i mechs\n", ats->stat.c_peers, ats->stat.c_mechs);
+#endif
+       }
+       else if ((ats->modified_addr == GNUNET_NO) && (ats->modified_resources == GNUNET_YES) && (ats->stat.valid == GNUNET_YES))
+       {
+               ats_update_problem_cr();
+               text = "modified resources";
+       }
+       else if ((ats->modified_addr == GNUNET_NO) && (ats->modified_quality == GNUNET_YES) && (ats->stat.valid == GNUNET_YES))
+       {
+               ats_update_problem_qm();
+               //ats_update_problem_qm_TEST ();
+               text = "modified quality";
+       }
+#if DEBUG_ATS
+       else GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Problem is unmodified\n");
+#endif
 
+       creation = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get());
        start = GNUNET_TIME_absolute_get();
 
-       if (glpk==GNUNET_YES)
+       if (ats->stat.valid == GNUNET_YES)
+       {
+               ats->stat.solution = GNUNET_SYSERR;
+               ats_solve_problem(ats->max_iterations, ats->max_exec_duration.rel_value, ats->stat.c_peers, ats->stat.c_mechs, &ats->stat);
+       }
+       solving = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get());
+
+       if (ats->stat.valid == GNUNET_YES)
+       {
+#if DEBUG_ATS
+                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP %s: creation time in [ms] %llu execution time in [ms] %llu for %i mechanisms: simplex rerun: %s\n",
+                                       text, creation.rel_value, solving.rel_value,
+                                       ats->stat.c_mechs,
+                                       (ats->simplex_rerun_required == GNUNET_NO) ? " NO" : "YES");
+#endif
+               GNUNET_STATISTICS_set (stats, "ATS duration", solving.rel_value + creation.rel_value, GNUNET_NO);
+               GNUNET_STATISTICS_set (stats, "ATS mechanisms", ats->stat.c_mechs, GNUNET_NO);
+               GNUNET_STATISTICS_set (stats, "ATS peers", ats->stat.c_peers, GNUNET_NO);
+               GNUNET_STATISTICS_set (stats, "ATS solution", ats->stat.solution, GNUNET_NO);
+               GNUNET_STATISTICS_set (stats, "ATS timestamp", start.abs_value, GNUNET_NO);
+
+               if ((ats->modified_addr == GNUNET_YES) || (ats->prob==NULL))
+                       GNUNET_STATISTICS_set (stats, "ATS state",ATS_NEW, GNUNET_NO);
+               else if ((ats->modified_resources == GNUNET_YES) &&
+                               (ats->modified_quality == GNUNET_NO))
+                       GNUNET_STATISTICS_set (stats, "ATS state", ATS_C_UPDATED, GNUNET_NO);
+               else if ((ats->modified_resources == GNUNET_NO) &&
+                               (ats->modified_quality == GNUNET_YES) &&
+                               (ats->simplex_rerun_required == GNUNET_NO))
+                       GNUNET_STATISTICS_set (stats, "ATS state", ATS_Q_UPDATED, GNUNET_NO);
+               else if ((ats->modified_resources == GNUNET_YES) &&
+                               (ats->modified_quality == GNUNET_YES) &&
+                               (ats->simplex_rerun_required == GNUNET_NO))
+                       GNUNET_STATISTICS_set (stats, "ATS state", ATS_QC_UPDATED, GNUNET_NO);
+               else if (ats->simplex_rerun_required == GNUNET_NO)
+                       GNUNET_STATISTICS_set (stats, "ATS state", ATS_UNMODIFIED, GNUNET_NO);
+       }
+
+       if ((ats->save_mlp == GNUNET_YES) && (ats->stat.c_mechs >= ats->dump_min_peers) && (ats->stat.c_mechs >= ats->dump_min_addr))
+       {
+               char * filename;
+               if (ats->dump_overwrite == GNUNET_NO)
+               {
+                       GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%s_%llu.mlp",
+                       ats->stat.c_peers, ats->stat.c_mechs, text, GNUNET_TIME_absolute_get().abs_value);
+                       glp_write_lp (ats->prob, NULL, filename);
+               }
+               else
+               {
+                       GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i.mlp",
+                       ats->stat.c_peers, ats->stat.c_mechs );
+                       glp_write_lp (ats->prob, NULL, filename);
+               }
+               GNUNET_free (filename);
+       }
+       if ((ats->save_solution == GNUNET_YES) && (ats->stat.c_mechs >= ats->dump_min_peers) && (ats->stat.c_mechs >= ats->dump_min_addr))
        {
-               start = GNUNET_TIME_absolute_get();
-               c_mechs = ats_solve_problem(5000, 5000, 1.0, 1.0, 1.0, 1000, 5, &result);
-               duration = GNUNET_TIME_absolute_get_difference(start,GNUNET_TIME_absolute_get());
-               if (c_mechs > 0)
+               char * filename;
+               if (ats->dump_overwrite == GNUNET_NO)
                {
-                       if (DEBUG_ATS) {GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP execution time in [ms] for %i mechanisms: %llu\n", c_mechs, duration.rel_value);}
-                       GNUNET_STATISTICS_set (stats, "ATS duration", duration.rel_value, GNUNET_NO);
-                       GNUNET_STATISTICS_set (stats, "ATS mechanisms", result.c_mechs, GNUNET_NO);
-                       GNUNET_STATISTICS_set (stats, "ATS peers", result.c_peers, GNUNET_NO);
-                       GNUNET_STATISTICS_set (stats, "ATS solution", result.solution, GNUNET_NO);
-                       GNUNET_STATISTICS_set (stats, "ATS timestamp", start.abs_value, GNUNET_NO);
+                       GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i_%s_%llu.sol",
+                       ats->stat.c_peers, ats->stat.c_mechs, text, GNUNET_TIME_absolute_get().abs_value);
+                       glp_print_sol (ats->prob, filename);
                }
-               else if (c_mechs == 0)
+               else
                {
-                       if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP not executed: no addresses\n");
+                       GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i.sol",
+                       ats->stat.c_peers, ats->stat.c_mechs);
+                       glp_print_sol (ats->prob, filename);
                }
-               else glpk = GNUNET_NO;
+               GNUNET_free (filename);
        }
        ats->last = GNUNET_TIME_absolute_get();
+       ats->modified_addr = GNUNET_NO;
+       ats->modified_resources = GNUNET_NO;
+       ats->modified_quality = GNUNET_NO;
+#endif
 }
 
-
-
-void
+static void
 ats_schedule_calculation (void *cls,
                          const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
        struct ATS_info *ats = (struct ATS_info *) cls;
-       if (ats==NULL)
-               return;
+       if (ats==NULL) return;
 
        ats->ats_task = GNUNET_SCHEDULER_NO_TASK;
        if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
@@ -6301,93 +7016,119 @@ ats_schedule_calculation (void *cls,
 #if DEBUG_ATS
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Running scheduled calculation\n");
 #endif
+
        ats_calculate_bandwidth_distribution (ats);
 
-       ats->ats_task = GNUNET_SCHEDULER_add_delayed (ats->exec_intervall,
+       ats->ats_task = GNUNET_SCHEDULER_add_delayed (ats->exec_interval,
                                        &ats_schedule_calculation, ats);
 }
 
-
-int ats_map_remove_peer (void *cls,
-               const GNUNET_HashCode * key,
-               void *value)
+void ats_init ()
 {
+       int c = 0;
+       unsigned long long  value;
+       char * section;
 
-       struct ATS_peer * p =  (struct ATS_peer *) value;
-#if DEBUG_ATS
-       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "map_remove_peer_it: `%s'\n", GNUNET_i2s(&p->peer));
-#endif
-       /* cleanup peer */
-       GNUNET_free(p);
-
-       return GNUNET_YES;
-}
-
-
-
-struct ATS_info * ats_init ()
-{
-       struct ATS_info * ats;
-#if DEBUG_ATS
-       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_init\n");
-#endif
        ats = GNUNET_malloc(sizeof (struct ATS_info));
-       ats->peers = GNUNET_CONTAINER_multihashmap_create(10);
-       GNUNET_assert(ats->peers!=NULL);
 
        ats->min_delta = ATS_MIN_INTERVAL;
-       ats->exec_intervall = ATS_EXEC_INTERVAL;
+       ats->exec_interval = ATS_EXEC_INTERVAL;
        ats->max_exec_duration = ATS_MAX_EXEC_DURATION;
        ats->max_iterations = ATS_MAX_ITERATIONS;
        ats->ats_task = GNUNET_SCHEDULER_NO_TASK;
 
-       /* loading cost ressources */
-       char * section;
-       struct TransportPlugin * cur = plugins;
-       struct ATS_ressource_cost * rc;
-       struct ATS_plugin * p;
-       unsigned long long  value;
-       int c = 0;
+#if !HAVE_LIBGLPK
+       GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "GLPK not installed, ATS not active\n");
+       return;
+#endif
+
+       ats->D = 1.0;
+       ats->U = 1.0;
+       ats->R = 1.0;
+       ats->v_b_min = 64000;
+       ats->v_n_min = 10;
+       ats->dump_min_peers = 1;
+       ats->dump_min_addr = 1;
+       ats->dump_overwrite = GNUNET_NO;
 
-       while (cur != NULL)
+#if HAVE_LIBGLPK
+       ats->prob = NULL;
+#endif
+
+       /* loading cost ressources */
+       for (c=0; c<available_ressources; c++)
        {
-               if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Loading resource cost for plugin `%s'\n", cur->short_name);
-               p = GNUNET_malloc(sizeof (struct ATS_plugin));
-               GNUNET_CONTAINER_DLL_insert_tail(ats->head,ats->tail, p);
-
-               GNUNET_asprintf(&section,"transport-%s",cur->short_name);
-               p->short_name = strdup(cur->short_name);
-               c = 0;
-               while (c < available_ressources)
+               GNUNET_asprintf(&section,"%s_UP",ressources[c].cfg_param);
+               if (GNUNET_CONFIGURATION_have_value(cfg, "transport", section))
                {
-                       if (GNUNET_CONFIGURATION_have_value(cfg,section, ressources[c].cfg_param))
+                       if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(cfg, "transport",section, &value))
                        {
-                               GNUNET_CONFIGURATION_get_value_number(cfg,section, ressources[c].cfg_param, &value);
-                               if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Found ressource cost: [%s] = %llu\n", ressources[c].cfg_param, value);
-                               if (value != 0)
-                               {
-                                       rc = GNUNET_malloc(sizeof (struct ATS_ressource_cost));
-                                       rc->index = c;
-                                       rc->atsi_index = ressources[c].atis_index;
-                                       rc->c_1 = value;
-                                       GNUNET_CONTAINER_DLL_insert_tail(p->head,p->tail, rc);
-                               }
+#if DEBUG_ATS
+                               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Found ressource cost: [%s] = %llu\n", section, value);
+#endif
+                               ressources[c].c_max = value;
+                       }
+               }
+               GNUNET_free (section);
+               GNUNET_asprintf(&section,"%s_DOWN",ressources[c].cfg_param);
+               if (GNUNET_CONFIGURATION_have_value(cfg, "transport", section))
+               {
+                       if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(cfg, "transport",section, &value))
+                       {
+#if DEBUG_ATS
+                               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Found ressource cost: [%s] = %llu\n", section, value);
+#endif
+                               ressources[c].c_min = value;
                        }
-                       // else
-                               //if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "NOT Found ressource cost: [%s] = %llu \n", ressources[c].cfg_param, value);
-                       c++;
                }
-               cur->rc = p;
-               cur = cur->next;
+               GNUNET_free (section);
        }
 
-       ats->ats_task = GNUNET_SCHEDULER_add_now(&ats_schedule_calculation, ats);
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MLP"))
+               ats->save_mlp = GNUNET_CONFIGURATION_get_value_yesno (cfg, "transport","DUMP_MLP");
 
-       return ats;
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_SOLUTION"))
+               ats->save_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg, "transport","DUMP_SOLUTION");
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_OVERWRITE"))
+               ats->dump_overwrite = GNUNET_CONFIGURATION_get_value_yesno (cfg, "transport","DUMP_OVERWRITE");
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MIN_PEERS"))
+       {
+               GNUNET_CONFIGURATION_get_value_number(cfg, "transport","DUMP_MIN_PEERS", &value);
+               ats->dump_min_peers= value;
+       }
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MIN_ADDRS"))
+       {
+               GNUNET_CONFIGURATION_get_value_number(cfg, "transport","DUMP_MIN_ADDRS", &value);
+               ats->dump_min_addr= value;
+       }
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_OVERWRITE"))
+       {
+               GNUNET_CONFIGURATION_get_value_number(cfg, "transport","DUMP_OVERWRITE", &value);
+               ats->min_delta.rel_value = value;
+       }
+
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "ATS_MIN_INTERVAL"))
+       {
+               GNUNET_CONFIGURATION_get_value_number(cfg, "transport","ATS_MIN_INTERVAL", &value);
+               ats->min_delta.rel_value = value;
+       }
+
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "ATS_EXEC_INTERVAL"))
+       {
+               GNUNET_CONFIGURATION_get_value_number(cfg, "transport","ATS_EXEC_INTERVAL", &value);
+               ats->exec_interval.rel_value = value;
+       }
+       if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "ATS_MIN_INTERVAL"))
+       {
+               GNUNET_CONFIGURATION_get_value_number(cfg, "transport","ATS_MIN_INTERVAL", &value);
+               ats->min_delta.rel_value = value;
+       }
+
+       ats->ats_task = GNUNET_SCHEDULER_add_now(&ats_schedule_calculation, ats);
 }
 
 
-void ats_shutdown ()
+static void ats_shutdown ()
 {
 #if DEBUG_ATS
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_destroy\n");
@@ -6395,54 +7136,23 @@ void ats_shutdown ()
        if (ats->ats_task != GNUNET_SCHEDULER_NO_TASK)
                GNUNET_SCHEDULER_cancel(ats->ats_task);
        ats->ats_task = GNUNET_SCHEDULER_NO_TASK;
-
-       struct ATS_plugin * p;
-       struct ATS_ressource_cost * rc;
-
-       p = ats->head;
-       {
-               GNUNET_CONTAINER_DLL_remove (ats->head,ats->tail, p);
-               rc = p->head;
-               while (p != NULL)
-               {
-                       GNUNET_CONTAINER_DLL_remove (p->head,p->tail, rc);
-                       GNUNET_free(rc);
-                       rc = p->head;
-               }
-               GNUNET_free(p->short_name);
-               GNUNET_free(p);
-               p = ats->head;
-       }
-
-       GNUNET_CONTAINER_multihashmap_iterate (ats->peers,ats_map_remove_peer,NULL);
-       GNUNET_CONTAINER_multihashmap_destroy (ats->peers);
+#if HAVE_LIBGLPK
+       ats_delete_problem ();
+#endif
        GNUNET_free (ats);
 }
 
 
 void ats_notify_peer_connect (
                const struct GNUNET_PeerIdentity *peer,
-               const struct GNUNET_TRANSPORT_ATS_Information *ats_data)
+               const struct GNUNET_TRANSPORT_ATS_Information *ats_data, int ats_count)
 {
-       int c = 0;
 #if DEBUG_ATS
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_notify_peer_connect: %s\n",GNUNET_i2s(peer));
 #endif
 
-       while (ntohl(ats_data[c].type)!=0)
-       {
-#if DEBUG_ATS
-               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats type [%i]: %i\n",ntohl(ats_data[c].type), ntohl(ats_data[c].value));
-#endif
-               c++;
-       }
-       /* check if peer is already known */
-       if (!GNUNET_CONTAINER_multihashmap_contains (ats->peers,&peer->hashPubKey))
-       {
-               struct ATS_peer * p = GNUNET_malloc (sizeof (struct ATS_peer));
-               memcpy(&p->peer, peer, sizeof (struct GNUNET_PeerIdentity));
-               GNUNET_CONTAINER_multihashmap_put(ats->peers, &p->peer.hashPubKey, p, GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
-       }
+       //update_addr_ats();
+       ats->modified_addr = GNUNET_YES;
 
        ats_calculate_bandwidth_distribution(ats);
 }
@@ -6453,25 +7163,10 @@ void ats_notify_peer_disconnect (
 #if DEBUG_ATS
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ats_notify_peer_disconnect: %s\n",GNUNET_i2s(peer));
 #endif
-       /* remove peer */
-       if (GNUNET_CONTAINER_multihashmap_contains (ats->peers, &peer->hashPubKey))
-       {
-               ats_map_remove_peer(NULL, &peer->hashPubKey, GNUNET_CONTAINER_multihashmap_get (ats->peers, &peer->hashPubKey));
-               GNUNET_CONTAINER_multihashmap_remove_all (ats->peers, &peer->hashPubKey);
-       }
 
-       ats_calculate_bandwidth_distribution (ats);
-}
+       ats->modified_addr = GNUNET_YES;
 
-
-void ats_notify_ats_data (
-               const struct GNUNET_PeerIdentity *peer,
-               const struct GNUNET_TRANSPORT_ATS_Information *ats_data)
-{
-#if DEBUG_ATS
-       GNUNET_log (GNUNET_ERROR_TYPE_BULK, "ATS_notify_ats_data: %s\n",GNUNET_i2s(peer));
-#endif
-       ats_calculate_bandwidth_distribution(ats);
+       ats_calculate_bandwidth_distribution (ats);
 }
 
 struct ForeignAddressList * ats_get_preferred_address (
@@ -6562,7 +7257,7 @@ run (void *cls,
   if (peerinfo == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("Could not access PEERINFO service.  Exiting.\n")); 
+                 _("Could not access PEERINFO service.  Exiting.\n"));
       GNUNET_SCHEDULER_shutdown ();
       if (stats != NULL)
        {
@@ -6619,7 +7314,7 @@ run (void *cls,
   if (no_transports)
     refresh_hello ();
 
-  ats = ats_init();
+  ats_init();
 
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Transport service ready.\n"));