aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2012-06-08 13:19:21 +0000
committerBart Polot <bart@net.in.tum.de>2012-06-08 13:19:21 +0000
commitb0ce9b9445b4462384e7bd1dd97c6cdc153dbf56 (patch)
tree869884382e29318d5dda8f3f9e5ae892106a9699 /src
parent532e72fd4284021eee28a8ff3f6e35a37d9a26e8 (diff)
downloadgnunet-b0ce9b9445b4462384e7bd1dd97c6cdc153dbf56.tar.gz
gnunet-b0ce9b9445b4462384e7bd1dd97c6cdc153dbf56.zip
- remove old queue code
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-service-mesh_new.c56
1 files changed, 1 insertions, 55 deletions
diff --git a/src/mesh/gnunet-service-mesh_new.c b/src/mesh/gnunet-service-mesh_new.c
index fd9178b8a..f0efc11f4 100644
--- a/src/mesh/gnunet-service-mesh_new.c
+++ b/src/mesh/gnunet-service-mesh_new.c
@@ -229,43 +229,6 @@ struct MeshPeerInfo
229 229
230 230
231/** 231/**
232 * Data scheduled to transmit (to local client or remote peer)
233 */
234struct MeshQueue
235{
236 /**
237 * Double linked list
238 */
239 struct MeshQueue *next;
240 struct MeshQueue *prev;
241
242 /**
243 * Target of the data (NULL if target is client)
244 */
245 struct MeshPeerInfo *peer;
246
247 /**
248 * Client to send the data to (NULL if target is peer)
249 */
250 struct MeshClient *client;
251
252 /**
253 * Size of the message to transmit
254 */
255 unsigned int size;
256
257 /**
258 * How old is the data?
259 */
260 struct GNUNET_TIME_Absolute timestamp;
261
262 /**
263 * Data itself
264 */
265 struct GNUNET_MessageHeader *data;
266};
267
268/**
269 * Globally unique tunnel identification (owner + number) 232 * Globally unique tunnel identification (owner + number)
270 * DO NOT USE OVER THE NETWORK 233 * DO NOT USE OVER THE NETWORK
271 */ 234 */
@@ -363,12 +326,6 @@ struct MeshTunnel
363 */ 326 */
364 unsigned int nignore; 327 unsigned int nignore;
365 328
366 /**
367 * Messages ready to transmit
368 */
369 struct MeshQueue *queue_head;
370 struct MeshQueue *queue_tail;
371
372 /** 329 /**
373 * Tunnel paths 330 * Tunnel paths
374 */ 331 */
@@ -2339,8 +2296,6 @@ static int
2339tunnel_destroy (struct MeshTunnel *t) 2296tunnel_destroy (struct MeshTunnel *t)
2340{ 2297{
2341 struct MeshClient *c; 2298 struct MeshClient *c;
2342 struct MeshQueue *q;
2343 struct MeshQueue *qn;
2344 GNUNET_HashCode hash; 2299 GNUNET_HashCode hash;
2345 unsigned int i; 2300 unsigned int i;
2346 int r; 2301 int r;
@@ -2409,16 +2364,7 @@ tunnel_destroy (struct MeshTunnel *t)
2409 t); 2364 t);
2410 GNUNET_CONTAINER_multihashmap_destroy (t->peers); 2365 GNUNET_CONTAINER_multihashmap_destroy (t->peers);
2411 } 2366 }
2412 q = t->queue_head; 2367
2413 while (NULL != q)
2414 {
2415 if (NULL != q->data)
2416 GNUNET_free (q->data);
2417 qn = q->next;
2418 GNUNET_free (q);
2419 q = qn;
2420 /* TODO cancel core transmit ready in case it was active */
2421 }
2422 tree_destroy (t->tree); 2368 tree_destroy (t->tree);
2423 if (NULL != t->dht_get_type) 2369 if (NULL != t->dht_get_type)
2424 GNUNET_DHT_get_stop (t->dht_get_type); 2370 GNUNET_DHT_get_stop (t->dht_get_type);