aboutsummaryrefslogtreecommitdiff
path: root/src/set
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2013-06-25 13:42:34 +0000
committerFlorian Dold <florian.dold@gmail.com>2013-06-25 13:42:34 +0000
commit68d80cd244808c4b15f330e9eb2af04e386c7321 (patch)
tree61db2161d928a002e44ae4f94591796e9824c9f1 /src/set
parentbfb60176a2b3861aea7daa47b81e0f26ae3377f9 (diff)
downloadgnunet-68d80cd244808c4b15f330e9eb2af04e386c7321.tar.gz
gnunet-68d80cd244808c4b15f330e9eb2af04e386c7321.zip
commented out calls to functions not yet implemented
Diffstat (limited to 'src/set')
-rw-r--r--src/set/gnunet-service-set.c11
-rw-r--r--src/set/gnunet-service-set.h2
-rw-r--r--src/set/gnunet-service-set_union.c2
3 files changed, 5 insertions, 10 deletions
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index bf04c8bf4..d0916d89c 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -257,7 +257,6 @@ static int
257handle_p2p_operation_request (void *cls, 257handle_p2p_operation_request (void *cls,
258 struct GNUNET_MESH_Tunnel *tunnel, 258 struct GNUNET_MESH_Tunnel *tunnel,
259 void **tunnel_ctx, 259 void **tunnel_ctx,
260 const struct GNUNET_PeerIdentity *sender,
261 const struct GNUNET_MessageHeader *mh) 260 const struct GNUNET_MessageHeader *mh)
262{ 261{
263 struct TunnelContext *tc = *tunnel_ctx; 262 struct TunnelContext *tc = *tunnel_ctx;
@@ -340,7 +339,7 @@ handle_client_create (void *cls,
340 switch (ntohs (msg->operation)) 339 switch (ntohs (msg->operation))
341 { 340 {
342 case GNUNET_SET_OPERATION_INTERSECTION: 341 case GNUNET_SET_OPERATION_INTERSECTION:
343 set = _GSS_intersection_set_create (); 342 //set = _GSS_intersection_set_create ();
344 break; 343 break;
345 case GNUNET_SET_OPERATION_UNION: 344 case GNUNET_SET_OPERATION_UNION:
346 set = _GSS_union_set_create (); 345 set = _GSS_union_set_create ();
@@ -421,7 +420,7 @@ handle_client_remove (void *cls,
421 _GSS_union_remove ((struct GNUNET_SET_ElementMessage *) m, set); 420 _GSS_union_remove ((struct GNUNET_SET_ElementMessage *) m, set);
422 break; 421 break;
423 case GNUNET_SET_OPERATION_INTERSECTION: 422 case GNUNET_SET_OPERATION_INTERSECTION:
424 _GSS_intersection_remove ((struct GNUNET_SET_ElementMessage *) m, set); 423 //_GSS_intersection_remove ((struct GNUNET_SET_ElementMessage *) m, set);
425 break; 424 break;
426 default: 425 default:
427 GNUNET_assert (0); 426 GNUNET_assert (0);
@@ -492,7 +491,7 @@ handle_client_add (void *cls,
492 _GSS_union_add ((struct GNUNET_SET_ElementMessage *) m, set); 491 _GSS_union_add ((struct GNUNET_SET_ElementMessage *) m, set);
493 break; 492 break;
494 case GNUNET_SET_OPERATION_INTERSECTION: 493 case GNUNET_SET_OPERATION_INTERSECTION:
495 _GSS_intersection_add ((struct GNUNET_SET_ElementMessage *) m, set); 494 //_GSS_intersection_add ((struct GNUNET_SET_ElementMessage *) m, set);
496 break; 495 break;
497 default: 496 default:
498 GNUNET_assert (0); 497 GNUNET_assert (0);
@@ -529,7 +528,7 @@ handle_client_evaluate (void *cls,
529 switch (set->operation) 528 switch (set->operation)
530 { 529 {
531 case GNUNET_SET_OPERATION_INTERSECTION: 530 case GNUNET_SET_OPERATION_INTERSECTION:
532 _GSS_intersection_evaluate ((struct GNUNET_SET_EvaluateMessage *) m, set); 531 //_GSS_intersection_evaluate ((struct GNUNET_SET_EvaluateMessage *) m, set);
533 break; 532 break;
534 case GNUNET_SET_OPERATION_UNION: 533 case GNUNET_SET_OPERATION_UNION:
535 _GSS_union_evaluate ((struct GNUNET_SET_EvaluateMessage *) m, set); 534 _GSS_union_evaluate ((struct GNUNET_SET_EvaluateMessage *) m, set);
@@ -601,7 +600,7 @@ handle_client_accept (void *cls,
601 switch (set->operation) 600 switch (set->operation)
602 { 601 {
603 case GNUNET_SET_OPERATION_INTERSECTION: 602 case GNUNET_SET_OPERATION_INTERSECTION:
604 _GSS_intersection_accept (msg, set, incoming); 603 // _GSS_intersection_accept (msg, set, incoming);
605 break; 604 break;
606 case GNUNET_SET_OPERATION_UNION: 605 case GNUNET_SET_OPERATION_UNION:
607 _GSS_union_accept (msg, set, incoming); 606 _GSS_union_accept (msg, set, incoming);
diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index 66bff4ff1..6f0af0716 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -297,7 +297,6 @@ _GSS_union_operation_destroy (struct UnionEvaluateOperation *eo);
297 * @param cls closure 297 * @param cls closure
298 * @param tunnel mesh tunnel 298 * @param tunnel mesh tunnel
299 * @param tunnel_ctx tunnel context 299 * @param tunnel_ctx tunnel context
300 * @param sender ???
301 * @param mh message to process 300 * @param mh message to process
302 * @return ??? 301 * @return ???
303 */ 302 */
@@ -305,7 +304,6 @@ int
305_GSS_union_handle_p2p_message (void *cls, 304_GSS_union_handle_p2p_message (void *cls,
306 struct GNUNET_MESH_Tunnel *tunnel, 305 struct GNUNET_MESH_Tunnel *tunnel,
307 void **tunnel_ctx, 306 void **tunnel_ctx,
308 const struct GNUNET_PeerIdentity *sender,
309 const struct GNUNET_MessageHeader *mh); 307 const struct GNUNET_MessageHeader *mh);
310 308
311 309
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 2b7a0ccba..294fa3304 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -1355,7 +1355,6 @@ _GSS_union_remove (struct GNUNET_SET_ElementMessage *m, struct Set *set)
1355 * @param cls closure 1355 * @param cls closure
1356 * @param tunnel mesh tunnel 1356 * @param tunnel mesh tunnel
1357 * @param tunnel_ctx tunnel context 1357 * @param tunnel_ctx tunnel context
1358 * @param sender ???
1359 * @param mh message to process 1358 * @param mh message to process
1360 * @return ??? 1359 * @return ???
1361 */ 1360 */
@@ -1363,7 +1362,6 @@ int
1363_GSS_union_handle_p2p_message (void *cls, 1362_GSS_union_handle_p2p_message (void *cls,
1364 struct GNUNET_MESH_Tunnel *tunnel, 1363 struct GNUNET_MESH_Tunnel *tunnel,
1365 void **tunnel_ctx, 1364 void **tunnel_ctx,
1366 const struct GNUNET_PeerIdentity *sender,
1367 const struct GNUNET_MessageHeader *mh) 1365 const struct GNUNET_MessageHeader *mh)
1368{ 1366{
1369 struct TunnelContext *tc = *tunnel_ctx; 1367 struct TunnelContext *tc = *tunnel_ctx;