diff options
author | Gabor X Toth <*@tg-x.net> | 2013-07-28 19:30:06 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2013-07-28 19:30:06 +0000 |
commit | b9b10bb434ec1f611be916a402d15440ccc8ec6d (patch) | |
tree | f7556169d75d1e2064e92ff914d09f621dc6c80c /src/include/gnunet_psyc_service.h | |
parent | b7b5c0ffeda46dee307c5f46347bffd649459681 (diff) | |
download | gnunet-b9b10bb434ec1f611be916a402d15440ccc8ec6d.tar.gz gnunet-b9b10bb434ec1f611be916a402d15440ccc8ec6d.zip |
multicast: additional args for member_start, origin_start, origin_to_all; social: use private key struct instead of file
Diffstat (limited to 'src/include/gnunet_psyc_service.h')
-rw-r--r-- | src/include/gnunet_psyc_service.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h index 6f85660e4..fae52f6cd 100644 --- a/src/include/gnunet_psyc_service.h +++ b/src/include/gnunet_psyc_service.h | |||
@@ -239,15 +239,14 @@ struct GNUNET_PSYC_Master; | |||
239 | * | 239 | * |
240 | * @param cfg Configuration to use (to connect to PSYC service). | 240 | * @param cfg Configuration to use (to connect to PSYC service). |
241 | * @param priv_key ECC key that will be used to sign messages for this | 241 | * @param priv_key ECC key that will be used to sign messages for this |
242 | * PSYC session; public key is used to identify the | 242 | * PSYC session. The public key is used to identify the PSYC channel. |
243 | * PSYC channel; FIXME: we'll likely want to use | 243 | * Note that end-users will usually not use the private key directly, but |
244 | * NOT the p512 curve here, but a cheaper one in the future | 244 | * rather look it up in GADS for places managed by other users, or select |
245 | * Note that end-users will usually not use the private key | 245 | * a file with the private key(s) when setting up their own channels |
246 | * directly, but rather look it up in GADS for places | 246 | * FIXME: we'll likely want to use NOT the p521 curve here, but a cheaper |
247 | * managed by other users, or select a file with the private | 247 | * one in the future. |
248 | * key(s) when setting up their own channels | 248 | * @param policy Group policy specifying join and history restrictions. |
249 | * @param join_policy What is the membership policy of the group? | 249 | * Used to automate group management decisions. |
250 | * Used to automate group management decisions. | ||
251 | * @param method_cb Function to invoke on messages received from members. | 250 | * @param method_cb Function to invoke on messages received from members. |
252 | * @param join_cb Function to invoke when a peer wants to join. | 251 | * @param join_cb Function to invoke when a peer wants to join. |
253 | * @param cls Closure for the callbacks. | 252 | * @param cls Closure for the callbacks. |
@@ -256,7 +255,7 @@ struct GNUNET_PSYC_Master; | |||
256 | struct GNUNET_PSYC_Master * | 255 | struct GNUNET_PSYC_Master * |
257 | GNUNET_PSYC_master_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | 256 | GNUNET_PSYC_master_start (const struct GNUNET_CONFIGURATION_Handle *cfg, |
258 | const struct GNUNET_CRYPTO_EccPrivateKey *priv_key, | 257 | const struct GNUNET_CRYPTO_EccPrivateKey *priv_key, |
259 | enum GNUNET_MULTICAST_JoinPolicy join_policy, | 258 | enum GNUNET_MULTICAST_GroupPolicy policy, |
260 | GNUNET_PSYC_Method method_cb, | 259 | GNUNET_PSYC_Method method_cb, |
261 | GNUNET_PSYC_JoinCallback join_cb, | 260 | GNUNET_PSYC_JoinCallback join_cb, |
262 | void *cls); | 261 | void *cls); |