move GNUNET_TRANSPORT_ATS_ to GNUNET_ATS_

16 files changed, 85 insertions, 85 deletions

diff --git a/src/core/core.h b/src/core/core.h
index 8c97f6177..5c0738ee4 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -125,7 +125,7 @@ struct ConnectNotifyMessage
    * First of the ATS information blocks (we must have at least
    * one due to the 0-termination requirement).
    */
-  struct GNUNET_TRANSPORT_ATS_Information ats;
+  struct GNUNET_ATS_Information ats;
 
 };
 
@@ -171,7 +171,7 @@ struct PeerStatusNotifyMessage
    * First of the ATS information blocks (we must have at least
    * one due to the 0-termination requirement).
    */
-  struct GNUNET_TRANSPORT_ATS_Information ats;
+  struct GNUNET_ATS_Information ats;
 
 };
 
@@ -232,7 +232,7 @@ struct NotifyTrafficMessage
    * First of the ATS information blocks (we must have at least
    * one due to the 0-termination requirement).
    */
-  struct GNUNET_TRANSPORT_ATS_Information ats;
+  struct GNUNET_ATS_Information ats;
 
 };
 
diff --git a/src/core/core_api.c b/src/core/core_api.c
index 57d01f6bb..0de64869b 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -864,8 +864,8 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     ats_count = ntohl (cnm->ats_count);
     if ((msize !=
          sizeof (struct ConnectNotifyMessage) +
-         ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) ||
-        (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR !=
+         ats_count * sizeof (struct GNUNET_ATS_Information)) ||
+        (GNUNET_ATS_ARRAY_TERMINATOR !=
          ntohl ((&cnm->ats)[ats_count].type)))
     {
       GNUNET_break (0);
@@ -945,9 +945,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     ats_count = ntohl (ntm->ats_count);
     if ((msize <
          sizeof (struct NotifyTrafficMessage) +
-         ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
+         ats_count * sizeof (struct GNUNET_ATS_Information) +
          sizeof (struct GNUNET_MessageHeader)) ||
-        (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR !=
+        (GNUNET_ATS_ARRAY_TERMINATOR !=
          ntohl ((&ntm->ats)[ats_count].type)))
     {
       GNUNET_break (0);
@@ -970,7 +970,7 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     if ((GNUNET_NO == h->inbound_hdr_only) &&
         (msize !=
          ntohs (em->size) + sizeof (struct NotifyTrafficMessage) +
-         +ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)))
+         +ats_count * sizeof (struct GNUNET_ATS_Information)))
     {
       GNUNET_break (0);
       reconnect_later (h);
@@ -1014,9 +1014,9 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     ats_count = ntohl (ntm->ats_count);
     if ((msize <
          sizeof (struct NotifyTrafficMessage) +
-         ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
+         ats_count * sizeof (struct GNUNET_ATS_Information) +
          sizeof (struct GNUNET_MessageHeader)) ||
-        (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR !=
+        (GNUNET_ATS_ARRAY_TERMINATOR !=
          ntohl ((&ntm->ats)[ats_count].type)))
     {
       GNUNET_break (0);
@@ -1039,7 +1039,7 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
     if ((GNUNET_NO == h->outbound_hdr_only) &&
         (msize !=
          ntohs (em->size) + sizeof (struct NotifyTrafficMessage) +
-         ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)))
+         ats_count * sizeof (struct GNUNET_ATS_Information)))
     {
       GNUNET_break (0);
       reconnect_later (h);
diff --git a/src/core/core_api_iterate_peers.c b/src/core/core_api_iterate_peers.c
index 0cc28e538..ed9ea175e 100644
--- a/src/core/core_api_iterate_peers.c
+++ b/src/core/core_api_iterate_peers.c
@@ -101,8 +101,8 @@ receive_info (void *cls, const struct GNUNET_MessageHeader *msg)
   ats_count = ntohl (connect_message->ats_count);
   if ((msize !=
        sizeof (struct ConnectNotifyMessage) +
-       ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) ||
-      (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR !=
+       ats_count * sizeof (struct GNUNET_ATS_Information)) ||
+      (GNUNET_ATS_ARRAY_TERMINATOR !=
        ntohl ((&connect_message->ats)[ats_count].type)))
   {
     GNUNET_break (0);
diff --git a/src/core/gnunet-core-list-connections.c b/src/core/gnunet-core-list-connections.c
index fe037f73b..ae7feb915 100644
--- a/src/core/gnunet-core-list-connections.c
+++ b/src/core/gnunet-core-list-connections.c
@@ -123,7 +123,7 @@ process_resolved_address (void *cls, const char *address)
  */
 static void
 connected_peer_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
-                         const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                         const struct GNUNET_ATS_Information *atsi)
 {
   struct PrintContext *pc;
 
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 5d262fdc6..010c42a09 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -490,7 +490,7 @@ struct Neighbour
   /**
    * Performance data for the peer.
    */
-  struct GNUNET_TRANSPORT_ATS_Information *ats;
+  struct GNUNET_ATS_Information *ats;
 
   /**
    * Identity of the neighbour.
@@ -957,7 +957,7 @@ handle_peer_status_change (struct Neighbour *n)
 {
   struct PeerStatusNotifyMessage *psnm;
   char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
-  struct GNUNET_TRANSPORT_ATS_Information *ats;
+  struct GNUNET_ATS_Information *ats;
   size_t size;
 
   if ((!n->is_connected) || (n->status != PEER_STATE_KEY_CONFIRMED))
@@ -968,7 +968,7 @@ handle_peer_status_change (struct Neighbour *n)
 #endif
   size =
       sizeof (struct PeerStatusNotifyMessage) +
-      n->ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+      n->ats_count * sizeof (struct GNUNET_ATS_Information);
   if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
   {
     GNUNET_break (0);
@@ -976,7 +976,7 @@ handle_peer_status_change (struct Neighbour *n)
     GNUNET_array_grow (n->ats, n->ats_count, 0);
     size =
         sizeof (struct PeerStatusNotifyMessage) +
-        n->ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+        n->ats_count * sizeof (struct GNUNET_ATS_Information);
   }
   psnm = (struct PeerStatusNotifyMessage *) buf;
   psnm->header.size = htons (size);
@@ -988,7 +988,7 @@ handle_peer_status_change (struct Neighbour *n)
   psnm->ats_count = htonl (n->ats_count);
   ats = &psnm->ats;
   memcpy (ats, n->ats,
-          n->ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
+          n->ats_count * sizeof (struct GNUNET_ATS_Information));
   ats[n->ats_count].type = htonl (0);
   ats[n->ats_count].value = htonl (0);
   send_to_all_clients (&psnm->header, GNUNET_YES,
@@ -1245,12 +1245,12 @@ notify_client_about_neighbour (void *cls, const GNUNET_HashCode * key,
   struct Neighbour *n = value;
   size_t size;
   char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
-  struct GNUNET_TRANSPORT_ATS_Information *ats;
+  struct GNUNET_ATS_Information *ats;
   struct ConnectNotifyMessage *cnm;
 
   size =
       sizeof (struct ConnectNotifyMessage) +
-      (n->ats_count) * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+      (n->ats_count) * sizeof (struct GNUNET_ATS_Information);
   if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
   {
     GNUNET_break (0);
@@ -1258,7 +1258,7 @@ notify_client_about_neighbour (void *cls, const GNUNET_HashCode * key,
     GNUNET_array_grow (n->ats, n->ats_count, 0);
     size =
         sizeof (struct ConnectNotifyMessage) +
-        (n->ats_count) * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+        (n->ats_count) * sizeof (struct GNUNET_ATS_Information);
   }
   cnm = (struct ConnectNotifyMessage *) buf;
   cnm->header.size = htons (size);
@@ -1266,8 +1266,8 @@ notify_client_about_neighbour (void *cls, const GNUNET_HashCode * key,
   cnm->ats_count = htonl (n->ats_count);
   ats = &cnm->ats;
   memcpy (ats, n->ats,
-          sizeof (struct GNUNET_TRANSPORT_ATS_Information) * n->ats_count);
-  ats[n->ats_count].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+          sizeof (struct GNUNET_ATS_Information) * n->ats_count);
+  ats[n->ats_count].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
   ats[n->ats_count].value = htonl (0);
   if (n->status == PEER_STATE_KEY_CONFIRMED)
   {
@@ -1464,7 +1464,7 @@ queue_connect_message (void *cls, const GNUNET_HashCode * key, void *value)
   struct GNUNET_SERVER_TransmitContext *tc = cls;
   struct Neighbour *n = value;
   char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
-  struct GNUNET_TRANSPORT_ATS_Information *ats;
+  struct GNUNET_ATS_Information *ats;
   size_t size;
   struct ConnectNotifyMessage *cnm;
 
@@ -1473,7 +1473,7 @@ queue_connect_message (void *cls, const GNUNET_HashCode * key, void *value)
     return GNUNET_OK;
   size =
       sizeof (struct ConnectNotifyMessage) +
-      (n->ats_count) * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+      (n->ats_count) * sizeof (struct GNUNET_ATS_Information);
   if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
   {
     GNUNET_break (0);
@@ -1481,7 +1481,7 @@ queue_connect_message (void *cls, const GNUNET_HashCode * key, void *value)
     GNUNET_array_grow (n->ats, n->ats_count, 0);
     size =
         sizeof (struct PeerStatusNotifyMessage) +
-        n->ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+        n->ats_count * sizeof (struct GNUNET_ATS_Information);
   }
   cnm = (struct ConnectNotifyMessage *) buf;
   cnm->header.size = htons (size);
@@ -1489,8 +1489,8 @@ queue_connect_message (void *cls, const GNUNET_HashCode * key, void *value)
   cnm->ats_count = htonl (n->ats_count);
   ats = &cnm->ats;
   memcpy (ats, n->ats,
-          n->ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
-  ats[n->ats_count].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+          n->ats_count * sizeof (struct GNUNET_ATS_Information));
+  ats[n->ats_count].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
   ats[n->ats_count].value = htonl (0);
 #if DEBUG_CORE_CLIENT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message to client.\n",
@@ -3089,7 +3089,7 @@ trigger_processing:
  */
 static void
 handle_set_key (struct Neighbour *n, const struct SetKeyMessage *m,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                const struct GNUNET_ATS_Information *ats,
                 uint32_t ats_count);
 
 
@@ -3166,7 +3166,7 @@ process_hello_retry_handle_set_key (void *cls,
  */
 static void
 update_neighbour_performance (struct Neighbour *n,
-                              const struct GNUNET_TRANSPORT_ATS_Information
+                              const struct GNUNET_ATS_Information
                               *ats, uint32_t ats_count)
 {
   uint32_t i;
@@ -3203,7 +3203,7 @@ update_neighbour_performance (struct Neighbour *n,
  */
 static void
 handle_ping (struct Neighbour *n, const struct PingMessage *m,
-             const struct GNUNET_TRANSPORT_ATS_Information *ats,
+             const struct GNUNET_ATS_Information *ats,
              uint32_t ats_count)
 {
   struct PingMessage t;
@@ -3295,14 +3295,14 @@ handle_ping (struct Neighbour *n, const struct PingMessage *m,
  */
 static void
 handle_pong (struct Neighbour *n, const struct PongMessage *m,
-             const struct GNUNET_TRANSPORT_ATS_Information *ats,
+             const struct GNUNET_ATS_Information *ats,
              uint32_t ats_count)
 {
   struct PongMessage t;
   struct ConnectNotifyMessage *cnm;
   struct GNUNET_CRYPTO_AesInitializationVector iv;
   char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
-  struct GNUNET_TRANSPORT_ATS_Information *mats;
+  struct GNUNET_ATS_Information *mats;
   size_t size;
 
 #if DEBUG_HANDSHAKE
@@ -3393,7 +3393,7 @@ handle_pong (struct Neighbour *n, const struct PongMessage *m,
     update_neighbour_performance (n, ats, ats_count);
     size =
         sizeof (struct ConnectNotifyMessage) +
-        (n->ats_count) * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+        (n->ats_count) * sizeof (struct GNUNET_ATS_Information);
     if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
     {
       GNUNET_break (0);
@@ -3401,7 +3401,7 @@ handle_pong (struct Neighbour *n, const struct PongMessage *m,
       GNUNET_array_grow (n->ats, n->ats_count, 0);
       size =
           sizeof (struct PeerStatusNotifyMessage) +
-          n->ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+          n->ats_count * sizeof (struct GNUNET_ATS_Information);
     }
     cnm = (struct ConnectNotifyMessage *) buf;
     cnm->header.size = htons (size);
@@ -3410,8 +3410,8 @@ handle_pong (struct Neighbour *n, const struct PongMessage *m,
     cnm->peer = n->peer;
     mats = &cnm->ats;
     memcpy (mats, n->ats,
-            n->ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information));
-    mats[n->ats_count].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+            n->ats_count * sizeof (struct GNUNET_ATS_Information));
+    mats[n->ats_count].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
     mats[n->ats_count].value = htonl (0);
     send_to_all_clients (&cnm->header, GNUNET_NO,
                          GNUNET_CORE_OPTION_SEND_CONNECT);
@@ -3445,7 +3445,7 @@ handle_pong (struct Neighbour *n, const struct PongMessage *m,
  */
 static void
 handle_set_key (struct Neighbour *n, const struct SetKeyMessage *m,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                const struct GNUNET_ATS_Information *ats,
                 uint32_t ats_count)
 {
   struct SetKeyMessage *m_cpy;
@@ -3619,10 +3619,10 @@ send_p2p_message_to_client (struct Neighbour *sender, struct Client *client,
 {
   size_t size =
       msize + sizeof (struct NotifyTrafficMessage) +
-      (sender->ats_count) * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+      (sender->ats_count) * sizeof (struct GNUNET_ATS_Information);
   char buf[size];
   struct NotifyTrafficMessage *ntm;
-  struct GNUNET_TRANSPORT_ATS_Information *ats;
+  struct GNUNET_ATS_Information *ats;
 
   GNUNET_assert (GNUNET_YES == sender->is_connected);
   GNUNET_break (sender->status == PEER_STATE_KEY_CONFIRMED);
@@ -3633,7 +3633,7 @@ send_p2p_message_to_client (struct Neighbour *sender, struct Client *client,
     GNUNET_array_grow (sender->ats, sender->ats_count, 0);
     size =
         msize + sizeof (struct NotifyTrafficMessage) +
-        (sender->ats_count) * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+        (sender->ats_count) * sizeof (struct GNUNET_ATS_Information);
   }
 #if DEBUG_CORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3649,8 +3649,8 @@ send_p2p_message_to_client (struct Neighbour *sender, struct Client *client,
   ntm->peer = sender->peer;
   ats = &ntm->ats;
   memcpy (ats, sender->ats,
-          sizeof (struct GNUNET_TRANSPORT_ATS_Information) * sender->ats_count);
-  ats[sender->ats_count].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+          sizeof (struct GNUNET_ATS_Information) * sender->ats_count);
+  ats[sender->ats_count].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
   ats[sender->ats_count].value = htonl (0);
   memcpy (&ats[sender->ats_count + 1], m, msize);
   send_to_client (client, &ntm->header, GNUNET_YES);
@@ -3748,7 +3748,7 @@ deliver_message (void *cls, void *client, const struct GNUNET_MessageHeader *m)
  */
 static void
 handle_encrypted_message (struct Neighbour *n, const struct EncryptedMessage *m,
-                          const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                          const struct GNUNET_ATS_Information *ats,
                           uint32_t ats_count)
 {
   size_t size = ntohs (m->header.size);
@@ -3908,7 +3908,7 @@ handle_encrypted_message (struct Neighbour *n, const struct EncryptedMessage *m,
 static void
 handle_transport_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                           const struct GNUNET_MessageHeader *message,
-                          const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                          const struct GNUNET_ATS_Information *ats,
                           uint32_t ats_count)
 {
   struct Neighbour *n;
@@ -4171,7 +4171,7 @@ neighbour_quota_update (void *cls,
 static void
 handle_transport_notify_connect (void *cls,
                                  const struct GNUNET_PeerIdentity *peer,
-                                 const struct GNUNET_TRANSPORT_ATS_Information
+                                 const struct GNUNET_ATS_Information
                                  *ats, uint32_t ats_count)
 {
   struct Neighbour *n;
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 5e25ac907..3159772aa 100644
--- a/src/core/gnunet-service-core_clients.c
+++ b/src/core/gnunet-service-core_clients.c
@@ -616,7 +616,7 @@ GSC_CLIENTS_reject_request (struct GSC_ClientActiveRequest *car)
 void
 GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
                                            const struct GNUNET_PeerIdentity *neighbour,
-                                           const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                           const struct GNUNET_ATS_Information *atsi,
                                            unsigned int atsi_count,
                                            const struct GSC_TypeMap *tmap_old,
                                            const struct GSC_TypeMap *tmap_new)
@@ -624,7 +624,7 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
   struct ConnectNotifyMessage *cnm;
   size_t size;
   char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
-  struct GNUNET_TRANSPORT_ATS_Information *a;
+  struct GNUNET_ATS_Information *a;
   struct DisconnectNotifyMessage dcm;
   int old_match;
   int new_match;
@@ -640,7 +640,7 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
     /* send connect */  
     size =
       sizeof (struct ConnectNotifyMessage) +
-      (atsi_count) * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+      (atsi_count) * sizeof (struct GNUNET_ATS_Information);
     if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
       {
         GNUNET_break (0);
@@ -654,8 +654,8 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
     cnm->ats_count = htonl (atsi_count);
     a = &cnm->ats;
     memcpy (a, atsi,
-            sizeof (struct GNUNET_TRANSPORT_ATS_Information) * atsi_count);
-    a[atsi_count].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+            sizeof (struct GNUNET_ATS_Information) * atsi_count);
+    a[atsi_count].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
     a[atsi_count].value = htonl (0);
 #if DEBUG_CORE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
@@ -690,7 +690,7 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
  */
 void
 GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity *neighbour,
-                                            const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                            const struct GNUNET_ATS_Information *atsi,
                                             unsigned int atsi_count,
                                             const struct GSC_TypeMap *tmap_old,
                                             const struct GSC_TypeMap *tmap_new)
@@ -719,17 +719,17 @@ GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity *ne
  */
 void
 GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender,
-                             const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                             const struct GNUNET_ATS_Information *atsi,
                              unsigned int atsi_count,
                              const struct GNUNET_MessageHeader *msg,
                              uint16_t msize,
                              int options)
 {
   size_t size = msize + sizeof (struct NotifyTrafficMessage) +
-      atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information);
+      atsi_count * sizeof (struct GNUNET_ATS_Information);
   char buf[size];
   struct NotifyTrafficMessage *ntm;
-  struct GNUNET_TRANSPORT_ATS_Information *a;
+  struct GNUNET_ATS_Information *a;
 
   if (0 == options)
   {
@@ -759,8 +759,8 @@ GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender,
   ntm->peer = *sender;
   a = &ntm->ats;
   memcpy (a, atsi,
-          sizeof (struct GNUNET_TRANSPORT_ATS_Information) * atsi_count);
-  a[atsi_count].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+          sizeof (struct GNUNET_ATS_Information) * atsi_count);
+  a[atsi_count].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
   a[atsi_count].value = htonl (0);
   memcpy (&a[atsi_count + 1], msg, msize);
   send_to_all_clients (&ntm->header, GNUNET_YES, 
diff --git a/src/core/gnunet-service-core_clients.h b/src/core/gnunet-service-core_clients.h
index 9774292c0..2385efc05 100644
--- a/src/core/gnunet-service-core_clients.h
+++ b/src/core/gnunet-service-core_clients.h
@@ -60,7 +60,7 @@ GSC_CLIENTS_send_to_client (struct GNUNET_SERVER_Client *client,
 void
 GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
                                            const struct GNUNET_PeerIdentity *neighbour,
-                                           const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                           const struct GNUNET_ATS_Information *atsi,
                                            unsigned int atsi_count,
                                            const struct GSC_TypeMap *tmap_old,
                                            const struct GSC_TypeMap *tmap_new);
@@ -79,7 +79,7 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
  */
 void
 GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity *neighbour,
-                                            const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                            const struct GNUNET_ATS_Information *atsi,
                                             unsigned int atsi_count,
                                             const struct GSC_TypeMap *tmap_old,
                                             const struct GSC_TypeMap *tmap_new);
@@ -100,7 +100,7 @@ GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity *ne
  */
 void
 GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender,
-                             const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                             const struct GNUNET_ATS_Information *atsi,
                              unsigned int atsi_count,
                              const struct GNUNET_MessageHeader *msg,
                              uint16_t msize,
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c
index 92a9e13c9..dfc304226 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -1301,7 +1301,7 @@ struct DeliverMessageContext
   /**
    * Performance information for the connection.
    */
-  const struct GNUNET_TRANSPORT_ATS_Information *atsi;
+  const struct GNUNET_ATS_Information *atsi;
 
   /**
    * Sender of the message.
@@ -1327,7 +1327,7 @@ struct DeliverMessageContext
 void
 GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx, 
                                  const struct GNUNET_MessageHeader *msg,
-                                 const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                 const struct GNUNET_ATS_Information *atsi,
                                  uint32_t atsi_count)
 {
   const struct EncryptedMessage *m;
diff --git a/src/core/gnunet-service-core_kx.h b/src/core/gnunet-service-core_kx.h
index 3c6734d77..0e963ef7a 100644
--- a/src/core/gnunet-service-core_kx.h
+++ b/src/core/gnunet-service-core_kx.h
@@ -96,7 +96,7 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx,
 void
 GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx, 
                                  const struct GNUNET_MessageHeader *msg,
-                                 const struct GNUNET_TRANSPORT_ATS_Information *atsi,
+                                 const struct GNUNET_ATS_Information *atsi,
                                  uint32_t atsi_count);
 
 
diff --git a/src/core/gnunet-service-core_neighbours.c b/src/core/gnunet-service-core_neighbours.c
index 60ce0e512..505b1797b 100644
--- a/src/core/gnunet-service-core_neighbours.c
+++ b/src/core/gnunet-service-core_neighbours.c
@@ -309,7 +309,7 @@ process_queue (struct Neighbour *n)
 static void
 handle_transport_notify_connect (void *cls,
                                  const struct GNUNET_PeerIdentity *peer,
-                                 const struct GNUNET_TRANSPORT_ATS_Information
+                                 const struct GNUNET_ATS_Information
                                  *ats, uint32_t ats_count)
 {
   struct Neighbour *n;
@@ -383,7 +383,7 @@ handle_transport_notify_disconnect (void *cls,
 static void
 handle_transport_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                           const struct GNUNET_MessageHeader *message,
-                          const struct GNUNET_TRANSPORT_ATS_Information *ats,
+                          const struct GNUNET_ATS_Information *ats,
                           uint32_t ats_count)
 {
   struct Neighbour *n;
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
index 3c29bd065..c239f27c1 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -632,7 +632,7 @@ queue_connect_message (void *cls, const GNUNET_HashCode * key, void *value)
   struct GNUNET_SERVER_TransmitContext *tc = cls;
   struct Session *session = value;
   struct ConnectNotifyMessage cnm;
-  struct GNUNET_TRANSPORT_ATS_Information *a;
+  struct GNUNET_ATS_Information *a;
  
   /* FIXME: code duplication with clients... */
   cnm.header.size = htons (sizeof (struct ConnectNotifyMessage));
@@ -641,7 +641,7 @@ queue_connect_message (void *cls, const GNUNET_HashCode * key, void *value)
   cnm.peer = session->peer;
   a = &cnm.ats;
   // FIXME: full ats...
-  a[0].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+  a[0].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR);
   a[0].value = htonl (0);
   GNUNET_SERVER_transmit_context_append_message (tc, &cnm.header);
   return GNUNET_OK;
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 15e3f812b..10cba9d8a 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -165,7 +165,7 @@ transmit_ready (void *cls, size_t size, void *buf)
 
 static void
 connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
   struct PeerContext *pc = cls;
 
@@ -218,7 +218,7 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
 static int
 inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
@@ -229,7 +229,7 @@ inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
 static int
 outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                  const struct GNUNET_MessageHeader *message,
-                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                 const struct GNUNET_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core notifies about outbound data for `%4s'.\n",
@@ -242,7 +242,7 @@ outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
 static int
 process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_MessageHeader *message,
-               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+               const struct GNUNET_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving message from `%4s'.\n",
               GNUNET_i2s (peer));
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c
index 05cc25afa..1ae67b02b 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -225,7 +225,7 @@ transmit_ready (void *cls, size_t size, void *buf)
 
 static void
 connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
   struct PeerContext *pc = cls;
 
@@ -270,7 +270,7 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
 static int
 inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -283,7 +283,7 @@ inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
 static int
 outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                  const struct GNUNET_MessageHeader *message,
-                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                 const struct GNUNET_ATS_Information *atsi)
 {
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -300,7 +300,7 @@ transmit_ready (void *cls, size_t size, void *buf);
 static int
 process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_MessageHeader *message,
-               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+               const struct GNUNET_ATS_Information *atsi)
 {
   static int n;
   unsigned int s;
diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c
index b7e2b449b..a1c361376 100644
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -90,7 +90,7 @@ cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx)
 static int
 receive (void *cls, const struct GNUNET_PeerIdentity *other,
          const struct GNUNET_MessageHeader *message,
-         const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+         const struct GNUNET_ATS_Information *atsi)
 {
   if (die_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (die_task);
@@ -134,7 +134,7 @@ init (void *cls, struct GNUNET_CORE_Handle *core,
 
 static void
 connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
-            const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+            const struct GNUNET_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s.\n",
               GNUNET_i2s (peer));
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index 744758191..9825131be 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -67,7 +67,7 @@ static int ok;
 
 static void
 connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
 }
 
@@ -81,7 +81,7 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
 static int
 inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
   return GNUNET_OK;
 }
@@ -90,7 +90,7 @@ inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
 static int
 outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                  const struct GNUNET_MessageHeader *message,
-                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                 const struct GNUNET_ATS_Information *atsi)
 {
   return GNUNET_OK;
 }
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index e3b760624..3f619f49a 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -358,7 +358,7 @@ transmit_ready (void *cls, size_t size, void *buf)
 
 static void
 connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
   struct PeerContext *pc = cls;
 
@@ -418,7 +418,7 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
 static int
 inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
 #if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -433,7 +433,7 @@ inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
 static int
 outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                  const struct GNUNET_MessageHeader *message,
-                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                 const struct GNUNET_ATS_Information *atsi)
 {
 #if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -450,7 +450,7 @@ transmit_ready (void *cls, size_t size, void *buf);
 static int
 process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_MessageHeader *message,
-               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+               const struct GNUNET_ATS_Information *atsi)
 {
   static int n;
   const struct TestMessage *hdr;