psyc apis

4 files changed, 144 insertions, 20 deletions

diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index 9573f3e08..da0e09e2f 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -416,10 +416,10 @@ struct GNUNET_MULTICAST_MulticastRequest;
  * @return NULL on error (i.e. request already pending)
  */
 struct GNUNET_MULTICAST_MulticastRequest *
-GNUNET_MULTICAST_origin_send_to_all (struct GNUNET_MULTICAST_Origin *origin,
-                                     size_t size,
-                                     GNUNET_CONNECTION_TransmitReadyNotify cb,
-                                     void *cb_cls);
+GNUNET_MULTICAST_origin_to_all (struct GNUNET_MULTICAST_Origin *origin,
+                                size_t size,
+                                GNUNET_CONNECTION_TransmitReadyNotify cb,
+                                void *cb_cls);
 
 
 /**
@@ -428,7 +428,7 @@ GNUNET_MULTICAST_origin_send_to_all (struct GNUNET_MULTICAST_Origin *origin,
  * @param mr request to cancel
  */
 void
-GNUNET_MULTICAST_origin_send_to_all_cancel (struct GNUNET_MULTICAST_MulticastRequest *mr);
+GNUNET_MULTICAST_origin_to_all_cancel (struct GNUNET_MULTICAST_MulticastRequest *mr);
 
 
 /**
@@ -546,10 +546,10 @@ struct GNUNET_MULTICAST_ResponseRequest;
  * @return handle to cancel request, NULL on error (i.e. request already pending)
  */
 struct GNUNET_MULTICAST_ResponseRequest *
-GNUNET_MULTICAST_member_message_to_origin (struct GNUNET_MULTICAST_Member *member,
-                                           size_t size,
-                                           GNUNET_CONNECTION_TransmitReadyNotify cb,
-                                           void *cb_cls);
+GNUNET_MULTICAST_member_to_origin (struct GNUNET_MULTICAST_Member *member,
+                                   size_t size,
+                                   GNUNET_CONNECTION_TransmitReadyNotify cb,
+                                   void *cb_cls);
 
 
 /**
@@ -558,7 +558,7 @@ GNUNET_MULTICAST_member_message_to_origin (struct GNUNET_MULTICAST_Member *membe
  * @param rr request to cancel
  */
 void
-GNUNET_MULTICAST_member_message_to_origin_cancel (struct GNUNET_MULTICAST_ResponseRequest *rr);
+GNUNET_MULTICAST_member_to_origin_cancel (struct GNUNET_MULTICAST_ResponseRequest *rr);
 
 
 
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index f53c9437f..8116e3d93 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -230,7 +230,7 @@ enum GNUNET_PSYC_Operator
  * values that require streaming must only be passed as the stream
  * arguments to methods.  State updates might not be transmitted to
  * group members until the next call to
- * 'GNUNET_PSYC_channel_broadcast_call_method'.  Variable updates must
+ * 'GNUNET_PSYC_channel_notify_transmit_ready'.  Variable updates must
  * be given just before the call to the respective method that needs
  * the variables.
  *
@@ -366,10 +366,10 @@ GNUNET_PSYC_member_get_group (struct GNUNET_PSYC_Member *member);
  * @param group_generation the generation ID where the change went into effect
  */
 void
-GNUNET_PSYC_group_member_admit (struct GNUNET_PSYC_Group *group,
-                                const struct GNUNET_PeerIdentity *member,
-                                uint64_t message_id,
-                                uint64_t group_generation);
+GNUNET_PSYC_group_member_add (struct GNUNET_PSYC_Group *group,
+                              const struct GNUNET_PeerIdentity *member,
+                              uint64_t message_id,
+                              uint64_t group_generation);
 
 
 /**
@@ -393,10 +393,10 @@ GNUNET_PSYC_group_member_admit (struct GNUNET_PSYC_Group *group,
  * @param group_generation the generation ID where the change went into effect
  */
 void
-GNUNET_PSYC_group_member_kick (struct GNUNET_PSYC_Group *group,
-                               const struct GNUNET_PeerIdentity *member,
-                               uint64_t message_id,
-                               uint64_t group_generation);
+GNUNET_PSYC_group_member_remove (struct GNUNET_PSYC_Group *group,
+                                 const struct GNUNET_PeerIdentity *member,
+                                 uint64_t message_id,
+                                 uint64_t group_generation);
 
 
 /**
@@ -507,7 +507,7 @@ struct GNUNET_PSYC_OriginTransmitHandle;
 
 
 /**
- * Request a message to be send to the channel host.
+ * Request a message to be sent to the channel origin.
  *
  * @param member membership handle
  * @param method_name which (PSYC) method should be invoked (on host)
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h
new file mode 100644
index 000000000..07013c9a3
--- /dev/null
+++ b/src/include/gnunet_psycstore_service.h
@@ -0,0 +1,59 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file include/gnunet_psycstore_service.h
+ * @brief PSYCstore service; implements persistent storage for the PSYC service
+ * @author tg
+ */
+#ifndef GNUNET_PSYCSTORE_SERVICE_H
+#define GNUNET_PSYCSTORE_SERVICE_H
+
+#ifdef __cplusplus
+extern "C"
+{no
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+#include "gnunet_util_lib.h"
+
+/**
+ * Version number of GNUnet PSYCstore API.
+ */
+#define GNUNET_PSYCSTORE_VERSION 0x00000000
+
+/**
+ * Handle for a PSYCstore
+ */
+struct GNUNET_PSYCSTORE_Handle;
+
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+/* ifndef GNUNET_SOCIAL_SERVICE_H */
+#endif
+/* end of gnunet_social_service.h */
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
new file mode 100644
index 000000000..366bc0f4f
--- /dev/null
+++ b/src/include/gnunet_social_service.h
@@ -0,0 +1,65 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file include/gnunet_social_service.h
+ * @brief Social service; implements social functionality using the PSYC service
+ * @author tg
+ */
+#ifndef GNUNET_SOCIAL_SERVICE_H
+#define GNUNET_SOCIAL_SERVICE_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+#include "gnunet_util_lib.h"
+#include "gnunet_psyc_service.h"
+
+/**
+ * Version number of GNUnet Social API.
+ */
+#define GNUNET_SOCIAL_VERSION 0x00000000
+
+/**
+ * Handle for a social channel
+ */
+struct GNUNET_SOCIAL_Channel;
+
+/**
+ * Handle for a social client
+ */
+struct GNUNET_SOCIAL_Client;
+
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+/* ifndef GNUNET_SOCIAL_SERVICE_H */
+#endif
+/* end of gnunet_social_service.h */