diff options
author | Gabor X Toth <*@tg-x.net> | 2013-07-23 05:38:35 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2013-07-23 05:38:35 +0000 |
commit | 51b67f6beffd8ae186229af8367a7f4220e0f01f (patch) | |
tree | 364afe235839914200834f25a6e12b74939958c1 /src/include/gnunet_psyc_service.h | |
parent | 05a1f3c2535040b00c754676f196c68c3bb60c0b (diff) | |
download | gnunet-51b67f6beffd8ae186229af8367a7f4220e0f01f.tar.gz gnunet-51b67f6beffd8ae186229af8367a7f4220e0f01f.zip |
multicast/psyc: no part cb needed
Diffstat (limited to 'src/include/gnunet_psyc_service.h')
-rw-r--r-- | src/include/gnunet_psyc_service.h | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h index b2b370cf9..83c92598f 100644 --- a/src/include/gnunet_psyc_service.h +++ b/src/include/gnunet_psyc_service.h | |||
@@ -130,14 +130,6 @@ enum GNUNET_PSYC_MessageFlags | |||
130 | */ | 130 | */ |
131 | struct GNUNET_PSYC_JoinHandle; | 131 | struct GNUNET_PSYC_JoinHandle; |
132 | 132 | ||
133 | /** | ||
134 | * Handle that identifies a part request. | ||
135 | * | ||
136 | * Used to match calls to #GNUNET_PSYC_PartCallback to the | ||
137 | * corresponding calls to GNUNET_PSYC_part_ack(). | ||
138 | */ | ||
139 | struct GNUNET_PSYC_PartHandle; | ||
140 | |||
141 | 133 | ||
142 | /** | 134 | /** |
143 | * Method called from PSYC upon receiving a message indicating a call | 135 | * Method called from PSYC upon receiving a message indicating a call |
@@ -195,28 +187,6 @@ typedef int (*GNUNET_PSYC_JoinCallback)(void *cls, | |||
195 | 187 | ||
196 | 188 | ||
197 | /** | 189 | /** |
198 | * Method called from PSYC upon receiving a part request. | ||
199 | * | ||
200 | * @param cls Closure. | ||
201 | * @param peer Peer requesting to leave. | ||
202 | * @param method_name Method name in the part request. | ||
203 | * @param header_length Number of modifiers in header. | ||
204 | * @param header Modifiers present in the message. | ||
205 | * @param data_size Number of bytes in @a data. | ||
206 | * @param data Data stream given to the method (might not be zero-terminated | ||
207 | * if data is binary). | ||
208 | */ | ||
209 | typedef int (*GNUNET_PSYC_PartCallback)(void *cls, | ||
210 | const struct GNUNET_PeerIdentity *peer, | ||
211 | const char *method_name, | ||
212 | size_t header_length, | ||
213 | GNUNET_PSYC_Modifier *header, | ||
214 | size_t data_size, | ||
215 | const void *data, | ||
216 | struct GNUNET_PSYC_PartHandle *ph); | ||
217 | |||
218 | |||
219 | /** | ||
220 | * Function to call with the decision made for a join request. | 190 | * Function to call with the decision made for a join request. |
221 | * | 191 | * |
222 | * Must be called once and only once in response to an invocation of the | 192 | * Must be called once and only once in response to an invocation of the |
@@ -240,15 +210,6 @@ GNUNET_PSYC_join_decision (struct GNUNET_PSYC_JoinHandle *jh, | |||
240 | 210 | ||
241 | 211 | ||
242 | /** | 212 | /** |
243 | * Send a part acknowledgment. | ||
244 | * | ||
245 | * @param ph Part handle. | ||
246 | */ | ||
247 | void | ||
248 | GNUNET_PSYC_part_ack (struct GNUNET_PSYC_PartHandle *ph); | ||
249 | |||
250 | |||
251 | /** | ||
252 | * Handle for the master of a PSYC channel. | 213 | * Handle for the master of a PSYC channel. |
253 | */ | 214 | */ |
254 | struct GNUNET_PSYC_Master; | 215 | struct GNUNET_PSYC_Master; |
@@ -279,7 +240,6 @@ struct GNUNET_PSYC_Master; | |||
279 | * Used to automate group management decisions. | 240 | * Used to automate group management decisions. |
280 | * @param method_cb Function to invoke on messages received from members. | 241 | * @param method_cb Function to invoke on messages received from members. |
281 | * @param join_cb Function to invoke when a peer wants to join. | 242 | * @param join_cb Function to invoke when a peer wants to join. |
282 | * @param part_cb Function to invoke when a peer wants to part. | ||
283 | * @param cls Closure for the callbacks. | 243 | * @param cls Closure for the callbacks. |
284 | * @return Handle for the channel master, NULL on error. | 244 | * @return Handle for the channel master, NULL on error. |
285 | */ | 245 | */ |
@@ -289,7 +249,6 @@ GNUNET_PSYC_master_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
289 | enum GNUNET_MULTICAST_JoinPolicy join_policy, | 249 | enum GNUNET_MULTICAST_JoinPolicy join_policy, |
290 | GNUNET_PSYC_Method method_cb, | 250 | GNUNET_PSYC_Method method_cb, |
291 | GNUNET_PSYC_JoinCallback join_cb, | 251 | GNUNET_PSYC_JoinCallback join_cb, |
292 | GNUNET_PSYC_PartCallback part_cb, | ||
293 | void *cls); | 252 | void *cls); |
294 | 253 | ||
295 | 254 | ||
@@ -410,17 +369,9 @@ GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
410 | * first explicitly send a @e part request (via GNUNET_PSYC_slave_to_master()). | 369 | * first explicitly send a @e part request (via GNUNET_PSYC_slave_to_master()). |
411 | * | 370 | * |
412 | * @param slave Slave handle. | 371 | * @param slave Slave handle. |
413 | * @param method_name Method name for the part request. | ||
414 | * @param env Environment containing transient variables for the request, or NULL. | ||
415 | * @param data_size Number of bytes in @a data. | ||
416 | * @param data Payload for the part message. | ||
417 | */ | 372 | */ |
418 | void | 373 | void |
419 | GNUNET_PSYC_slave_part (struct GNUNET_PSYC_Slave *slave, | 374 | GNUNET_PSYC_slave_part (struct GNUNET_PSYC_Slave *slave); |
420 | const char *method_name, | ||
421 | const struct GNUNET_ENV_Environment *env, | ||
422 | size_t data_size, | ||
423 | const void *data); | ||
424 | 375 | ||
425 | 376 | ||
426 | /** | 377 | /** |