multicast, psyc, psycstore, client_manager fixes

[oweals/gnunet.git] / src / include / gnunet_ats_service.h

diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 68499121e7b3d78114e23a2ee81511364b67323f..616b963272aa82690f4163b718e450661d6fd26f 100644 (file)
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 /**
  * @file include/gnunet_ats_service.h
@@ -105,6 +105,12 @@ enum GNUNET_ATS_Network_Type
 struct GNUNET_ATS_Properties
 {
 
+  /**
+   * Delay.  Time between when the time packet is sent and the packet
+   * arrives.  FOREVER if we did not measure yet.
+   */
+  struct GNUNET_TIME_Relative delay;
+
   /**
    * Actual traffic on this connection from this peer to the other peer.
    * Includes transport overhead.
@@ -121,12 +127,6 @@ struct GNUNET_ATS_Properties
    */
   uint32_t utilization_in;
 
-  /**
-   * Which network scope does the respective address belong to?
-   * This property does not change.
-   */
-  enum GNUNET_ATS_Network_Type scope;
-
   /**
    * Distance on network layer (required for distance-vector routing)
    * in hops.  Zero for direct connections (i.e. plain TCP/UDP).
@@ -134,10 +134,10 @@ struct GNUNET_ATS_Properties
   unsigned int distance;
 
   /**
-   * Delay.  Time between when the time packet is sent and the packet
-   * arrives.  FOREVER if we did not measure yet.
+   * Which network scope does the respective address belong to?
+   * This property does not change.
    */
-  struct GNUNET_TIME_Relative delay;
+  enum GNUNET_ATS_Network_Type scope;
 
 };
 
@@ -604,15 +604,10 @@ void
 GNUNET_ATS_reserve_bandwidth_cancel (struct GNUNET_ATS_ReservationContext *rc);
 
 
-/**
- * Number of preference types supported by ATS
- */
-#define GNUNET_ATS_PreferenceCount 3
-
 /**
  * ATS preference types as array initializer
  */
-#define GNUNET_ATS_PreferenceType {GNUNET_ATS_PREFERENCE_END, GNUNET_ATS_PREFERENCE_BANDWIDTH, GNUNET_ATS_PREFERENCE_LATENCY}
+#define GNUNET_ATS_PreferenceType {GNUNET_ATS_PREFERENCE_BANDWIDTH, GNUNET_ATS_PREFERENCE_LATENCY, GNUNET_ATS_PREFERENCE_END}
 
 /**
  * ATS preference types as string array initializer