forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from e29e185c03..f1df709b87
f1df709b87 feat: add ngc events 1b6c907235 refactor: Make event dispatch ordered by receive time. b7f9367f6f test: Upgrade cppcheck, fix some warnings. 766e62bc89 chore: Use `pkg_search_module` directly in cmake. 00ff078f91 cleanup: Use target_link_libraries directly in cmake. c58928cc89 chore: Add `IMPORTED_TARGET` to pkg-config packages. 895a6af122 cleanup: Remove NaCl support. 41dfb1c1c0 fix: unpack enum function names in event impl generator 447666d1a1 chore: Disable targets for cross-compilation. 572924e924 chore: Build a docker image with coverage info in it. 415cb78f5e cleanup: Some portability/warning fixes for Windows builds. 425216d9ec fix: Correct a use-after-free and fix some memory leaks. 4b1cfa3e08 refactor: Change all enum-like `#define` sequences into enums. d3c2704fa9 chore: Fix make_single_file to support core-only. 0ce46b644e refactor: Change the `TCP_PACKET_*` defines into an enum. 22cd38ad50 adopt event impl generation tool to #2392 f31ea1088a add the event impl generation tool 4e603bb613 refactor: Use `enum-from-int` rule from tokstyle. 19d8f180d6 chore: Update github actions `uses`. 6a895be0c7 test: Make esp32 build actually try to instantiate tox. 65d09c9bfb cleanup: Remove test net support. REVERT: e29e185c03 feat: add ngc events git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: f1df709b8792da4c0e946d826b11df77d565064d
This commit is contained in:
@ -8,172 +8,23 @@
|
||||
#include "../attributes.h"
|
||||
#include "../bin_pack.h"
|
||||
#include "../bin_unpack.h"
|
||||
#include "../tox_events.h"
|
||||
#include "../tox_event.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
struct Tox_Events {
|
||||
Tox_Event_Conference_Connected *conference_connected;
|
||||
uint32_t conference_connected_size;
|
||||
uint32_t conference_connected_capacity;
|
||||
Tox_Event *events;
|
||||
uint32_t events_size;
|
||||
uint32_t events_capacity;
|
||||
|
||||
Tox_Event_Conference_Invite *conference_invite;
|
||||
uint32_t conference_invite_size;
|
||||
uint32_t conference_invite_capacity;
|
||||
|
||||
Tox_Event_Conference_Message *conference_message;
|
||||
uint32_t conference_message_size;
|
||||
uint32_t conference_message_capacity;
|
||||
|
||||
Tox_Event_Conference_Peer_List_Changed *conference_peer_list_changed;
|
||||
uint32_t conference_peer_list_changed_size;
|
||||
uint32_t conference_peer_list_changed_capacity;
|
||||
|
||||
Tox_Event_Conference_Peer_Name *conference_peer_name;
|
||||
uint32_t conference_peer_name_size;
|
||||
uint32_t conference_peer_name_capacity;
|
||||
|
||||
Tox_Event_Conference_Title *conference_title;
|
||||
uint32_t conference_title_size;
|
||||
uint32_t conference_title_capacity;
|
||||
|
||||
Tox_Event_File_Chunk_Request *file_chunk_request;
|
||||
uint32_t file_chunk_request_size;
|
||||
uint32_t file_chunk_request_capacity;
|
||||
|
||||
Tox_Event_File_Recv *file_recv;
|
||||
uint32_t file_recv_size;
|
||||
uint32_t file_recv_capacity;
|
||||
|
||||
Tox_Event_File_Recv_Chunk *file_recv_chunk;
|
||||
uint32_t file_recv_chunk_size;
|
||||
uint32_t file_recv_chunk_capacity;
|
||||
|
||||
Tox_Event_File_Recv_Control *file_recv_control;
|
||||
uint32_t file_recv_control_size;
|
||||
uint32_t file_recv_control_capacity;
|
||||
|
||||
Tox_Event_Friend_Connection_Status *friend_connection_status;
|
||||
uint32_t friend_connection_status_size;
|
||||
uint32_t friend_connection_status_capacity;
|
||||
|
||||
Tox_Event_Friend_Lossless_Packet *friend_lossless_packet;
|
||||
uint32_t friend_lossless_packet_size;
|
||||
uint32_t friend_lossless_packet_capacity;
|
||||
|
||||
Tox_Event_Friend_Lossy_Packet *friend_lossy_packet;
|
||||
uint32_t friend_lossy_packet_size;
|
||||
uint32_t friend_lossy_packet_capacity;
|
||||
|
||||
Tox_Event_Friend_Message *friend_message;
|
||||
uint32_t friend_message_size;
|
||||
uint32_t friend_message_capacity;
|
||||
|
||||
Tox_Event_Friend_Name *friend_name;
|
||||
uint32_t friend_name_size;
|
||||
uint32_t friend_name_capacity;
|
||||
|
||||
Tox_Event_Friend_Read_Receipt *friend_read_receipt;
|
||||
uint32_t friend_read_receipt_size;
|
||||
uint32_t friend_read_receipt_capacity;
|
||||
|
||||
Tox_Event_Friend_Request *friend_request;
|
||||
uint32_t friend_request_size;
|
||||
uint32_t friend_request_capacity;
|
||||
|
||||
Tox_Event_Friend_Status *friend_status;
|
||||
uint32_t friend_status_size;
|
||||
uint32_t friend_status_capacity;
|
||||
|
||||
Tox_Event_Friend_Status_Message *friend_status_message;
|
||||
uint32_t friend_status_message_size;
|
||||
uint32_t friend_status_message_capacity;
|
||||
|
||||
Tox_Event_Friend_Typing *friend_typing;
|
||||
uint32_t friend_typing_size;
|
||||
uint32_t friend_typing_capacity;
|
||||
|
||||
Tox_Event_Self_Connection_Status *self_connection_status;
|
||||
uint32_t self_connection_status_size;
|
||||
uint32_t self_connection_status_capacity;
|
||||
|
||||
Tox_Event_Group_Peer_Name *group_peer_name;
|
||||
uint32_t group_peer_name_size;
|
||||
uint32_t group_peer_name_capacity;
|
||||
|
||||
Tox_Event_Group_Peer_Status *group_peer_status;
|
||||
uint32_t group_peer_status_size;
|
||||
uint32_t group_peer_status_capacity;
|
||||
|
||||
Tox_Event_Group_Topic *group_topic;
|
||||
uint32_t group_topic_size;
|
||||
uint32_t group_topic_capacity;
|
||||
|
||||
Tox_Event_Group_Privacy_State *group_privacy_state;
|
||||
uint32_t group_privacy_state_size;
|
||||
uint32_t group_privacy_state_capacity;
|
||||
|
||||
Tox_Event_Group_Voice_State *group_voice_state;
|
||||
uint32_t group_voice_state_size;
|
||||
uint32_t group_voice_state_capacity;
|
||||
|
||||
Tox_Event_Group_Topic_Lock *group_topic_lock;
|
||||
uint32_t group_topic_lock_size;
|
||||
uint32_t group_topic_lock_capacity;
|
||||
|
||||
Tox_Event_Group_Peer_Limit *group_peer_limit;
|
||||
uint32_t group_peer_limit_size;
|
||||
uint32_t group_peer_limit_capacity;
|
||||
|
||||
Tox_Event_Group_Password *group_password;
|
||||
uint32_t group_password_size;
|
||||
uint32_t group_password_capacity;
|
||||
|
||||
Tox_Event_Group_Message *group_message;
|
||||
uint32_t group_message_size;
|
||||
uint32_t group_message_capacity;
|
||||
|
||||
Tox_Event_Group_Private_Message *group_private_message;
|
||||
uint32_t group_private_message_size;
|
||||
uint32_t group_private_message_capacity;
|
||||
|
||||
Tox_Event_Group_Custom_Packet *group_custom_packet;
|
||||
uint32_t group_custom_packet_size;
|
||||
uint32_t group_custom_packet_capacity;
|
||||
|
||||
Tox_Event_Group_Custom_Private_Packet *group_custom_private_packet;
|
||||
uint32_t group_custom_private_packet_size;
|
||||
uint32_t group_custom_private_packet_capacity;
|
||||
|
||||
Tox_Event_Group_Invite *group_invite;
|
||||
uint32_t group_invite_size;
|
||||
uint32_t group_invite_capacity;
|
||||
|
||||
Tox_Event_Group_Peer_Join *group_peer_join;
|
||||
uint32_t group_peer_join_size;
|
||||
uint32_t group_peer_join_capacity;
|
||||
|
||||
Tox_Event_Group_Peer_Exit *group_peer_exit;
|
||||
uint32_t group_peer_exit_size;
|
||||
uint32_t group_peer_exit_capacity;
|
||||
|
||||
Tox_Event_Group_Self_Join *group_self_join;
|
||||
uint32_t group_self_join_size;
|
||||
uint32_t group_self_join_capacity;
|
||||
|
||||
Tox_Event_Group_Join_Fail *group_join_fail;
|
||||
uint32_t group_join_fail_size;
|
||||
uint32_t group_join_fail_capacity;
|
||||
|
||||
Tox_Event_Group_Moderation *group_moderation;
|
||||
uint32_t group_moderation_size;
|
||||
uint32_t group_moderation_capacity;
|
||||
const Memory *mem;
|
||||
};
|
||||
|
||||
typedef struct Tox_Events_State {
|
||||
Tox_Err_Events_Iterate error;
|
||||
const Memory *mem;
|
||||
Tox_Events *events;
|
||||
} Tox_Events_State;
|
||||
|
||||
@ -217,142 +68,18 @@ tox_group_self_join_cb tox_events_handle_group_self_join;
|
||||
tox_group_join_fail_cb tox_events_handle_group_join_fail;
|
||||
tox_group_moderation_cb tox_events_handle_group_moderation;
|
||||
|
||||
// non_null()
|
||||
typedef void tox_events_clear_cb(Tox_Events *events);
|
||||
non_null(2) nullable(1)
|
||||
bool tox_events_pack(const Tox_Events *events, Bin_Pack *bp);
|
||||
|
||||
tox_events_clear_cb tox_events_clear_conference_connected;
|
||||
tox_events_clear_cb tox_events_clear_conference_invite;
|
||||
tox_events_clear_cb tox_events_clear_conference_message;
|
||||
tox_events_clear_cb tox_events_clear_conference_peer_list_changed;
|
||||
tox_events_clear_cb tox_events_clear_conference_peer_name;
|
||||
tox_events_clear_cb tox_events_clear_conference_title;
|
||||
tox_events_clear_cb tox_events_clear_file_chunk_request;
|
||||
tox_events_clear_cb tox_events_clear_file_recv_chunk;
|
||||
tox_events_clear_cb tox_events_clear_file_recv_control;
|
||||
tox_events_clear_cb tox_events_clear_file_recv;
|
||||
tox_events_clear_cb tox_events_clear_friend_connection_status;
|
||||
tox_events_clear_cb tox_events_clear_friend_lossless_packet;
|
||||
tox_events_clear_cb tox_events_clear_friend_lossy_packet;
|
||||
tox_events_clear_cb tox_events_clear_friend_message;
|
||||
tox_events_clear_cb tox_events_clear_friend_name;
|
||||
tox_events_clear_cb tox_events_clear_friend_read_receipt;
|
||||
tox_events_clear_cb tox_events_clear_friend_request;
|
||||
tox_events_clear_cb tox_events_clear_friend_status_message;
|
||||
tox_events_clear_cb tox_events_clear_friend_status;
|
||||
tox_events_clear_cb tox_events_clear_friend_typing;
|
||||
tox_events_clear_cb tox_events_clear_self_connection_status;
|
||||
tox_events_clear_cb tox_events_clear_group_peer_name;
|
||||
tox_events_clear_cb tox_events_clear_group_peer_status;
|
||||
tox_events_clear_cb tox_events_clear_group_topic;
|
||||
tox_events_clear_cb tox_events_clear_group_privacy_state;
|
||||
tox_events_clear_cb tox_events_clear_group_voice_state;
|
||||
tox_events_clear_cb tox_events_clear_group_topic_lock;
|
||||
tox_events_clear_cb tox_events_clear_group_peer_limit;
|
||||
tox_events_clear_cb tox_events_clear_group_password;
|
||||
tox_events_clear_cb tox_events_clear_group_message;
|
||||
tox_events_clear_cb tox_events_clear_group_private_message;
|
||||
tox_events_clear_cb tox_events_clear_group_custom_packet;
|
||||
tox_events_clear_cb tox_events_clear_group_custom_private_packet;
|
||||
tox_events_clear_cb tox_events_clear_group_invite;
|
||||
tox_events_clear_cb tox_events_clear_group_peer_join;
|
||||
tox_events_clear_cb tox_events_clear_group_peer_exit;
|
||||
tox_events_clear_cb tox_events_clear_group_self_join;
|
||||
tox_events_clear_cb tox_events_clear_group_join_fail;
|
||||
tox_events_clear_cb tox_events_clear_group_moderation;
|
||||
|
||||
// non_null()
|
||||
typedef bool tox_events_pack_cb(const Tox_Events *events, Bin_Pack *bp);
|
||||
|
||||
tox_events_pack_cb tox_events_pack_conference_connected;
|
||||
tox_events_pack_cb tox_events_pack_conference_invite;
|
||||
tox_events_pack_cb tox_events_pack_conference_message;
|
||||
tox_events_pack_cb tox_events_pack_conference_peer_list_changed;
|
||||
tox_events_pack_cb tox_events_pack_conference_peer_name;
|
||||
tox_events_pack_cb tox_events_pack_conference_title;
|
||||
tox_events_pack_cb tox_events_pack_file_chunk_request;
|
||||
tox_events_pack_cb tox_events_pack_file_recv_chunk;
|
||||
tox_events_pack_cb tox_events_pack_file_recv_control;
|
||||
tox_events_pack_cb tox_events_pack_file_recv;
|
||||
tox_events_pack_cb tox_events_pack_friend_connection_status;
|
||||
tox_events_pack_cb tox_events_pack_friend_lossless_packet;
|
||||
tox_events_pack_cb tox_events_pack_friend_lossy_packet;
|
||||
tox_events_pack_cb tox_events_pack_friend_message;
|
||||
tox_events_pack_cb tox_events_pack_friend_name;
|
||||
tox_events_pack_cb tox_events_pack_friend_read_receipt;
|
||||
tox_events_pack_cb tox_events_pack_friend_request;
|
||||
tox_events_pack_cb tox_events_pack_friend_status_message;
|
||||
tox_events_pack_cb tox_events_pack_friend_status;
|
||||
tox_events_pack_cb tox_events_pack_friend_typing;
|
||||
tox_events_pack_cb tox_events_pack_self_connection_status;
|
||||
tox_events_pack_cb tox_events_pack_group_peer_name;
|
||||
tox_events_pack_cb tox_events_pack_group_peer_status;
|
||||
tox_events_pack_cb tox_events_pack_group_topic;
|
||||
tox_events_pack_cb tox_events_pack_group_privacy_state;
|
||||
tox_events_pack_cb tox_events_pack_group_voice_state;
|
||||
tox_events_pack_cb tox_events_pack_group_topic_lock;
|
||||
tox_events_pack_cb tox_events_pack_group_peer_limit;
|
||||
tox_events_pack_cb tox_events_pack_group_password;
|
||||
tox_events_pack_cb tox_events_pack_group_message;
|
||||
tox_events_pack_cb tox_events_pack_group_private_message;
|
||||
tox_events_pack_cb tox_events_pack_group_custom_packet;
|
||||
tox_events_pack_cb tox_events_pack_group_custom_private_packet;
|
||||
tox_events_pack_cb tox_events_pack_group_invite;
|
||||
tox_events_pack_cb tox_events_pack_group_peer_join;
|
||||
tox_events_pack_cb tox_events_pack_group_peer_exit;
|
||||
tox_events_pack_cb tox_events_pack_group_self_join;
|
||||
tox_events_pack_cb tox_events_pack_group_join_fail;
|
||||
tox_events_pack_cb tox_events_pack_group_moderation;
|
||||
|
||||
tox_events_pack_cb tox_events_pack;
|
||||
|
||||
// non_null()
|
||||
typedef bool tox_events_unpack_cb(Tox_Events *events, Bin_Unpack *bu);
|
||||
|
||||
tox_events_unpack_cb tox_events_unpack_conference_connected;
|
||||
tox_events_unpack_cb tox_events_unpack_conference_invite;
|
||||
tox_events_unpack_cb tox_events_unpack_conference_message;
|
||||
tox_events_unpack_cb tox_events_unpack_conference_peer_list_changed;
|
||||
tox_events_unpack_cb tox_events_unpack_conference_peer_name;
|
||||
tox_events_unpack_cb tox_events_unpack_conference_title;
|
||||
tox_events_unpack_cb tox_events_unpack_file_chunk_request;
|
||||
tox_events_unpack_cb tox_events_unpack_file_recv_chunk;
|
||||
tox_events_unpack_cb tox_events_unpack_file_recv_control;
|
||||
tox_events_unpack_cb tox_events_unpack_file_recv;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_connection_status;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_lossless_packet;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_lossy_packet;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_message;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_name;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_read_receipt;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_request;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_status_message;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_status;
|
||||
tox_events_unpack_cb tox_events_unpack_friend_typing;
|
||||
tox_events_unpack_cb tox_events_unpack_self_connection_status;
|
||||
tox_events_unpack_cb tox_events_unpack_group_peer_name;
|
||||
tox_events_unpack_cb tox_events_unpack_group_peer_status;
|
||||
tox_events_unpack_cb tox_events_unpack_group_topic;
|
||||
tox_events_unpack_cb tox_events_unpack_group_privacy_state;
|
||||
tox_events_unpack_cb tox_events_unpack_group_voice_state;
|
||||
tox_events_unpack_cb tox_events_unpack_group_topic_lock;
|
||||
tox_events_unpack_cb tox_events_unpack_group_peer_limit;
|
||||
tox_events_unpack_cb tox_events_unpack_group_password;
|
||||
tox_events_unpack_cb tox_events_unpack_group_message;
|
||||
tox_events_unpack_cb tox_events_unpack_group_private_message;
|
||||
tox_events_unpack_cb tox_events_unpack_group_custom_packet;
|
||||
tox_events_unpack_cb tox_events_unpack_group_custom_private_packet;
|
||||
tox_events_unpack_cb tox_events_unpack_group_invite;
|
||||
tox_events_unpack_cb tox_events_unpack_group_peer_join;
|
||||
tox_events_unpack_cb tox_events_unpack_group_peer_exit;
|
||||
tox_events_unpack_cb tox_events_unpack_group_self_join;
|
||||
tox_events_unpack_cb tox_events_unpack_group_join_fail;
|
||||
tox_events_unpack_cb tox_events_unpack_group_moderation;
|
||||
|
||||
tox_events_unpack_cb tox_events_unpack;
|
||||
non_null()
|
||||
bool tox_events_unpack(Tox_Events *events, Bin_Unpack *bu, const Memory *mem);
|
||||
|
||||
non_null()
|
||||
Tox_Events_State *tox_events_alloc(void *user_data);
|
||||
|
||||
non_null()
|
||||
bool tox_events_add(Tox_Events *events, const Tox_Event *event);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user