diff options
Diffstat (limited to 'src/include/gnunet_messenger_service.h')
-rw-r--r-- | src/include/gnunet_messenger_service.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h index 475f8e32e..5b03ddecf 100644 --- a/src/include/gnunet_messenger_service.h +++ b/src/include/gnunet_messenger_service.h | |||
@@ -94,7 +94,7 @@ struct GNUNET_MESSENGER_RoomEntryRecord | |||
94 | 94 | ||
95 | GNUNET_NETWORK_STRUCT_END | 95 | GNUNET_NETWORK_STRUCT_END |
96 | 96 | ||
97 | GNUNET_NETWORK_STRUCT_BEGIN | 97 | GNUNET_NETWORK_STRUCT_BEGIN |
98 | 98 | ||
99 | /** | 99 | /** |
100 | * A room details record specifies a custom name for a given room and | 100 | * A room details record specifies a custom name for a given room and |
@@ -105,7 +105,7 @@ struct GNUNET_MESSENGER_RoomDetailsRecord | |||
105 | /** | 105 | /** |
106 | * The custom name for the room. | 106 | * The custom name for the room. |
107 | */ | 107 | */ |
108 | char name [256]; | 108 | char name[256]; |
109 | 109 | ||
110 | /** | 110 | /** |
111 | * The flags of the room. | 111 | * The flags of the room. |
@@ -575,8 +575,10 @@ enum GNUNET_MESSENGER_MessageFlags | |||
575 | typedef void | 575 | typedef void |
576 | (*GNUNET_MESSENGER_MessageCallback) (void *cls, | 576 | (*GNUNET_MESSENGER_MessageCallback) (void *cls, |
577 | struct GNUNET_MESSENGER_Room *room, | 577 | struct GNUNET_MESSENGER_Room *room, |
578 | const struct GNUNET_MESSENGER_Contact *sender, | 578 | const struct |
579 | const struct GNUNET_MESSENGER_Message *message, | 579 | GNUNET_MESSENGER_Contact *sender, |
580 | const struct | ||
581 | GNUNET_MESSENGER_Message *message, | ||
580 | const struct GNUNET_HashCode *hash, | 582 | const struct GNUNET_HashCode *hash, |
581 | enum GNUNET_MESSENGER_MessageFlags flags); | 583 | enum GNUNET_MESSENGER_MessageFlags flags); |
582 | 584 | ||
@@ -589,9 +591,10 @@ typedef void | |||
589 | * @param[in] contact Contact handle | 591 | * @param[in] contact Contact handle |
590 | */ | 592 | */ |
591 | typedef int | 593 | typedef int |
592 | (*GNUNET_MESSENGER_MemberCallback) (void* cls, | 594 | (*GNUNET_MESSENGER_MemberCallback) (void *cls, |
593 | struct GNUNET_MESSENGER_Room *room, | 595 | struct GNUNET_MESSENGER_Room *room, |
594 | const struct GNUNET_MESSENGER_Contact *contact); | 596 | const struct |
597 | GNUNET_MESSENGER_Contact *contact); | ||
595 | 598 | ||
596 | /** | 599 | /** |
597 | * Set up a handle for the messenger related functions and connects to all necessary services. It will use the | 600 | * Set up a handle for the messenger related functions and connects to all necessary services. It will use the |
@@ -763,7 +766,8 @@ GNUNET_MESSENGER_get_sender (const struct GNUNET_MESSENGER_Room *room, | |||
763 | * @return Name of <i>contact</i> or NULL | 766 | * @return Name of <i>contact</i> or NULL |
764 | */ | 767 | */ |
765 | const char* | 768 | const char* |
766 | GNUNET_MESSENGER_contact_get_name (const struct GNUNET_MESSENGER_Contact *contact); | 769 | GNUNET_MESSENGER_contact_get_name (const struct |
770 | GNUNET_MESSENGER_Contact *contact); | ||
767 | 771 | ||
768 | /** | 772 | /** |
769 | * Get the public key used by the <i>contact</i> or NULL if the anonymous key was used. | 773 | * Get the public key used by the <i>contact</i> or NULL if the anonymous key was used. |
@@ -772,7 +776,8 @@ GNUNET_MESSENGER_contact_get_name (const struct GNUNET_MESSENGER_Contact *contac | |||
772 | * @return Public key used by <i>contact</i> or NULL | 776 | * @return Public key used by <i>contact</i> or NULL |
773 | */ | 777 | */ |
774 | const struct GNUNET_IDENTITY_PublicKey* | 778 | const struct GNUNET_IDENTITY_PublicKey* |
775 | GNUNET_MESSENGER_contact_get_key (const struct GNUNET_MESSENGER_Contact *contact); | 779 | GNUNET_MESSENGER_contact_get_key (const struct |
780 | GNUNET_MESSENGER_Contact *contact); | ||
776 | 781 | ||
777 | /** | 782 | /** |
778 | * Send a <i>message</i> into a <i>room</i>. If you opened the <i>room</i> all entered members will receive the | 783 | * Send a <i>message</i> into a <i>room</i>. If you opened the <i>room</i> all entered members will receive the |
@@ -795,7 +800,7 @@ GNUNET_MESSENGER_contact_get_key (const struct GNUNET_MESSENGER_Contact *contact | |||
795 | void | 800 | void |
796 | GNUNET_MESSENGER_send_message (struct GNUNET_MESSENGER_Room *room, | 801 | GNUNET_MESSENGER_send_message (struct GNUNET_MESSENGER_Room *room, |
797 | struct GNUNET_MESSENGER_Message *message, | 802 | struct GNUNET_MESSENGER_Message *message, |
798 | const struct GNUNET_MESSENGER_Contact* contact); | 803 | const struct GNUNET_MESSENGER_Contact *contact); |
799 | 804 | ||
800 | /** | 805 | /** |
801 | * Get the message in a <i>room</i> identified by its <i>hash</i>. | 806 | * Get the message in a <i>room</i> identified by its <i>hash</i>. |
@@ -821,7 +826,7 @@ GNUNET_MESSENGER_get_message (const struct GNUNET_MESSENGER_Room *room, | |||
821 | int | 826 | int |
822 | GNUNET_MESSENGER_iterate_members (struct GNUNET_MESSENGER_Room *room, | 827 | GNUNET_MESSENGER_iterate_members (struct GNUNET_MESSENGER_Room *room, |
823 | GNUNET_MESSENGER_MemberCallback callback, | 828 | GNUNET_MESSENGER_MemberCallback callback, |
824 | void* cls); | 829 | void *cls); |
825 | 830 | ||
826 | #if 0 /* keep Emacsens' auto-indent happy */ | 831 | #if 0 /* keep Emacsens' auto-indent happy */ |
827 | { | 832 | { |