[GNUnet-SVN] r27591 - gnunet/src/set

[gnunet]

Author: dold
Date: 2013-06-25 15:42:34 +0200 (Tue, 25 Jun 2013)
New Revision: 27591

Modified:
   gnunet/src/set/gnunet-service-set.c
   gnunet/src/set/gnunet-service-set.h
   gnunet/src/set/gnunet-service-set_union.c
Log:
commented out calls to functions not yet implemented


Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2013-06-25 13:38:25 UTC (rev 27590)
+++ gnunet/src/set/gnunet-service-set.c 2013-06-25 13:42:34 UTC (rev 27591)
@@ -257,7 +257,6 @@
 handle_p2p_operation_request (void *cls,
                               struct GNUNET_MESH_Tunnel *tunnel,
                               void **tunnel_ctx,
-                              const struct GNUNET_PeerIdentity *sender,
                               const struct GNUNET_MessageHeader *mh)
 {
   struct TunnelContext *tc = *tunnel_ctx;
@@ -340,7 +339,7 @@
   switch (ntohs (msg->operation))
   {
     case GNUNET_SET_OPERATION_INTERSECTION:
-      set = _GSS_intersection_set_create ();
+      //set = _GSS_intersection_set_create ();
       break;
     case GNUNET_SET_OPERATION_UNION:
       set = _GSS_union_set_create ();
@@ -421,7 +420,7 @@
       _GSS_union_remove ((struct GNUNET_SET_ElementMessage *) m, set);
       break;
     case GNUNET_SET_OPERATION_INTERSECTION:
-      _GSS_intersection_remove ((struct GNUNET_SET_ElementMessage *) m, set);
+      //_GSS_intersection_remove ((struct GNUNET_SET_ElementMessage *) m, set);
       break;
     default:
       GNUNET_assert (0);
@@ -492,7 +491,7 @@
       _GSS_union_add ((struct GNUNET_SET_ElementMessage *) m, set);
       break;
     case GNUNET_SET_OPERATION_INTERSECTION:
-      _GSS_intersection_add ((struct GNUNET_SET_ElementMessage *) m, set);
+      //_GSS_intersection_add ((struct GNUNET_SET_ElementMessage *) m, set);
       break;
     default:
       GNUNET_assert (0);
@@ -529,7 +528,7 @@
   switch (set->operation)
   {
     case GNUNET_SET_OPERATION_INTERSECTION:
-      _GSS_intersection_evaluate ((struct GNUNET_SET_EvaluateMessage *) m, 
set);
+      //_GSS_intersection_evaluate ((struct GNUNET_SET_EvaluateMessage *) m, 
set);
       break;
     case GNUNET_SET_OPERATION_UNION:
       _GSS_union_evaluate ((struct GNUNET_SET_EvaluateMessage *) m, set);
@@ -601,7 +600,7 @@
   switch (set->operation)
   {
     case GNUNET_SET_OPERATION_INTERSECTION:
-      _GSS_intersection_accept (msg, set, incoming);
+      // _GSS_intersection_accept (msg, set, incoming);
       break;
     case GNUNET_SET_OPERATION_UNION:
       _GSS_union_accept (msg, set, incoming);

Modified: gnunet/src/set/gnunet-service-set.h
===================================================================
--- gnunet/src/set/gnunet-service-set.h 2013-06-25 13:38:25 UTC (rev 27590)
+++ gnunet/src/set/gnunet-service-set.h 2013-06-25 13:42:34 UTC (rev 27591)
@@ -297,7 +297,6 @@
  * @param cls closure
  * @param tunnel mesh tunnel
  * @param tunnel_ctx tunnel context
- * @param sender ???
  * @param mh message to process
  * @return ???
  */
@@ -305,7 +304,6 @@
 _GSS_union_handle_p2p_message (void *cls,
                                struct GNUNET_MESH_Tunnel *tunnel,
                                void **tunnel_ctx,
-                               const struct GNUNET_PeerIdentity *sender,
                                const struct GNUNET_MessageHeader *mh);
 
 

Modified: gnunet/src/set/gnunet-service-set_union.c
===================================================================
--- gnunet/src/set/gnunet-service-set_union.c   2013-06-25 13:38:25 UTC (rev 
27590)
+++ gnunet/src/set/gnunet-service-set_union.c   2013-06-25 13:42:34 UTC (rev 
27591)
@@ -1355,7 +1355,6 @@
  * @param cls closure
  * @param tunnel mesh tunnel
  * @param tunnel_ctx tunnel context
- * @param sender ???
  * @param mh message to process
  * @return ???
  */
@@ -1363,7 +1362,6 @@
 _GSS_union_handle_p2p_message (void *cls,
                                struct GNUNET_MESH_Tunnel *tunnel,
                                void **tunnel_ctx,
-                               const struct GNUNET_PeerIdentity *sender,
                                const struct GNUNET_MessageHeader *mh)
 {
   struct TunnelContext *tc = *tunnel_ctx;