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