aboutsummaryrefslogtreecommitdiff
path: root/src/include/gnunet_psyc_service.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/gnunet_psyc_service.h')
-rw-r--r--src/include/gnunet_psyc_service.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index 526a70f01..57134baf5 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -258,7 +258,7 @@ struct GNUNET_PSYC_MessageHeader
258 * Sending slave's public key. 258 * Sending slave's public key.
259 * Not set if the message is from the master. 259 * Not set if the message is from the master.
260 */ 260 */
261 struct GNUNET_CRYPTO_EcdsaPublicKey slave_key; 261 struct GNUNET_CRYPTO_EcdsaPublicKey slave_pub_key;
262 262
263 /* Followed by concatenated PSYC message parts: 263 /* Followed by concatenated PSYC message parts:
264 * messages with GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_* types 264 * messages with GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_* types
@@ -351,7 +351,7 @@ struct GNUNET_PSYC_JoinRequestMessage
351 /** 351 /**
352 * Public key of the joining slave. 352 * Public key of the joining slave.
353 */ 353 */
354 struct GNUNET_CRYPTO_EcdsaPublicKey slave_key; 354 struct GNUNET_CRYPTO_EcdsaPublicKey slave_pub_key;
355 355
356 /* Followed by struct GNUNET_MessageHeader join_request */ 356 /* Followed by struct GNUNET_MessageHeader join_request */
357}; 357};
@@ -377,7 +377,7 @@ struct GNUNET_PSYC_JoinDecisionMessage
377 * Only set when the master is sending the decision, 377 * Only set when the master is sending the decision,
378 * not set when a slave is receiving it. 378 * not set when a slave is receiving it.
379 */ 379 */
380 struct GNUNET_CRYPTO_EcdsaPublicKey slave_key; 380 struct GNUNET_CRYPTO_EcdsaPublicKey slave_pub_key;
381 381
382 /* Followed by struct GNUNET_MessageHeader join_response */ 382 /* Followed by struct GNUNET_MessageHeader join_response */
383}; 383};
@@ -544,7 +544,7 @@ typedef void
544 * 544 *
545 * @param cls 545 * @param cls
546 * Closure. 546 * Closure.
547 * @param slave_key 547 * @param slave_pub_key
548 * Public key of the slave sending the message. 548 * Public key of the slave sending the message.
549 * Only set for channel master. 549 * Only set for channel master.
550 * @param message_id 550 * @param message_id
@@ -564,7 +564,7 @@ typedef void
564 */ 564 */
565typedef void 565typedef void
566(*GNUNET_PSYC_MessagePartCallback) (void *cls, 566(*GNUNET_PSYC_MessagePartCallback) (void *cls,
567 const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key, 567 const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_pub_key,
568 uint64_t message_id, 568 uint64_t message_id,
569 uint32_t flags, 569 uint32_t flags,
570 uint64_t data_offset, 570 uint64_t data_offset,
@@ -576,7 +576,7 @@ typedef void
576 * 576 *
577 * @param cls 577 * @param cls
578 * Closure. 578 * Closure.
579 * @param slave_key 579 * @param slave_pub_key
580 * Public key of the slave requesting join. 580 * Public key of the slave requesting join.
581 * @param join_msg 581 * @param join_msg
582 * Join message sent along with the request. 582 * Join message sent along with the request.
@@ -586,7 +586,7 @@ typedef void
586typedef void 586typedef void
587(*GNUNET_PSYC_JoinRequestCallback) (void *cls, 587(*GNUNET_PSYC_JoinRequestCallback) (void *cls,
588 const struct GNUNET_PSYC_JoinRequestMessage *req, 588 const struct GNUNET_PSYC_JoinRequestMessage *req,
589 const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key, 589 const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_pub_key,
590 const struct GNUNET_PSYC_Message *join_msg, 590 const struct GNUNET_PSYC_Message *join_msg,
591 struct GNUNET_PSYC_JoinHandle *jh); 591 struct GNUNET_PSYC_JoinHandle *jh);
592 592
@@ -920,7 +920,7 @@ enum GNUNET_PSYC_SlaveJoinFlags
920 * Configuration to use. 920 * Configuration to use.
921 * @param channel_pub_key 921 * @param channel_pub_key
922 * ECC public key that identifies the channel we wish to join. 922 * ECC public key that identifies the channel we wish to join.
923 * @param slave_key 923 * @param slave_pub_key
924 * ECC private-public key pair that identifies the slave, and 924 * ECC private-public key pair that identifies the slave, and
925 * used by multicast to sign the join request and subsequent unicast 925 * used by multicast to sign the join request and subsequent unicast
926 * requests sent to the master. 926 * requests sent to the master.
@@ -951,7 +951,7 @@ enum GNUNET_PSYC_SlaveJoinFlags
951struct GNUNET_PSYC_Slave * 951struct GNUNET_PSYC_Slave *
952GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg, 952GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg,
953 const struct GNUNET_CRYPTO_EddsaPublicKey *channel_pub_key, 953 const struct GNUNET_CRYPTO_EddsaPublicKey *channel_pub_key,
954 const struct GNUNET_CRYPTO_EcdsaPrivateKey *slave_key, 954 const struct GNUNET_CRYPTO_EcdsaPrivateKey *slave_pub_key,
955 enum GNUNET_PSYC_SlaveJoinFlags flags, 955 enum GNUNET_PSYC_SlaveJoinFlags flags,
956 const struct GNUNET_PeerIdentity *origin, 956 const struct GNUNET_PeerIdentity *origin,
957 uint32_t relay_count, 957 uint32_t relay_count,
@@ -1085,7 +1085,7 @@ GNUNET_PSYC_slave_get_channel (struct GNUNET_PSYC_Slave *slave);
1085 * 1085 *
1086 * @param channel 1086 * @param channel
1087 * Channel handle. 1087 * Channel handle.
1088 * @param slave_key 1088 * @param slave_pub_key
1089 * Identity of channel slave to add. 1089 * Identity of channel slave to add.
1090 * @param announced_at 1090 * @param announced_at
1091 * ID of the message that announced the membership change. 1091 * ID of the message that announced the membership change.
@@ -1101,7 +1101,7 @@ GNUNET_PSYC_slave_get_channel (struct GNUNET_PSYC_Slave *slave);
1101 */ 1101 */
1102void 1102void
1103GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *channel, 1103GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *channel,
1104 const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key, 1104 const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_pub_key,
1105 uint64_t announced_at, 1105 uint64_t announced_at,
1106 uint64_t effective_since, 1106 uint64_t effective_since,
1107 GNUNET_ResultCallback result_cb, 1107 GNUNET_ResultCallback result_cb,
@@ -1127,7 +1127,7 @@ GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *channel,
1127 * 1127 *
1128 * @param channel 1128 * @param channel
1129 * Channel handle. 1129 * Channel handle.
1130 * @param slave_key 1130 * @param slave_pub_key
1131 * Identity of channel slave to remove. 1131 * Identity of channel slave to remove.
1132 * @param announced_at 1132 * @param announced_at
1133 * ID of the message that announced the membership change. 1133 * ID of the message that announced the membership change.
@@ -1142,7 +1142,7 @@ GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *channel,
1142void 1142void
1143GNUNET_PSYC_channel_slave_remove (struct GNUNET_PSYC_Channel *channel, 1143GNUNET_PSYC_channel_slave_remove (struct GNUNET_PSYC_Channel *channel,
1144 const struct GNUNET_CRYPTO_EcdsaPublicKey 1144 const struct GNUNET_CRYPTO_EcdsaPublicKey
1145 *slave_key, 1145 *slave_pub_key,
1146 uint64_t announced_at, 1146 uint64_t announced_at,
1147 GNUNET_ResultCallback result_cb, 1147 GNUNET_ResultCallback result_cb,
1148 void *cls); 1148 void *cls);