3 files changed, 92 insertions, 16 deletions

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 0251c57fe..7c63f60a3 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2646,8 +2646,11 @@ extern "C"
 /** S->C: notify about an existing place */
 #define GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE 854
 
-/** S->C:  */
-#define GNUNET_MESSAGE_TYPE_SOCIAL_HOST_RELAY 855
+/** C->S: set message processing flags */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_SET 860
+
+/** C->S: clear message processing flags */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_CLEAR 860
 
 /*******************************************************************************
  * X-VINE DHT messages
diff --git a/src/include/gnunet_psyc_slicer.h b/src/include/gnunet_psyc_slicer.h
index 1851a6002..077c0c5bd 100644
--- a/src/include/gnunet_psyc_slicer.h
+++ b/src/include/gnunet_psyc_slicer.h
@@ -250,9 +250,9 @@ GNUNET_PSYC_slicer_method_remove (struct GNUNET_PSYC_Slicer *slicer,
  */
 void
 GNUNET_PSYC_slicer_modifier_add (struct GNUNET_PSYC_Slicer *slicer,
-                                   const char *object_filter,
-                                   GNUNET_PSYC_ModifierCallback modifier_cb,
-                                   void *cls);
+                                 const char *object_filter,
+                                 GNUNET_PSYC_ModifierCallback modifier_cb,
+                                 void *cls);
 
 
 /**
@@ -270,30 +270,75 @@ GNUNET_PSYC_slicer_modifier_add (struct GNUNET_PSYC_Slicer *slicer,
  */
 int
 GNUNET_PSYC_slicer_modifier_remove (struct GNUNET_PSYC_Slicer *slicer,
-                                      const char *object_filter,
-                                      GNUNET_PSYC_ModifierCallback modifier_cb);
+                                    const char *object_filter,
+                                    GNUNET_PSYC_ModifierCallback modifier_cb);
+
+
+/**
+ * Process an incoming message and call matching handlers.
+ *
+ * @param slicer
+ *        The slicer to use.
+ * @param msg
+ *        The message as it arrived from the network.
+ */
+void
+GNUNET_PSYC_slicer_message (struct GNUNET_PSYC_Slicer *slicer,
+                            const struct GNUNET_PSYC_MessageHeader *msg);
 
 
 /**
  * Process an incoming message part and call matching handlers.
  *
- * @param cls
- *        Closure.
+ * @param slicer
+ *        The slicer to use.
  * @param message_id
  *        ID of the message.
  * @param flags
  *        Flags for the message.
  *        @see enum GNUNET_PSYC_MessageFlags
+ * @param fragment offset
+ *        Fragment offset of the message.
  * @param msg
- *        The message part. as it arrived from the network.
+ *        The message part as it arrived from the network.
+ */
+void
+GNUNET_PSYC_slicer_message_part (struct GNUNET_PSYC_Slicer *slicer,
+                                 const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_pub_key,
+                                 uint64_t message_id,
+                                 uint32_t flags,
+                                 uint64_t fragment_offset,
+                                 const struct GNUNET_MessageHeader *msg);
+
+
+/**
+ * Remove all registered method handlers.
+ *
+ * @param slicer
+ *        Slicer to clear.
+ */
+void
+GNUNET_PSYC_slicer_method_clear (struct GNUNET_PSYC_Slicer *slicer);
+
+
+/**
+ * Remove all registered modifier handlers.
+ *
+ * @param slicer
+ *        Slicer to clear.
+ */
+void
+GNUNET_PSYC_slicer_modifier_clear (struct GNUNET_PSYC_Slicer *slicer);
+
+
+/**
+ * Remove all registered method & modifier handlers.
+ *
+ * @param slicer
+ *        Slicer to clear.
  */
 void
-GNUNET_PSYC_slicer_message (void *cls,
-                            const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_pub_key,
-                            uint64_t message_id,
-                            uint32_t flags,
-                            uint64_t fragment_offset,
-                            const struct GNUNET_MessageHeader *msg);
+GNUNET_PSYC_slicer_clear (struct GNUNET_PSYC_Slicer *slicer);
 
 
 /**
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index 4ad6036a9..75038407b 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -232,6 +232,12 @@ extern "C"
  */
 #define GNUNET_SOCIAL_APP_MAX_ID_SIZE 256
 
+enum GNUNET_SOCIAL_MsgProcFlags {
+  GNUNET_SOCIAL_MSG_PROC_NONE = 0,
+  GNUNET_SOCIAL_MSG_PROC_RELAY = 1,
+  GNUNET_SOCIAL_MSG_PROC_SAVE= 2,
+};
+
 /**
  * Handle for an application.
  */
@@ -1063,6 +1069,28 @@ struct GNUNET_SOCIAL_HistoryRequest;
 
 
 /**
+ * Set message processing @a flags for a @a method_prefix.
+ *
+ * @param plc
+ *        Place.
+ * @param method_prefix
+ *        Method prefix @a flags apply to.
+ * @param flags
+ *        The flags that apply to a matching @a method_prefix.
+ */
+void
+GNUNET_SOCIAL_place_msg_proc_set (struct GNUNET_SOCIAL_Place *plc,
+                                  const char *method_prefix,
+                                  enum GNUNET_SOCIAL_MsgProcFlags flags);
+
+/**
+ * Clear all message processing flags previously set for this place.
+ */
+void
+GNUNET_SOCIAL_place_msg_proc_clear (struct GNUNET_SOCIAL_Place *plc);
+
+
+/**
  * Learn about the history of a place.
  *
  * Messages are returned through the @a slicer function