cleaning up set handlers, eliminating 2nd level demultiplexing and improving use of types

1 files changed, 31 insertions, 19 deletions

diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index 68d8fe81f..c981430ef 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -213,20 +213,6 @@ typedef void
 
 
 /**
- * Signature of functions that implement the message handling for
- * the different set operations.
- *
- * @param op operation state
- * @param msg received message
- * @return #GNUNET_OK on success, #GNUNET_SYSERR to
- *         destroy the operation and the tunnel
- */
-typedef int
-(*MsgHandlerImpl) (struct Operation *op,
-                   const struct GNUNET_MessageHeader *msg);
-
-
-/**
  * Signature of functions that implement operation cancellation
  *
  * @param op operation state
@@ -276,11 +262,6 @@ struct SetVT
   DestroySetImpl destroy_set;
 
   /**
-   * Callback for handling operation-specific messages.
-   */
-  MsgHandlerImpl msg_handler;
-
-  /**
    * Callback for handling the remote peer's disconnect.
    */
   PeerDisconnectImpl peer_disconnect;
@@ -364,6 +345,27 @@ struct Listener;
 
 
 /**
+ * Possible set operations.
+ */
+enum OperationType {
+  /**
+   * Operation type unknown.
+   */
+  OT_UNKNOWN = 0,
+
+  /**
+   * We are performing a union.
+   */
+  OT_UNION,
+
+  /**
+   * We are performing an intersection.
+   */
+  OT_INTERSECTION
+};
+
+
+/**
  * Operation context used to execute a set operation.
  */
 struct Operation
@@ -427,6 +429,11 @@ struct Operation
   struct GNUNET_SCHEDULER_Task *timeout_task;
 
   /**
+   * What type of operation is this?
+   */
+  enum OperationType type;
+
+  /**
    * Unique request id for the request from a remote peer, sent to the
    * client, which will accept or reject the request.  Set to '0' iff
    * the request has not been suggested yet.
@@ -582,6 +589,11 @@ struct Set
   struct Operation *ops_tail;
 
   /**
+   * What type of operation is this set for?
+   */
+  enum OperationType type;
+
+  /**
    * Current generation, that is, number of previously executed
    * operations and lazy copies on the underlying set content.
    */