aboutsummaryrefslogtreecommitdiff
path: root/src/ats/gnunet-ats-solver-eval.h
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2014-04-30 16:49:38 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2014-04-30 16:49:38 +0000
commitf5743f7009ec5ab505963b7cf4338917caa136d1 (patch)
tree69fbf4d778b9961c3f1e4f9c1fc227cb898d4246 /src/ats/gnunet-ats-solver-eval.h
parentdf775d9bd009286b42212fecf995cf3b1865a39a (diff)
downloadgnunet-f5743f7009ec5ab505963b7cf4338917caa136d1.tar.gz
gnunet-f5743f7009ec5ab505963b7cf4338917caa136d1.zip
fixing file handle lookup
one type to store them all
Diffstat (limited to 'src/ats/gnunet-ats-solver-eval.h')
-rw-r--r--src/ats/gnunet-ats-solver-eval.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h
index 6a4220685..05c3c89ff 100644
--- a/src/ats/gnunet-ats-solver-eval.h
+++ b/src/ats/gnunet-ats-solver-eval.h
@@ -92,10 +92,10 @@ struct LoggingFileHandle
92 struct LoggingFileHandle *prev; 92 struct LoggingFileHandle *prev;
93 93
94 /* peer id */ 94 /* peer id */
95 int pid; 95 long long unsigned int pid;
96 96
97 /* address id */ 97 /* address id */
98 int aid; 98 long long unsigned int aid;
99 99
100 struct GNUNET_DISK_FileHandle *f_hd; 100 struct GNUNET_DISK_FileHandle *f_hd;
101 101
@@ -118,7 +118,7 @@ struct LoggingPeer
118 struct LoggingPeer *prev; 118 struct LoggingPeer *prev;
119 struct LoggingPeer *next; 119 struct LoggingPeer *next;
120 120
121 int id; 121 long long unsigned int id;
122 struct GNUNET_PeerIdentity peer_id; 122 struct GNUNET_PeerIdentity peer_id;
123 double pref_abs[GNUNET_ATS_PreferenceCount]; 123 double pref_abs[GNUNET_ATS_PreferenceCount];
124 double pref_norm[GNUNET_ATS_PreferenceCount]; 124 double pref_norm[GNUNET_ATS_PreferenceCount];
@@ -132,7 +132,7 @@ struct LoggingAddress
132 struct LoggingAddress *next; 132 struct LoggingAddress *next;
133 struct LoggingAddress *prev; 133 struct LoggingAddress *prev;
134 134
135 int aid; 135 long long unsigned int aid;
136 int active; 136 int active;
137 int used; 137 int used;
138 uint32_t network; 138 uint32_t network;
@@ -149,7 +149,7 @@ struct TestPeer
149 struct TestPeer *prev; 149 struct TestPeer *prev;
150 struct TestPeer *next; 150 struct TestPeer *next;
151 151
152 int id; 152 long long unsigned int id;
153 struct GNUNET_PeerIdentity peer_id; 153 struct GNUNET_PeerIdentity peer_id;
154 154
155 double pref_abs[GNUNET_ATS_PreferenceCount]; 155 double pref_abs[GNUNET_ATS_PreferenceCount];
@@ -165,7 +165,7 @@ struct TestAddress
165 struct TestAddress *next; 165 struct TestAddress *next;
166 struct TestAddress *prev; 166 struct TestAddress *prev;
167 167
168 int aid; 168 long long unsigned int aid;
169 struct ATS_Address *ats_addr; 169 struct ATS_Address *ats_addr;
170 uint32_t network; 170 uint32_t network;
171 171
@@ -194,8 +194,9 @@ struct GNUNET_ATS_TEST_Operation
194 long long unsigned int address_id; 194 long long unsigned int address_id;
195 long long unsigned int peer_id; 195 long long unsigned int peer_id;
196 long long unsigned int client_id; 196 long long unsigned int client_id;
197
197 long long unsigned int address_session; 198 long long unsigned int address_session;
198 long long unsigned int address_network; 199 unsigned int address_network;
199 char*address; 200 char*address;
200 char*plugin; 201 char*plugin;
201 202
@@ -263,7 +264,7 @@ struct PreferenceGenerator
263 264
264 enum GeneratorType type; 265 enum GeneratorType type;
265 266
266 unsigned int peer; 267 long long unsigned int peer;
267 unsigned int client_id; 268 unsigned int client_id;
268 269
269 enum GNUNET_ATS_PreferenceKind kind; 270 enum GNUNET_ATS_PreferenceKind kind;
@@ -286,8 +287,8 @@ struct PropertyGenerator
286 287
287 enum GeneratorType type; 288 enum GeneratorType type;
288 289
289 unsigned int peer; 290 long long unsigned int peer;
290 unsigned int address_id; 291 long long unsigned int address_id;
291 292
292 struct TestPeer *test_peer; 293 struct TestPeer *test_peer;
293 struct TestAddress *test_address; 294 struct TestAddress *test_address;