set api changes

4 files changed, 51 insertions, 9 deletions

diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index 1000aea7b..f9ae122b4 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -99,10 +99,33 @@ enum GNUNET_SET_Status
    * Everything went ok, we are transmitting an element of the
    * result (in set, or to be removed from set, depending on
    * the `enum GNUNET_SET_ResultMode`).
+   *
+   * Only applies to
+   * #GNUNET_SET_RESULT_FULL,
+   * #GNUNET_SET_RESULT_ADDED,
+   * #GNUNET_SET_RESULT_REMOVED,
    */
   GNUNET_SET_STATUS_OK,
 
   /**
+   * Element should be added to the result set
+   * of the local peer, i.e. the local peer is
+   * missing an element.
+   *
+   * Only applies to #GNUNET_SET_RESULT_SYMMETRIC
+   */
+  GNUNET_SET_STATUS_ADD_LOCAL,
+
+  /**
+   * Element should be added to the result set
+   * of the remove peer, i.e. the remote peer is
+   * missing an element.
+   *
+   * Only applies to #GNUNET_SET_RESULT_SYMMETRIC
+   */
+  GNUNET_SET_STATUS_ADD_REMOTE,
+
+  /**
    * The other peer refused to to the operation with us,
    * or something went wrong.
    */
@@ -129,20 +152,32 @@ enum GNUNET_SET_ResultMode
 {
   /**
    * Client gets every element in the resulting set.
+   *
+   * Only supported for set intersection.
    */
   GNUNET_SET_RESULT_FULL,
 
   /**
-   * Client gets only elements that have been added to the set.
-   * Only works with set union.
+   * Client gets notified of the required changes
+   * for both the local and the remote set.
+   *
+   * Only supported for set 
+   */
+  GNUNET_SET_RESULT_SYMMETRIC,
+
+  /**
+   * Client gets only elements that have been removed from the set.
+   *
+   * Only supported for set intersection.
    */
-  GNUNET_SET_RESULT_ADDED,
+  GNUNET_SET_RESULT_REMOVED,
 
   /**
    * Client gets only elements that have been removed from the set.
-   * Only works with set intersection.
+   *
+   * Only supported for set union.
    */
-  GNUNET_SET_RESULT_REMOVED
+  GNUNET_SET_RESULT_ADDED
 };
 
 
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 5975ef19f..5b452cae1 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -1003,7 +1003,12 @@ send_client_element (struct Operation *op,
     GNUNET_break (0);
     return;
   }
-  rm->result_status = htons (GNUNET_SET_STATUS_OK);
+
+  if (GNUNET_SET_RESULT_ADDED == op->spec->result_mode)
+    rm->result_status = htons (GNUNET_SET_STATUS_OK);
+  else if (GNUNET_SET_RESULT_SYMMETRIC == op->spec->result_mode)
+    rm->result_status = htons (GNUNET_SET_STATUS_ADD_LOCAL);
+
   rm->request_id = htonl (op->spec->client_request_id);
   rm->element_type = element->element_type;
   memcpy (&rm[1], element->data, element->size);
@@ -1167,7 +1172,7 @@ handle_p2p_elements (void *cls,
 
   op_register_element (op, ee);
   /* only send results immediately if the client wants it */
-  if (GNUNET_SET_RESULT_ADDED == op->spec->result_mode)
+  if (GNUNET_SET_RESULT_FULL != op->spec->result_mode)
     send_client_element (op, &ee->element);
 }
 
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c
index 286cc6fb3..1569c29b7 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/set/gnunet-set-profiler.c
@@ -150,7 +150,7 @@ set_listen_cb (void *cls,
   GNUNET_assert (NULL == info2.oh);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "set listen cb called\n");
-  info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED,
+  info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_SYMMETRIC,
                                set_result_cb, &info2);
   GNUNET_SET_commit (info2.oh, info2.set);
 }
@@ -273,7 +273,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                     &app_id, set_listen_cb, NULL);
 
   info1.oh = GNUNET_SET_prepare (&local_peer, &app_id, NULL,
-                                 GNUNET_SET_RESULT_ADDED,
+                                 GNUNET_SET_RESULT_SYMMETRIC,
                                  set_result_cb, &info1);
   GNUNET_SET_commit (info1.oh, info1.set);
   GNUNET_SET_destroy (info1.set);
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 920571a01..51a494d7f 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -417,6 +417,8 @@ handle_result (void *cls,
     switch (result_status)
     {
     case GNUNET_SET_STATUS_OK:
+    case GNUNET_SET_STATUS_ADD_LOCAL:
+    case GNUNET_SET_STATUS_ADD_REMOTE:
       break;
     case GNUNET_SET_STATUS_FAILURE:
       oh->result_cb = NULL;