[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34019 - gnunet/src/social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34019 - gnunet/src/social |
Date: |
Wed, 23 Jul 2014 18:19:40 +0200 |
Author: tg
Date: 2014-07-23 18:19:40 +0200 (Wed, 23 Jul 2014)
New Revision: 34019
Modified:
gnunet/src/social/social_api.c
Log:
Revert "- persuade social to at least compile"
This reverts commit 4938775bf405d8720ae5adce20bd5d66492e75a2.
Modified: gnunet/src/social/social_api.c
===================================================================
--- gnunet/src/social/social_api.c 2014-07-23 05:47:32 UTC (rev 34018)
+++ gnunet/src/social/social_api.c 2014-07-23 16:19:40 UTC (rev 34019)
@@ -201,23 +201,13 @@
*/
struct GNUNET_SOCIAL_Host *
GNUNET_SOCIAL_host_enter (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const char *place_keyfile,
+ enum GNUNET_PSYC_Policy policy,
struct GNUNET_IDENTITY_Ego *ego,
- const struct GNUNET_CRYPTO_EddsaPrivateKey
*place_key,
- enum GNUNET_PSYC_Policy policy,
struct GNUNET_SOCIAL_Slicer *slicer,
- GNUNET_SOCIAL_HostEnterCallback enter_cb,
- GNUNET_SOCIAL_AnswerDoorCallback answer_door_cb,
+ GNUNET_SOCIAL_AnswerDoorCallback listener_cb,
GNUNET_SOCIAL_FarewellCallback farewell_cb,
void *cls)
-// struct GNUNET_SOCIAL_Host *
-// GNUNET_SOCIAL_host_enter (const struct GNUNET_CONFIGURATION_Handle *cfg,
-// const char *place_keyfile,
-// enum GNUNET_PSYC_Policy policy,
-// struct GNUNET_IDENTITY_Ego *ego,
-// struct GNUNET_SOCIAL_Slicer *slicer,
-// GNUNET_SOCIAL_AnswerDoorCallback listener_cb,
-// GNUNET_SOCIAL_FarewellCallback farewell_cb,
-// void *cls)
{
return NULL;
}
@@ -351,19 +341,12 @@
*
* @return NULL on error (announcement already in progress?).
*/
-// struct GNUNET_SOCIAL_Announcement *
-// GNUNET_SOCIAL_host_announce (struct GNUNET_SOCIAL_Host *host,
-// const char *method_name,
-// const struct GNUNET_ENV_Environment *env,
-// GNUNET_CONNECTION_TransmitReadyNotify notify,
-// void *notify_cls,
-// enum GNUNET_SOCIAL_AnnounceFlags flags)
struct GNUNET_SOCIAL_Announcement *
GNUNET_SOCIAL_host_announce (struct GNUNET_SOCIAL_Host *host,
const char *method_name,
const struct GNUNET_ENV_Environment *env,
- GNUNET_PSYC_TransmitNotifyData notify_data,
- void *notify_data_cls,
+ GNUNET_CONNECTION_TransmitReadyNotify notify,
+ void *notify_cls,
enum GNUNET_SOCIAL_AnnounceFlags flags)
{
return NULL;
@@ -431,30 +414,15 @@
*
* @return NULL on errors, otherwise handle for the guest.
*/
-// struct GNUNET_SOCIAL_Guest *
-// GNUNET_SOCIAL_guest_enter (const struct GNUNET_CONFIGURATION_Handle *cfg,
-// struct GNUNET_IDENTITY_Ego *ego,
-// char *address,
-// const char *method_name,
-// const struct GNUNET_ENV_Environment *env,
-// const void *data,
-// size_t data_size,
-// struct GNUNET_SOCIAL_Slicer *slicer)
struct GNUNET_SOCIAL_Guest *
GNUNET_SOCIAL_guest_enter (const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_IDENTITY_Ego *ego,
- struct GNUNET_CRYPTO_EddsaPublicKey *place_key,
- struct GNUNET_PeerIdentity *origin,
- uint32_t relay_count,
- struct GNUNET_PeerIdentity *relays,
+ char *address,
const char *method_name,
const struct GNUNET_ENV_Environment *env,
const void *data,
size_t data_size,
- struct GNUNET_SOCIAL_Slicer *slicer,
- GNUNET_SOCIAL_GuestEnterCallback local_enter_cb,
- GNUNET_SOCIAL_EntryDecisionCallback
entry_decision_cb,
- void *cls)
+ struct GNUNET_SOCIAL_Slicer *slicer)
{
return NULL;
}
@@ -506,19 +474,12 @@
* @return NULL if we are already trying to talk to the host,
* otherwise handle to cancel the request.
*/
-// struct GNUNET_SOCIAL_TalkRequest *
-// GNUNET_SOCIAL_guest_talk (struct GNUNET_SOCIAL_Place *place,
-// const char *method_name,
-// const struct GNUNET_ENV_Environment *env,
-// GNUNET_CONNECTION_TransmitReadyNotify notify,
-// void *notify_cls,
-// enum GNUNET_SOCIAL_TalkFlags flags)
struct GNUNET_SOCIAL_TalkRequest *
-GNUNET_SOCIAL_guest_talk (struct GNUNET_SOCIAL_Guest *guest,
+GNUNET_SOCIAL_guest_talk (struct GNUNET_SOCIAL_Place *place,
const char *method_name,
const struct GNUNET_ENV_Environment *env,
- GNUNET_PSYC_TransmitNotifyData notify_data,
- void *notify_data_cls,
+ GNUNET_CONNECTION_TransmitReadyNotify notify,
+ void *notify_cls,
enum GNUNET_SOCIAL_TalkFlags flags)
{
return NULL;
@@ -546,8 +507,7 @@
* @param keep_active Keep place active after last application disconnected.
*/
void
-// GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Place *place, int
keep_active)
-GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Guest *guest, int keep_active)
+GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Place *place, int keep_active)
{
}
@@ -563,8 +523,7 @@
* @return Handle for the place, valid as long as @a guest is valid.
*/
struct GNUNET_SOCIAL_Place *
-// GNUNET_SOCIAL_guest_get_place (struct GNUNET_SOCIAL_Host *guest)
-GNUNET_SOCIAL_guest_get_place (struct GNUNET_SOCIAL_Guest *guest)
+GNUNET_SOCIAL_guest_get_place (struct GNUNET_SOCIAL_Host *guest)
{
return NULL;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34019 - gnunet/src/social,
gnunet <=