add social service

1 files changed, 16 insertions, 11 deletions

diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index 98ad88346..ba698aee6 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -36,9 +36,9 @@ extern "C"
 #endif
 
 #include "gnunet_util_lib.h"
-#include "gnunet_psyc_lib.h"
+#include "gnunet_env_lib.h"
+#include "gnunet_identity_service.h"
 #include "gnunet_psyc_service.h"
-#include "gnunet_multicast_service.h"
 
 
 /**
@@ -94,7 +94,7 @@ typedef int
                          const char *full_method_name,
                          uint64_t message_id,
                          size_t modifier_count,
-                         GNUNET_PSYC_Modifier *modifiers,
+                         struct GNUNET_ENV_Modifier *modifiers,
                          uint64_t data_offset,
                          const void *data,
                          size_t data_size,
@@ -173,7 +173,7 @@ typedef void
                                      struct GNUNET_SOCIAL_Nym *nym,
                                      size_t variable_count,
                                      const char *method_name,
-                                     GNUNET_PSYC_Modifier *variables,
+                                     struct GNUNET_ENV_Modifier *variables,
                                      const void *data,
                                      size_t data_size);
 
@@ -193,7 +193,7 @@ typedef void
 (*GNUNET_SOCIAL_FarewellCallback) (void *cls,
                                    struct GNUNET_SOCIAL_Nym *nym,
                                    size_t variable_count,
-                                   GNUNET_PSYC_Modifier *variables);
+                                   struct GNUNET_ENV_Modifier *variables);
 
 
 /**
@@ -313,22 +313,24 @@ GNUNET_SOCIAL_home_advertise (struct GNUNET_SOCIAL_Home *home,
                               const char *name,
                               size_t peer_count,
                               const struct GNUNET_PeerIdentity *peers,
-                              GNUNET_TIME_Relative expiration_time,
+                              struct GNUNET_TIME_Relative expiration_time,
                               const char *password);
 
 
 /**
  * Flags for announcements in a home.
  */
-enum GNUNET_PSYC_AnnouncementFlags
+enum GNUNET_SOCIAL_AnnounceFlags
 {
+  GNUNET_SOCIAL_ANNOUNCE_NONE = 0,
+
   /**
    * Whether this announcement removes all objects from the home.
    *
    * New objects can be still added to the now empty home using the @e env
    * parameter of the same announcement.
    */
-  GNUNET_SOCIAL_ANNOUNCEMENT_CLEAR_OBJECTS = 1 << 0
+  GNUNET_SOCIAL_ANNOUNCE_CLEAR_OBJECTS = 1 << 0
 };
 
 
@@ -359,7 +361,7 @@ GNUNET_SOCIAL_home_announce (struct GNUNET_SOCIAL_Home *home,
                              const struct GNUNET_ENV_Environment *env,
                              GNUNET_CONNECTION_TransmitReadyNotify notify,
                              void *notify_cls,
-                             GNUNET_SOCIAL_AnnouncementFlags flags);
+                             enum GNUNET_SOCIAL_AnnounceFlags flags);
 
 
 /**
@@ -529,7 +531,10 @@ GNUNET_SOCIAL_place_look_at (struct GNUNET_SOCIAL_Place *place,
 /**
  * Flags for talking to the host of a place.
  */
-enum GNUNET_SOCIAL_TalkFlags;
+enum GNUNET_SOCIAL_TalkFlags
+{
+  GNUNET_SOCIAL_TALK_NONE = 0
+};
 
 
 /**
@@ -555,7 +560,7 @@ GNUNET_SOCIAL_place_talk (struct GNUNET_SOCIAL_Place *place,
                           const struct GNUNET_ENV_Environment *env,
                           GNUNET_CONNECTION_TransmitReadyNotify notify,
                           void *notify_cls,
-                          GNUNET_SOCIAL_TalkFlags flags);
+                          enum GNUNET_SOCIAL_TalkFlags flags);
 
 
 /**