-cleaning up gnunet-service-ats_addresses.h

2 files changed, 24 insertions, 37 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index f26eb779d..9895f0244 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -257,57 +257,57 @@ struct GAS_NormalizationInfo
 struct ATS_Address
 {
   /**
-   * Next element in DLL
+   * Peer ID this address is for.
    */
-  struct ATS_Address *next;
+  struct GNUNET_PeerIdentity peer;
 
   /**
-   * Previous element in DLL
+   * Address (in plugin-specific binary format).
    */
-  struct ATS_Address *prev;
+  const void *addr;
 
   /**
-   * Peer ID
+   * Plugin name
    */
-  struct GNUNET_PeerIdentity peer;
+  char *plugin;
 
   /**
-   * Address
+   * Solver specific information for this address
    */
-  const void *addr;
+  void *solver_information;
 
   /**
-   * Address length
+   * ATS performance information for this address
    */
-  size_t addr_len;
+  struct GNUNET_ATS_Information *atsi;
 
   /**
-   * Session ID, can never be 0.
+   * Time when address had last activity (update, in uses)
    */
-  uint32_t session_id;
+  struct GNUNET_TIME_Absolute t_last_activity;
 
   /**
-   * Field to store local flags
+   * Time when address was added
    */
-  uint32_t local_address_info;
+  struct GNUNET_TIME_Absolute t_added;
 
   /**
-   * Plugin name
+   * Address length, number of bytes in @e addr.
    */
-  char *plugin;
+  size_t addr_len;
 
   /**
-   * Solver specific information for this address
+   * Session ID, can never be 0.
    */
-  void *solver_information;
+  uint32_t session_id;
 
   /**
-   * ATS performance information for this address
+   * Field to store local flags
    */
-  struct GNUNET_ATS_Information *atsi;
+  uint32_t local_address_info;
 
   /**
-   * ATS performance information for this address
+   * ATS performance information for this address, size of the @e atsi array.
    */
   uint32_t atsi_count;
 
@@ -332,16 +332,6 @@ struct ATS_Address
   uint32_t last_notified_bw_out;
 
   /**
-   * Time when address had last activity (update, in uses)
-   */
-  struct GNUNET_TIME_Absolute t_last_activity;
-
-  /**
-   * Time when address was added
-   */
-  struct GNUNET_TIME_Absolute t_added;
-
-  /**
    * Is this the active address for this peer?
    */
   int active;
@@ -360,7 +350,7 @@ struct ATS_Address
 
 
 /**
- * A multihashmap to store all addresses
+ * A multipeermap mapping peer identities to `struct ATS_Address`.
  */
 extern struct GNUNET_CONTAINER_MultiPeerMap *GSA_addresses;
 
@@ -368,7 +358,7 @@ extern struct GNUNET_CONTAINER_MultiPeerMap *GSA_addresses;
 
 /**
  * Initialize address subsystem. The addresses subsystem manages the addresses
- * known and current performance information. 
+ * known and current performance information.
  */
 void
 GAS_addresses_init (void);
@@ -431,14 +421,12 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
 
 
 /**
- * Remove all addresses
+ * Remove all addresses.
  */
 void
 GAS_addresses_destroy_all (void);
 
 
-
-
 /**
  * Iterator for #GAS_addresses_get_peer_info()
  *
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index 0e75cb454..2aaf638ce 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -491,7 +491,6 @@ typedef void
                                           struct Session *session);
 
 
-
 /**
  * Function that will be called whenever the transport service wants to
  * notify the plugin that the inbound quota changed and that the plugin