[GNUnet-SVN] r30308 - gnunet/src/include

[gnunet]

Author: wachs
Date: 2013-10-18 14:23:34 +0200 (Fri, 18 Oct 2013)
New Revision: 30308

Modified:
   gnunet/src/include/gnunet_ats_service.h
Log:
new property


Modified: gnunet/src/include/gnunet_ats_service.h
===================================================================
--- gnunet/src/include/gnunet_ats_service.h     2013-10-18 12:20:09 UTC (rev 
30307)
+++ gnunet/src/include/gnunet_ats_service.h     2013-10-18 12:23:34 UTC (rev 
30308)
@@ -83,12 +83,12 @@
 /**
  * Number of property types supported by ATS
  */
-#define GNUNET_ATS_PropertyCount 9
+#define GNUNET_ATS_PropertyCount 11
 
 /**
  * ATS properties types as string array initializer
  */
-#define GNUNET_ATS_PropertyStrings {"TERMINATOR", "UTILIZATION_UP", 
"UTILIZATION_DOWN", "NETWORK_TYPE", "DELAY", "DISTANCE", "COST_WAN", 
"COST_LAN", "COST_WLAN"}
+#define GNUNET_ATS_PropertyStrings {"TERMINATOR", "UTILIZATION_UP", 
"UTILIZATION_DOWN", "UTILIZATION_PAYLOAD_UP", "UTILIZATION_PAYLOAD_DOWN", 
"NETWORK_TYPE", "DELAY", "DISTANCE", "COST_WAN", "COST_LAN", "COST_WLAN"}
 
 /**
  * Enum defining all known property types for ATS Enum values are used
@@ -110,20 +110,39 @@
   GNUNET_ATS_ARRAY_TERMINATOR = 0,
 
   /**
+   * Actual traffic on this connection from this peer to the other peer.
+   * Includes transport overhead
+   *
+   * Unit: [bytes/second]
+   */
+  GNUNET_ATS_UTILIZATION_OUT,
+
+  /**
    * Actual traffic on this connection from the other peer to this peer.
+   * Includes transport overhead
    *
    * Unit: [bytes/second]
    */
-  GNUNET_ATS_UTILIZATION_UP,
+  GNUNET_ATS_UTILIZATION_IN,
 
+
   /**
    * Actual traffic on this connection from this peer to the other peer.
+   * Only payload from layers > transport
    *
    * Unit: [bytes/second]
    */
-  GNUNET_ATS_UTILIZATION_DOWN,
+  GNUNET_ATS_UTILIZATION_PAYLOAD_OUT,
 
   /**
+   * Actual traffic on this connection from the other peer to this peer.
+   * Only payload from layers > transport
+   *
+   * Unit: [bytes/second]
+   */
+  GNUNET_ATS_UTILIZATION_PAYLOAD_IN,
+
+  /**
    * Is this address located in WAN, LAN or a loopback address
    * Value is element of GNUNET_ATS_Network_Type
    */