diff options
author | Gabor X Toth <*@tg-x.net> | 2013-07-15 07:25:11 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2013-07-15 07:25:11 +0000 |
commit | 87093621a5223dd1f0d48ded2c41821af7def6f7 (patch) | |
tree | 3612376935189d6d238bedf6dc93ce0e3e37dcaf /src | |
parent | 00c2318820ac3ee2ea06c173c3fce994bc29eb4e (diff) | |
download | gnunet-87093621a5223dd1f0d48ded2c41821af7def6f7.tar.gz gnunet-87093621a5223dd1f0d48ded2c41821af7def6f7.zip |
psyc(store): group generation only needed when storing the message
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_psyc_service.h | 14 | ||||
-rw-r--r-- | src/include/gnunet_psycstore_service.h | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h index e23eef669..da8da9221 100644 --- a/src/include/gnunet_psyc_service.h +++ b/src/include/gnunet_psyc_service.h | |||
@@ -147,8 +147,6 @@ struct GNUNET_PSYC_PartHandle; | |||
147 | * @param message_id Unique message counter for this message; | 147 | * @param message_id Unique message counter for this message; |
148 | * (unique only in combination with the given sender for | 148 | * (unique only in combination with the given sender for |
149 | * this channel). | 149 | * this channel). |
150 | * @param group_generation Group generation counter for this message | ||
151 | * (always zero for messages from members to channel owner); FIXME: needed? | ||
152 | * @param method_name Original method name from PSYC (may be more | 150 | * @param method_name Original method name from PSYC (may be more |
153 | * specific than the registered method name due to try-and-slice matching). | 151 | * specific than the registered method name due to try-and-slice matching). |
154 | * FIXME: no try-and-slice for methods defined here. | 152 | * FIXME: no try-and-slice for methods defined here. |
@@ -163,7 +161,6 @@ struct GNUNET_PSYC_PartHandle; | |||
163 | typedef int (*GNUNET_PSYC_Method)(void *cls, | 161 | typedef int (*GNUNET_PSYC_Method)(void *cls, |
164 | const struct GNUNET_PeerIdentity *sender, | 162 | const struct GNUNET_PeerIdentity *sender, |
165 | uint64_t message_id, | 163 | uint64_t message_id, |
166 | uint64_t group_generation, | ||
167 | const char *method_name, | 164 | const char *method_name, |
168 | size_t header_length, | 165 | size_t header_length, |
169 | GNUNET_PSYC_Modifier *header, | 166 | GNUNET_PSYC_Modifier *header, |
@@ -327,8 +324,6 @@ GNUNET_PSYC_channel_state_modify (struct GNUNET_PSYC_Channel *channel, | |||
327 | * @param cls Closure. | 324 | * @param cls Closure. |
328 | * @param message_id Set to the unique message ID that was generated for | 325 | * @param message_id Set to the unique message ID that was generated for |
329 | * this message. | 326 | * this message. |
330 | * @param group_generation Set to the group generation used for this | ||
331 | * message. | ||
332 | * @param data_size[in,out] Initially set to the number of bytes available in @a data, | 327 | * @param data_size[in,out] Initially set to the number of bytes available in @a data, |
333 | * should be set to the number of bytes written to data (IN/OUT). | 328 | * should be set to the number of bytes written to data (IN/OUT). |
334 | * @param[out] data Where to write the body of the message to give to the method; | 329 | * @param[out] data Where to write the body of the message to give to the method; |
@@ -340,7 +335,6 @@ GNUNET_PSYC_channel_state_modify (struct GNUNET_PSYC_Channel *channel, | |||
340 | */ | 335 | */ |
341 | typedef int (*GNUNET_PSYC_ChannelReadyNotify)(void *cls, | 336 | typedef int (*GNUNET_PSYC_ChannelReadyNotify)(void *cls, |
342 | uint64_t message_id, | 337 | uint64_t message_id, |
343 | uint64_t group_generation, | ||
344 | size_t *data_size, | 338 | size_t *data_size, |
345 | void *data); | 339 | void *data); |
346 | 340 | ||
@@ -432,13 +426,11 @@ GNUNET_PSYC_member_get_group (struct GNUNET_PSYC_Member *member); | |||
432 | * @param group Group handle. | 426 | * @param group Group handle. |
433 | * @param member Which peer to add. | 427 | * @param member Which peer to add. |
434 | * @param message_id Message ID for the message that changed the membership. | 428 | * @param message_id Message ID for the message that changed the membership. |
435 | * @param group_generation The generation ID where the change went into effect. | ||
436 | */ | 429 | */ |
437 | void | 430 | void |
438 | GNUNET_PSYC_group_member_add (struct GNUNET_PSYC_Group *group, | 431 | GNUNET_PSYC_group_member_add (struct GNUNET_PSYC_Group *group, |
439 | const struct GNUNET_PeerIdentity *member, | 432 | const struct GNUNET_PeerIdentity *member, |
440 | uint64_t message_id, | 433 | uint64_t message_id); |
441 | uint64_t group_generation); | ||
442 | 434 | ||
443 | 435 | ||
444 | /** | 436 | /** |
@@ -460,13 +452,11 @@ GNUNET_PSYC_group_member_add (struct GNUNET_PSYC_Group *group, | |||
460 | * @param group Group handle. | 452 | * @param group Group handle. |
461 | * @param member Which peer to remove. | 453 | * @param member Which peer to remove. |
462 | * @param message_id Message ID for the message that changed the membership. | 454 | * @param message_id Message ID for the message that changed the membership. |
463 | * @param group_generation The generation ID where the change went into effect. | ||
464 | */ | 455 | */ |
465 | void | 456 | void |
466 | GNUNET_PSYC_group_member_remove (struct GNUNET_PSYC_Group *group, | 457 | GNUNET_PSYC_group_member_remove (struct GNUNET_PSYC_Group *group, |
467 | const struct GNUNET_PeerIdentity *member, | 458 | const struct GNUNET_PeerIdentity *member, |
468 | uint64_t message_id, | 459 | uint64_t message_id); |
469 | uint64_t group_generation); | ||
470 | 460 | ||
471 | 461 | ||
472 | /** | 462 | /** |
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h index 8b84340fe..4cd5a36fc 100644 --- a/src/include/gnunet_psycstore_service.h +++ b/src/include/gnunet_psycstore_service.h | |||
@@ -91,7 +91,6 @@ typedef void (*GNUNET_PSYCSTORE_ContinuationCallback)(void *cls, | |||
91 | * @param h Handle for the PSYCstore. | 91 | * @param h Handle for the PSYCstore. |
92 | * @param channel_id ID of the channel where the event happened. | 92 | * @param channel_id ID of the channel where the event happened. |
93 | * @param message_id ID of the message in which this event was announced. | 93 | * @param message_id ID of the message in which this event was announced. |
94 | * @param group_generation Generation of the group when this event was announced. | ||
95 | * @param peer Identity of joining/leaving peer. | 94 | * @param peer Identity of joining/leaving peer. |
96 | * @param did_join #GNUNET_YES on join, #GNUNET_NO on leave. | 95 | * @param did_join #GNUNET_YES on join, #GNUNET_NO on leave. |
97 | * @param ccb Callback to call with the result of the storage operation. | 96 | * @param ccb Callback to call with the result of the storage operation. |
@@ -103,7 +102,6 @@ struct GNUNET_PSYCSTORE_OperationHandle * | |||
103 | GNUNET_PSYCSTORE_membership_store (struct GNUNET_PSYCSTORE_Handle *h, | 102 | GNUNET_PSYCSTORE_membership_store (struct GNUNET_PSYCSTORE_Handle *h, |
104 | const struct GNUNET_HashCode *channel_id, | 103 | const struct GNUNET_HashCode *channel_id, |
105 | uint64_t message_id, | 104 | uint64_t message_id, |
106 | uint64_t group_generation, | ||
107 | const struct GNUNET_PeerIdentity *peer, | 105 | const struct GNUNET_PeerIdentity *peer, |
108 | int did_join, | 106 | int did_join, |
109 | GNUNET_PSYCSTORE_ContinuationCallback ccb, | 107 | GNUNET_PSYCSTORE_ContinuationCallback ccb, |