diff options
Diffstat (limited to 'src/include/gnunet_multicast_service.h')
-rw-r--r-- | src/include/gnunet_multicast_service.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h index 50dcf7aef..f1b8bc7e5 100644 --- a/src/include/gnunet_multicast_service.h +++ b/src/include/gnunet_multicast_service.h | |||
@@ -598,7 +598,7 @@ typedef int | |||
598 | * Handle for a request to send a message to all multicast group members | 598 | * Handle for a request to send a message to all multicast group members |
599 | * (from the origin). | 599 | * (from the origin). |
600 | */ | 600 | */ |
601 | struct GNUNET_MULTICAST_OriginMessageHandle; | 601 | struct GNUNET_MULTICAST_OriginTransmitHandle; |
602 | 602 | ||
603 | 603 | ||
604 | /** | 604 | /** |
@@ -612,7 +612,7 @@ struct GNUNET_MULTICAST_OriginMessageHandle; | |||
612 | * @param notify_cls Closure for @a notify. | 612 | * @param notify_cls Closure for @a notify. |
613 | * @return NULL on error (i.e. request already pending). | 613 | * @return NULL on error (i.e. request already pending). |
614 | */ | 614 | */ |
615 | struct GNUNET_MULTICAST_OriginMessageHandle * | 615 | struct GNUNET_MULTICAST_OriginTransmitHandle * |
616 | GNUNET_MULTICAST_origin_to_all (struct GNUNET_MULTICAST_Origin *origin, | 616 | GNUNET_MULTICAST_origin_to_all (struct GNUNET_MULTICAST_Origin *origin, |
617 | uint64_t message_id, | 617 | uint64_t message_id, |
618 | uint64_t group_generation, | 618 | uint64_t group_generation, |
@@ -624,19 +624,19 @@ GNUNET_MULTICAST_origin_to_all (struct GNUNET_MULTICAST_Origin *origin, | |||
624 | /** | 624 | /** |
625 | * Resume message transmission to multicast group. | 625 | * Resume message transmission to multicast group. |
626 | * | 626 | * |
627 | * @param mh Request to cancel. | 627 | * @param th Transmission to cancel. |
628 | */ | 628 | */ |
629 | void | 629 | void |
630 | GNUNET_MULTICAST_origin_to_all_resume (struct GNUNET_MULTICAST_OriginMessageHandle *mh); | 630 | GNUNET_MULTICAST_origin_to_all_resume (struct GNUNET_MULTICAST_OriginTransmitHandle *th); |
631 | 631 | ||
632 | 632 | ||
633 | /** | 633 | /** |
634 | * Cancel request for message transmission to multicast group. | 634 | * Cancel request for message transmission to multicast group. |
635 | * | 635 | * |
636 | * @param mh Request to cancel. | 636 | * @param th Transmission to cancel. |
637 | */ | 637 | */ |
638 | void | 638 | void |
639 | GNUNET_MULTICAST_origin_to_all_cancel (struct GNUNET_MULTICAST_OriginMessageHandle *mh); | 639 | GNUNET_MULTICAST_origin_to_all_cancel (struct GNUNET_MULTICAST_OriginTransmitHandle *th); |
640 | 640 | ||
641 | 641 | ||
642 | /** | 642 | /** |
@@ -788,6 +788,7 @@ GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *member); | |||
788 | * @a data, should be set to the number of bytes written to data. | 788 | * @a data, should be set to the number of bytes written to data. |
789 | * @param[out] data Where to write the body of the message to give to the | 789 | * @param[out] data Where to write the body of the message to give to the |
790 | * method. The function must copy at most @a data_size bytes to @a data. | 790 | * method. The function must copy at most @a data_size bytes to @a data. |
791 | * | ||
791 | * @return #GNUNET_SYSERR on error (fatal, aborts transmission) | 792 | * @return #GNUNET_SYSERR on error (fatal, aborts transmission) |
792 | * #GNUNET_NO on success, if more data is to be transmitted later. | 793 | * #GNUNET_NO on success, if more data is to be transmitted later. |
793 | * Should be used if @a data_size was not big enough to take all the | 794 | * Should be used if @a data_size was not big enough to take all the |
@@ -804,7 +805,7 @@ typedef int | |||
804 | /** | 805 | /** |
805 | * Handle for a message to be delivered from a member to the origin. | 806 | * Handle for a message to be delivered from a member to the origin. |
806 | */ | 807 | */ |
807 | struct GNUNET_MULTICAST_MemberRequestHandle; | 808 | struct GNUNET_MULTICAST_MemberTransmitHandle; |
808 | 809 | ||
809 | 810 | ||
810 | /** | 811 | /** |
@@ -814,9 +815,10 @@ struct GNUNET_MULTICAST_MemberRequestHandle; | |||
814 | * @param request_id Application layer ID for the request. Opaque to multicast. | 815 | * @param request_id Application layer ID for the request. Opaque to multicast. |
815 | * @param notify Callback to call to get the message. | 816 | * @param notify Callback to call to get the message. |
816 | * @param notify_cls Closure for @a notify. | 817 | * @param notify_cls Closure for @a notify. |
818 | * | ||
817 | * @return Handle to cancel request, NULL on error (i.e. request already pending). | 819 | * @return Handle to cancel request, NULL on error (i.e. request already pending). |
818 | */ | 820 | */ |
819 | struct GNUNET_MULTICAST_MemberRequestHandle * | 821 | struct GNUNET_MULTICAST_MemberTransmitHandle * |
820 | GNUNET_MULTICAST_member_to_origin (struct GNUNET_MULTICAST_Member *member, | 822 | GNUNET_MULTICAST_member_to_origin (struct GNUNET_MULTICAST_Member *member, |
821 | uint64_t request_id, | 823 | uint64_t request_id, |
822 | GNUNET_MULTICAST_MemberTransmitNotify notify, | 824 | GNUNET_MULTICAST_MemberTransmitNotify notify, |
@@ -826,19 +828,19 @@ GNUNET_MULTICAST_member_to_origin (struct GNUNET_MULTICAST_Member *member, | |||
826 | /** | 828 | /** |
827 | * Resume message transmission to origin. | 829 | * Resume message transmission to origin. |
828 | * | 830 | * |
829 | * @param rh Request to cancel. | 831 | * @param th Transmission to cancel. |
830 | */ | 832 | */ |
831 | void | 833 | void |
832 | GNUNET_MULTICAST_member_to_origin_resume (struct GNUNET_MULTICAST_MemberRequestHandle *rh); | 834 | GNUNET_MULTICAST_member_to_origin_resume (struct GNUNET_MULTICAST_MemberTransmitHandle *th); |
833 | 835 | ||
834 | 836 | ||
835 | /** | 837 | /** |
836 | * Cancel request for message transmission to origin. | 838 | * Cancel request for message transmission to origin. |
837 | * | 839 | * |
838 | * @param rh Request to cancel. | 840 | * @param th Transmission to cancel. |
839 | */ | 841 | */ |
840 | void | 842 | void |
841 | GNUNET_MULTICAST_member_to_origin_cancel (struct GNUNET_MULTICAST_MemberRequestHandle *rh); | 843 | GNUNET_MULTICAST_member_to_origin_cancel (struct GNUNET_MULTICAST_MemberTransmitHandle *th); |
842 | 844 | ||
843 | 845 | ||
844 | #if 0 /* keep Emacsens' auto-indent happy */ | 846 | #if 0 /* keep Emacsens' auto-indent happy */ |