diff options
author | Gabor X Toth <*@tg-x.net> | 2014-07-23 16:19:40 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2014-07-23 16:19:40 +0000 |
commit | 6ec85aa550fe93bfc208c54a1b83102314ecf509 (patch) | |
tree | ecb67e74baa7a218e6317b3c0eb316372e2c94a6 /src/social | |
parent | 75948ef7deea69d6025ff4f7c33b59c144c77ad5 (diff) | |
download | gnunet-6ec85aa550fe93bfc208c54a1b83102314ecf509.tar.gz gnunet-6ec85aa550fe93bfc208c54a1b83102314ecf509.zip |
Revert "- persuade social to at least compile"
This reverts commit 4938775bf405d8720ae5adce20bd5d66492e75a2.
Diffstat (limited to 'src/social')
-rw-r--r-- | src/social/social_api.c | 65 |
1 files changed, 12 insertions, 53 deletions
diff --git a/src/social/social_api.c b/src/social/social_api.c index eb3a6d205..ee13c7d61 100644 --- a/src/social/social_api.c +++ b/src/social/social_api.c | |||
@@ -201,23 +201,13 @@ GNUNET_SOCIAL_slicer_destroy (struct GNUNET_SOCIAL_Slicer *slicer) | |||
201 | */ | 201 | */ |
202 | struct GNUNET_SOCIAL_Host * | 202 | struct GNUNET_SOCIAL_Host * |
203 | GNUNET_SOCIAL_host_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | 203 | GNUNET_SOCIAL_host_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, |
204 | struct GNUNET_IDENTITY_Ego *ego, | 204 | const char *place_keyfile, |
205 | const struct GNUNET_CRYPTO_EddsaPrivateKey *place_key, | ||
206 | enum GNUNET_PSYC_Policy policy, | 205 | enum GNUNET_PSYC_Policy policy, |
206 | struct GNUNET_IDENTITY_Ego *ego, | ||
207 | struct GNUNET_SOCIAL_Slicer *slicer, | 207 | struct GNUNET_SOCIAL_Slicer *slicer, |
208 | GNUNET_SOCIAL_HostEnterCallback enter_cb, | 208 | GNUNET_SOCIAL_AnswerDoorCallback listener_cb, |
209 | GNUNET_SOCIAL_AnswerDoorCallback answer_door_cb, | ||
210 | GNUNET_SOCIAL_FarewellCallback farewell_cb, | 209 | GNUNET_SOCIAL_FarewellCallback farewell_cb, |
211 | void *cls) | 210 | void *cls) |
212 | // struct GNUNET_SOCIAL_Host * | ||
213 | // GNUNET_SOCIAL_host_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
214 | // const char *place_keyfile, | ||
215 | // enum GNUNET_PSYC_Policy policy, | ||
216 | // struct GNUNET_IDENTITY_Ego *ego, | ||
217 | // struct GNUNET_SOCIAL_Slicer *slicer, | ||
218 | // GNUNET_SOCIAL_AnswerDoorCallback listener_cb, | ||
219 | // GNUNET_SOCIAL_FarewellCallback farewell_cb, | ||
220 | // void *cls) | ||
221 | { | 211 | { |
222 | return NULL; | 212 | return NULL; |
223 | } | 213 | } |
@@ -351,19 +341,12 @@ GNUNET_SOCIAL_host_advertise (struct GNUNET_SOCIAL_Host *host, | |||
351 | * | 341 | * |
352 | * @return NULL on error (announcement already in progress?). | 342 | * @return NULL on error (announcement already in progress?). |
353 | */ | 343 | */ |
354 | // struct GNUNET_SOCIAL_Announcement * | ||
355 | // GNUNET_SOCIAL_host_announce (struct GNUNET_SOCIAL_Host *host, | ||
356 | // const char *method_name, | ||
357 | // const struct GNUNET_ENV_Environment *env, | ||
358 | // GNUNET_CONNECTION_TransmitReadyNotify notify, | ||
359 | // void *notify_cls, | ||
360 | // enum GNUNET_SOCIAL_AnnounceFlags flags) | ||
361 | struct GNUNET_SOCIAL_Announcement * | 344 | struct GNUNET_SOCIAL_Announcement * |
362 | GNUNET_SOCIAL_host_announce (struct GNUNET_SOCIAL_Host *host, | 345 | GNUNET_SOCIAL_host_announce (struct GNUNET_SOCIAL_Host *host, |
363 | const char *method_name, | 346 | const char *method_name, |
364 | const struct GNUNET_ENV_Environment *env, | 347 | const struct GNUNET_ENV_Environment *env, |
365 | GNUNET_PSYC_TransmitNotifyData notify_data, | 348 | GNUNET_CONNECTION_TransmitReadyNotify notify, |
366 | void *notify_data_cls, | 349 | void *notify_cls, |
367 | enum GNUNET_SOCIAL_AnnounceFlags flags) | 350 | enum GNUNET_SOCIAL_AnnounceFlags flags) |
368 | { | 351 | { |
369 | return NULL; | 352 | return NULL; |
@@ -431,30 +414,15 @@ GNUNET_SOCIAL_host_leave (struct GNUNET_SOCIAL_Host *host, int keep_active) | |||
431 | * | 414 | * |
432 | * @return NULL on errors, otherwise handle for the guest. | 415 | * @return NULL on errors, otherwise handle for the guest. |
433 | */ | 416 | */ |
434 | // struct GNUNET_SOCIAL_Guest * | ||
435 | // GNUNET_SOCIAL_guest_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
436 | // struct GNUNET_IDENTITY_Ego *ego, | ||
437 | // char *address, | ||
438 | // const char *method_name, | ||
439 | // const struct GNUNET_ENV_Environment *env, | ||
440 | // const void *data, | ||
441 | // size_t data_size, | ||
442 | // struct GNUNET_SOCIAL_Slicer *slicer) | ||
443 | struct GNUNET_SOCIAL_Guest * | 417 | struct GNUNET_SOCIAL_Guest * |
444 | GNUNET_SOCIAL_guest_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | 418 | GNUNET_SOCIAL_guest_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, |
445 | struct GNUNET_IDENTITY_Ego *ego, | 419 | struct GNUNET_IDENTITY_Ego *ego, |
446 | struct GNUNET_CRYPTO_EddsaPublicKey *place_key, | 420 | char *address, |
447 | struct GNUNET_PeerIdentity *origin, | ||
448 | uint32_t relay_count, | ||
449 | struct GNUNET_PeerIdentity *relays, | ||
450 | const char *method_name, | 421 | const char *method_name, |
451 | const struct GNUNET_ENV_Environment *env, | 422 | const struct GNUNET_ENV_Environment *env, |
452 | const void *data, | 423 | const void *data, |
453 | size_t data_size, | 424 | size_t data_size, |
454 | struct GNUNET_SOCIAL_Slicer *slicer, | 425 | struct GNUNET_SOCIAL_Slicer *slicer) |
455 | GNUNET_SOCIAL_GuestEnterCallback local_enter_cb, | ||
456 | GNUNET_SOCIAL_EntryDecisionCallback entry_decision_cb, | ||
457 | void *cls) | ||
458 | { | 426 | { |
459 | return NULL; | 427 | return NULL; |
460 | } | 428 | } |
@@ -506,19 +474,12 @@ GNUNET_SOCIAL_guest_enter2 (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
506 | * @return NULL if we are already trying to talk to the host, | 474 | * @return NULL if we are already trying to talk to the host, |
507 | * otherwise handle to cancel the request. | 475 | * otherwise handle to cancel the request. |
508 | */ | 476 | */ |
509 | // struct GNUNET_SOCIAL_TalkRequest * | ||
510 | // GNUNET_SOCIAL_guest_talk (struct GNUNET_SOCIAL_Place *place, | ||
511 | // const char *method_name, | ||
512 | // const struct GNUNET_ENV_Environment *env, | ||
513 | // GNUNET_CONNECTION_TransmitReadyNotify notify, | ||
514 | // void *notify_cls, | ||
515 | // enum GNUNET_SOCIAL_TalkFlags flags) | ||
516 | struct GNUNET_SOCIAL_TalkRequest * | 477 | struct GNUNET_SOCIAL_TalkRequest * |
517 | GNUNET_SOCIAL_guest_talk (struct GNUNET_SOCIAL_Guest *guest, | 478 | GNUNET_SOCIAL_guest_talk (struct GNUNET_SOCIAL_Place *place, |
518 | const char *method_name, | 479 | const char *method_name, |
519 | const struct GNUNET_ENV_Environment *env, | 480 | const struct GNUNET_ENV_Environment *env, |
520 | GNUNET_PSYC_TransmitNotifyData notify_data, | 481 | GNUNET_CONNECTION_TransmitReadyNotify notify, |
521 | void *notify_data_cls, | 482 | void *notify_cls, |
522 | enum GNUNET_SOCIAL_TalkFlags flags) | 483 | enum GNUNET_SOCIAL_TalkFlags flags) |
523 | { | 484 | { |
524 | return NULL; | 485 | return NULL; |
@@ -546,8 +507,7 @@ GNUNET_SOCIAL_guest_talk_cancel (struct GNUNET_SOCIAL_TalkRequest *tr) | |||
546 | * @param keep_active Keep place active after last application disconnected. | 507 | * @param keep_active Keep place active after last application disconnected. |
547 | */ | 508 | */ |
548 | void | 509 | void |
549 | // GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Place *place, int keep_active) | 510 | GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Place *place, int keep_active) |
550 | GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Guest *guest, int keep_active) | ||
551 | { | 511 | { |
552 | 512 | ||
553 | } | 513 | } |
@@ -563,8 +523,7 @@ GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Guest *guest, int keep_active) | |||
563 | * @return Handle for the place, valid as long as @a guest is valid. | 523 | * @return Handle for the place, valid as long as @a guest is valid. |
564 | */ | 524 | */ |
565 | struct GNUNET_SOCIAL_Place * | 525 | struct GNUNET_SOCIAL_Place * |
566 | // GNUNET_SOCIAL_guest_get_place (struct GNUNET_SOCIAL_Host *guest) | 526 | GNUNET_SOCIAL_guest_get_place (struct GNUNET_SOCIAL_Host *guest) |
567 | GNUNET_SOCIAL_guest_get_place (struct GNUNET_SOCIAL_Guest *guest) | ||
568 | { | 527 | { |
569 | return NULL; | 528 | return NULL; |
570 | } | 529 | } |