diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_env_lib.h | 3 | ||||
-rw-r--r-- | src/include/gnunet_protocols.h | 40 | ||||
-rw-r--r-- | src/include/gnunet_social_service.h | 27 |
3 files changed, 52 insertions, 18 deletions
diff --git a/src/include/gnunet_env_lib.h b/src/include/gnunet_env_lib.h index 8ff37b7a7..5d1d013a3 100644 --- a/src/include/gnunet_env_lib.h +++ b/src/include/gnunet_env_lib.h | |||
@@ -93,7 +93,8 @@ enum GNUNET_ENV_Type | |||
93 | /** | 93 | /** |
94 | * PSYC state modifier. | 94 | * PSYC state modifier. |
95 | */ | 95 | */ |
96 | struct GNUNET_ENV_Modifier { | 96 | struct GNUNET_ENV_Modifier |
97 | { | ||
97 | /** | 98 | /** |
98 | * State operation. | 99 | * State operation. |
99 | */ | 100 | */ |
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index fba99ff43..855ee0703 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -2171,13 +2171,13 @@ extern "C" | |||
2171 | /** S->C: result of an operation */ | 2171 | /** S->C: result of an operation */ |
2172 | #define GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE 680 | 2172 | #define GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE 680 |
2173 | 2173 | ||
2174 | /** C->S: request to start a master */ | 2174 | /** C->S: request to start a channel as a master */ |
2175 | #define GNUNET_MESSAGE_TYPE_PSYC_MASTER_START 681 | 2175 | #define GNUNET_MESSAGE_TYPE_PSYC_MASTER_START 681 |
2176 | 2176 | ||
2177 | /** S->C: master start acknowledgement */ | 2177 | /** S->C: master start acknowledgement */ |
2178 | #define GNUNET_MESSAGE_TYPE_PSYC_MASTER_START_ACK 682 | 2178 | #define GNUNET_MESSAGE_TYPE_PSYC_MASTER_START_ACK 682 |
2179 | 2179 | ||
2180 | /** C->S: request to start a master */ | 2180 | /** C->S: request to join a channel as a slave */ |
2181 | #define GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN 683 | 2181 | #define GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN 683 |
2182 | 2182 | ||
2183 | /** S->C: slave join acknowledgement */ | 2183 | /** S->C: slave join acknowledgement */ |
@@ -2489,14 +2489,42 @@ extern "C" | |||
2489 | #define GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_END 825 | 2489 | #define GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_END 825 |
2490 | 2490 | ||
2491 | 2491 | ||
2492 | /** | ||
2493 | * Next available: 840 | ||
2494 | */ | ||
2495 | |||
2496 | /******************************************************************************* | 2492 | /******************************************************************************* |
2497 | * SOCIAL message types | 2493 | * SOCIAL message types |
2498 | ******************************************************************************/ | 2494 | ******************************************************************************/ |
2499 | 2495 | ||
2496 | /** | ||
2497 | * C: client | ||
2498 | * S: service | ||
2499 | * P: PSYC | ||
2500 | */ | ||
2501 | |||
2502 | /** S->C: result of an operation */ | ||
2503 | #define GNUNET_MESSAGE_TYPE_SOCIAL_RESULT_CODE 840 | ||
2504 | |||
2505 | /** C->S: request to enter a home as the host */ | ||
2506 | #define GNUNET_MESSAGE_TYPE_SOCIAL_HOME_ENTER 841 | ||
2507 | |||
2508 | /** S->C: home enter acknowledgement */ | ||
2509 | #define GNUNET_MESSAGE_TYPE_SOCIAL_HOME_ENTER_ACK 842 | ||
2510 | |||
2511 | /** C->S: request to enter a place as a guest */ | ||
2512 | #define GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_ENTER 843 | ||
2513 | |||
2514 | /** S->C: guest join acknowledgement */ | ||
2515 | #define GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_ENTER_ACK 844 | ||
2516 | |||
2517 | /** P->S->C: incoming join request from PSYC */ | ||
2518 | #define GNUNET_MESSAGE_TYPE_SOCIAL_JOIN_REQUEST 847 | ||
2519 | |||
2520 | /** C->S->P: decision about a join request */ | ||
2521 | #define GNUNET_MESSAGE_TYPE_SOCIAL_JOIN_DECISION 848 | ||
2522 | |||
2523 | |||
2524 | /** | ||
2525 | * Next available: 880 | ||
2526 | */ | ||
2527 | |||
2500 | 2528 | ||
2501 | /** | 2529 | /** |
2502 | * Type used to match 'all' message types. | 2530 | * Type used to match 'all' message types. |
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" | |||
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #include "gnunet_util_lib.h" | 38 | #include "gnunet_util_lib.h" |
39 | #include "gnunet_psyc_lib.h" | 39 | #include "gnunet_env_lib.h" |
40 | #include "gnunet_identity_service.h" | ||
40 | #include "gnunet_psyc_service.h" | 41 | #include "gnunet_psyc_service.h" |
41 | #include "gnunet_multicast_service.h" | ||
42 | 42 | ||
43 | 43 | ||
44 | /** | 44 | /** |
@@ -94,7 +94,7 @@ typedef int | |||
94 | const char *full_method_name, | 94 | const char *full_method_name, |
95 | uint64_t message_id, | 95 | uint64_t message_id, |
96 | size_t modifier_count, | 96 | size_t modifier_count, |
97 | GNUNET_PSYC_Modifier *modifiers, | 97 | struct GNUNET_ENV_Modifier *modifiers, |
98 | uint64_t data_offset, | 98 | uint64_t data_offset, |
99 | const void *data, | 99 | const void *data, |
100 | size_t data_size, | 100 | size_t data_size, |
@@ -173,7 +173,7 @@ typedef void | |||
173 | struct GNUNET_SOCIAL_Nym *nym, | 173 | struct GNUNET_SOCIAL_Nym *nym, |
174 | size_t variable_count, | 174 | size_t variable_count, |
175 | const char *method_name, | 175 | const char *method_name, |
176 | GNUNET_PSYC_Modifier *variables, | 176 | struct GNUNET_ENV_Modifier *variables, |
177 | const void *data, | 177 | const void *data, |
178 | size_t data_size); | 178 | size_t data_size); |
179 | 179 | ||
@@ -193,7 +193,7 @@ typedef void | |||
193 | (*GNUNET_SOCIAL_FarewellCallback) (void *cls, | 193 | (*GNUNET_SOCIAL_FarewellCallback) (void *cls, |
194 | struct GNUNET_SOCIAL_Nym *nym, | 194 | struct GNUNET_SOCIAL_Nym *nym, |
195 | size_t variable_count, | 195 | size_t variable_count, |
196 | GNUNET_PSYC_Modifier *variables); | 196 | struct GNUNET_ENV_Modifier *variables); |
197 | 197 | ||
198 | 198 | ||
199 | /** | 199 | /** |
@@ -313,22 +313,24 @@ GNUNET_SOCIAL_home_advertise (struct GNUNET_SOCIAL_Home *home, | |||
313 | const char *name, | 313 | const char *name, |
314 | size_t peer_count, | 314 | size_t peer_count, |
315 | const struct GNUNET_PeerIdentity *peers, | 315 | const struct GNUNET_PeerIdentity *peers, |
316 | GNUNET_TIME_Relative expiration_time, | 316 | struct GNUNET_TIME_Relative expiration_time, |
317 | const char *password); | 317 | const char *password); |
318 | 318 | ||
319 | 319 | ||
320 | /** | 320 | /** |
321 | * Flags for announcements in a home. | 321 | * Flags for announcements in a home. |
322 | */ | 322 | */ |
323 | enum GNUNET_PSYC_AnnouncementFlags | 323 | enum GNUNET_SOCIAL_AnnounceFlags |
324 | { | 324 | { |
325 | GNUNET_SOCIAL_ANNOUNCE_NONE = 0, | ||
326 | |||
325 | /** | 327 | /** |
326 | * Whether this announcement removes all objects from the home. | 328 | * Whether this announcement removes all objects from the home. |
327 | * | 329 | * |
328 | * New objects can be still added to the now empty home using the @e env | 330 | * New objects can be still added to the now empty home using the @e env |
329 | * parameter of the same announcement. | 331 | * parameter of the same announcement. |
330 | */ | 332 | */ |
331 | GNUNET_SOCIAL_ANNOUNCEMENT_CLEAR_OBJECTS = 1 << 0 | 333 | GNUNET_SOCIAL_ANNOUNCE_CLEAR_OBJECTS = 1 << 0 |
332 | }; | 334 | }; |
333 | 335 | ||
334 | 336 | ||
@@ -359,7 +361,7 @@ GNUNET_SOCIAL_home_announce (struct GNUNET_SOCIAL_Home *home, | |||
359 | const struct GNUNET_ENV_Environment *env, | 361 | const struct GNUNET_ENV_Environment *env, |
360 | GNUNET_CONNECTION_TransmitReadyNotify notify, | 362 | GNUNET_CONNECTION_TransmitReadyNotify notify, |
361 | void *notify_cls, | 363 | void *notify_cls, |
362 | GNUNET_SOCIAL_AnnouncementFlags flags); | 364 | enum GNUNET_SOCIAL_AnnounceFlags flags); |
363 | 365 | ||
364 | 366 | ||
365 | /** | 367 | /** |
@@ -529,7 +531,10 @@ GNUNET_SOCIAL_place_look_at (struct GNUNET_SOCIAL_Place *place, | |||
529 | /** | 531 | /** |
530 | * Flags for talking to the host of a place. | 532 | * Flags for talking to the host of a place. |
531 | */ | 533 | */ |
532 | enum GNUNET_SOCIAL_TalkFlags; | 534 | enum GNUNET_SOCIAL_TalkFlags |
535 | { | ||
536 | GNUNET_SOCIAL_TALK_NONE = 0 | ||
537 | }; | ||
533 | 538 | ||
534 | 539 | ||
535 | /** | 540 | /** |
@@ -555,7 +560,7 @@ GNUNET_SOCIAL_place_talk (struct GNUNET_SOCIAL_Place *place, | |||
555 | const struct GNUNET_ENV_Environment *env, | 560 | const struct GNUNET_ENV_Environment *env, |
556 | GNUNET_CONNECTION_TransmitReadyNotify notify, | 561 | GNUNET_CONNECTION_TransmitReadyNotify notify, |
557 | void *notify_cls, | 562 | void *notify_cls, |
558 | GNUNET_SOCIAL_TalkFlags flags); | 563 | enum GNUNET_SOCIAL_TalkFlags flags); |
559 | 564 | ||
560 | 565 | ||
561 | /** | 566 | /** |