diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-10-18 12:23:34 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-10-18 12:23:34 +0000 |
commit | 0d289b2116b74c3e3196365cb1eeb0198be0c7f2 (patch) | |
tree | c5c08517922fc943bf4616ce8ad0540aa8399e92 /src | |
parent | 284ad241eec0f741d3221208017fb42931c5838c (diff) | |
download | gnunet-0d289b2116b74c3e3196365cb1eeb0198be0c7f2.tar.gz gnunet-0d289b2116b74c3e3196365cb1eeb0198be0c7f2.zip |
new property
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_ats_service.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h index 710e14a11..2b654b053 100644 --- a/src/include/gnunet_ats_service.h +++ b/src/include/gnunet_ats_service.h | |||
@@ -83,12 +83,12 @@ enum GNUNET_ATS_Network_Type | |||
83 | /** | 83 | /** |
84 | * Number of property types supported by ATS | 84 | * Number of property types supported by ATS |
85 | */ | 85 | */ |
86 | #define GNUNET_ATS_PropertyCount 9 | 86 | #define GNUNET_ATS_PropertyCount 11 |
87 | 87 | ||
88 | /** | 88 | /** |
89 | * ATS properties types as string array initializer | 89 | * ATS properties types as string array initializer |
90 | */ | 90 | */ |
91 | #define GNUNET_ATS_PropertyStrings {"TERMINATOR", "UTILIZATION_UP", "UTILIZATION_DOWN", "NETWORK_TYPE", "DELAY", "DISTANCE", "COST_WAN", "COST_LAN", "COST_WLAN"} | 91 | #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"} |
92 | 92 | ||
93 | /** | 93 | /** |
94 | * Enum defining all known property types for ATS Enum values are used | 94 | * Enum defining all known property types for ATS Enum values are used |
@@ -110,18 +110,37 @@ enum GNUNET_ATS_Property | |||
110 | GNUNET_ATS_ARRAY_TERMINATOR = 0, | 110 | GNUNET_ATS_ARRAY_TERMINATOR = 0, |
111 | 111 | ||
112 | /** | 112 | /** |
113 | * Actual traffic on this connection from this peer to the other peer. | ||
114 | * Includes transport overhead | ||
115 | * | ||
116 | * Unit: [bytes/second] | ||
117 | */ | ||
118 | GNUNET_ATS_UTILIZATION_OUT, | ||
119 | |||
120 | /** | ||
113 | * Actual traffic on this connection from the other peer to this peer. | 121 | * Actual traffic on this connection from the other peer to this peer. |
122 | * Includes transport overhead | ||
114 | * | 123 | * |
115 | * Unit: [bytes/second] | 124 | * Unit: [bytes/second] |
116 | */ | 125 | */ |
117 | GNUNET_ATS_UTILIZATION_UP, | 126 | GNUNET_ATS_UTILIZATION_IN, |
127 | |||
118 | 128 | ||
119 | /** | 129 | /** |
120 | * Actual traffic on this connection from this peer to the other peer. | 130 | * Actual traffic on this connection from this peer to the other peer. |
131 | * Only payload from layers > transport | ||
132 | * | ||
133 | * Unit: [bytes/second] | ||
134 | */ | ||
135 | GNUNET_ATS_UTILIZATION_PAYLOAD_OUT, | ||
136 | |||
137 | /** | ||
138 | * Actual traffic on this connection from the other peer to this peer. | ||
139 | * Only payload from layers > transport | ||
121 | * | 140 | * |
122 | * Unit: [bytes/second] | 141 | * Unit: [bytes/second] |
123 | */ | 142 | */ |
124 | GNUNET_ATS_UTILIZATION_DOWN, | 143 | GNUNET_ATS_UTILIZATION_PAYLOAD_IN, |
125 | 144 | ||
126 | /** | 145 | /** |
127 | * Is this address located in WAN, LAN or a loopback address | 146 | * Is this address located in WAN, LAN or a loopback address |